[arch-commits] Commit in xcompmgr/repos (3 files)

[Eric Bélanger]

    Date: Tuesday, April 21, 2009 @ 02:06:15
  Author: eric
Revision: 36360

Merged revisions 36353 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xcompmgr/trunk

........
  r36353 | eric | 2009-04-21 01:52:13 -0400 (Tue, 21 Apr 2009) | 2 lines
  
  upgpkg: xcompmgr 1.1.4-2
      Added license, Removed force option
........

Added:
  xcompmgr/repos/extra-i686/LICENSE
    (from rev 36353, xcompmgr/trunk/LICENSE)
Modified:
  xcompmgr/repos/extra-i686/	(properties)
  xcompmgr/repos/extra-i686/PKGBUILD

----------+
 LICENSE  |   23 +++++++++++++++++++++++
 PKGBUILD |   11 ++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)


Property changes on: xcompmgr/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xcompmgr/trunk:1-8968
   + /xcompmgr/trunk:1-36359

Copied: xcompmgr/repos/extra-i686/LICENSE (from rev 36353, xcompmgr/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-04-21 06:06:15 UTC (rev 36360)
@@ -0,0 +1,23 @@
+/*
+ * $Id$
+ *
+ * Copyright © 2003 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-21 06:03:20 UTC (rev 36359)
+++ extra-i686/PKGBUILD	2009-04-21 06:06:15 UTC (rev 36360)
@@ -3,20 +3,21 @@
 # Contributor: Leslie P. Polzer <leslie.polzer at gmx.net>
 pkgname=xcompmgr
 pkgver=1.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Composite Window-effects manager for X.org"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=('libxcomposite' 'libxdamage' 'libxrender')
-options=('force')
 conflicts=('xapps')
 replaces=('xapps')
-source=(http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3eb1c2b7a6ceaec4ee872cb06d202d91')
+source=(http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+md5sums=('3eb1c2b7a6ceaec4ee872cb06d202d91' 'b763de909d0584df0a4c5de0ed8b448b')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
+  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }