Date: Saturday, November 21, 2009 @ 11:09:20 Author: jgc Revision: 59233
Merged revisions 59232 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/xcompmgr/trunk ........ r59232 | jgc | 2009-11-21 17:09:00 +0100 (Sat, 21 Nov 2009) | 2 lines upgpkg: xcompmgr 1.1.5-1 Use upstream license, update to 1.1.5 ........ Modified: xcompmgr/repos/extra-i686/ (properties) xcompmgr/repos/extra-i686/PKGBUILD Deleted: xcompmgr/repos/extra-i686/LICENSE ----------+ LICENSE | 23 ----------------------- PKGBUILD | 15 ++++++++------- 2 files changed, 8 insertions(+), 30 deletions(-) Property changes on: xcompmgr/repos/extra-i686 ___________________________________________________________________ Modified: svnmerge-integrated - /xcompmgr/trunk:1-36359 + /xcompmgr/trunk:1-59232 Deleted: extra-i686/LICENSE =================================================================== --- extra-i686/LICENSE 2009-11-21 16:09:00 UTC (rev 59232) +++ extra-i686/LICENSE 2009-11-21 16:09:20 UTC (rev 59233) @@ -1,23 +0,0 @@ -/* - * $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-11-21 16:09:00 UTC (rev 59232) +++ extra-i686/PKGBUILD 2009-11-21 16:09:20 UTC (rev 59233) @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot <j...@archlinux.org> # Contributor: Leslie P. Polzer <leslie.pol...@gmx.net> pkgname=xcompmgr -pkgver=1.1.4 -pkgrel=2 +pkgver=1.1.5 +pkgrel=1 pkgdesc="Composite Window-effects manager for X.org" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -11,13 +11,14 @@ depends=('libxcomposite' 'libxdamage' 'libxrender') conflicts=('xapps') replaces=('xapps') -source=(http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2 LICENSE) -md5sums=('3eb1c2b7a6ceaec4ee872cb06d202d91' 'b763de909d0584df0a4c5de0ed8b448b') +source=(http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('9b4d7c3c64b3d980ea317b5206fee17adefd1d65') build() { - cd ${srcdir}/${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 + make DESTDIR="${pkgdir}" install || return 1 + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 }