diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:54:13 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:54:13 -0300 |
| commit | e0981df8c5fce1353e1499a5085e27f92afddcea (patch) | |
| tree | 06de6ad8de74d4b7b040d67f050c1fd43fe83a33 /community/compiz | |
| parent | 97a74a6a87ccbeb5649f226377d0c10ae824f1e1 (diff) | |
| parent | 0f9e4ba23bb6296d8bb8010f70d868fd08db9c54 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/curlftpfs/PKGBUILD
core/libcap/PKGBUILD
core/libsasl/PKGBUILD
core/udev/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/dbus/PKGBUILD
extra/fluidsynth/PKGBUILD
extra/mercurial/PKGBUILD
extra/redland/PKGBUILD
extra/soprano/PKGBUILD
multilib/lib32-curl/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'community/compiz')
| -rw-r--r-- | community/compiz/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD index 60ed8faad..8f5e14815 100644 --- a/community/compiz/PKGBUILD +++ b/community/compiz/PKGBUILD @@ -9,14 +9,14 @@ pkgname=('compiz-core' 'compiz-decorator-kde' 'compiz-decorator-gtk') pkgver=0.8.8 -pkgrel=1 +pkgrel=2 pkgdesc="Composite manager for Aiglx and Xgl" url="http://www.compiz.org/" license=('GPL' 'LGPL' 'MIT') arch=('i686' 'x86_64' 'mips64el') groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion') makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace' - 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse') + 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse' 'metacity') options=(!libtool !emptydirs) conflicts=('compiz' 'compiz-core-git' 'compiz-git') replaces=('compiz') @@ -65,7 +65,7 @@ package_compiz-core() package_compiz-decorator-gtk() { pkgdesc="Compiz decorator for GNOME" - depends=('gnome-control-center' 'libwnck' 'compiz-core') + depends=('gnome-control-center' 'libwnck' 'compiz-core' 'metacity') install=compiz-decorator-gtk.install cd $srcdir/compiz-$pkgver |