update

3 files changed, 74 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86ea88f0d0d3..2a263676d506 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = compiz
 	pkgdesc = Composite manager for Aiglx and Xgl, with plugins and CCSM
 	pkgver = 0.9.14.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://launchpad.net/compiz
 	arch = i686
 	arch = x86_64
@@ -22,21 +22,22 @@ pkgbase = compiz
 	depends = protobuf
 	depends = metacity
 	depends = glu
+	depends = libxslt
 	optdepends = xorg-xprop: grab various window properties for use in window matching rules
-	provides = compiz-core=0.9.14.2
-	provides = compiz-bcop=0.9.14.2
 	provides = ccsm=0.9.14.2
-	provides = compiz-plugins-main=0.9.14.2
+	provides = compiz-bcop=0.9.14.2
+	provides = compiz-core=0.9.14.2
 	provides = compiz-plugins-extra=0.9.14.2
+	provides = compiz-plugins-main=0.9.14.2
 	provides = compizconfig-python=0.9.14.2
 	provides = libcompizconfig=0.9.14.2
-	conflicts = compiz-core
-	conflicts = compiz-gtk
-	conflicts = compiz-bcop
 	conflicts = ccsm
-	conflicts = compiz-fusion-plugins-main
-	conflicts = compiz-fusion-plugins-extra
+	conflicts = compiz-bcop
+	conflicts = compiz-core
 	conflicts = compiz-fusion-plugins-experimental
+	conflicts = compiz-fusion-plugins-extra
+	conflicts = compiz-fusion-plugins-main
+	conflicts = compiz-gtk
 	conflicts = compizconfig-python
 	conflicts = libcompizconfig
 	conflicts = simple-ccsm
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 8f343514b12a..8611b991cc90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
-# Maintainer: Robert Brzozowski <robson75@linux.pl>
-# Maintainer: Charles Bos <charlesbos1 AT gmail>
+# Maintainer:
+# Contributor: Robert Brzozowski <robson75@linux.pl>
+# Contributor: Charles Bos <charlesbos1 AT gmail>
 # Contributor: Rob McCathie <archaur at rmcc dot com dot au
 # Contributor: /dev/rs0 <rs0@secretco.de.com>
 # Contributor: Iven Hsu <ivenvd AT gmail>
@@ -7,30 +8,70 @@
 
 pkgname=compiz
 pkgver=0.9.14.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/compiz"
 license=('GPL' 'LGPL' 'MIT')
-depends=('boost-libs' 'xorg-server' 'fuse2' 'glibmm' 'libwnck3' 'python-gobject' 'python-cairo' 'protobuf' 'metacity' 'glu')
-makedepends=('boost' 'cmake' 'intltool' 'cython')
+depends=(
+  'boost-libs'
+  'xorg-server'
+  'fuse2'
+  'glibmm'
+  'libwnck3'
+  'python-gobject'
+  'python-cairo'
+  'protobuf'
+  'metacity'
+  'glu'
+  'libxslt'
+)
+makedepends=(
+  'boost'
+  'cmake'
+  'intltool'
+  'cython'
+)
 optdepends=(
   'xorg-xprop: grab various window properties for use in window matching rules'
 )
-conflicts=('compiz-core' 'compiz-gtk' 'compiz-bcop' 'ccsm' 'compiz-fusion-plugins-main' 'compiz-fusion-plugins-extra' 'compiz-fusion-plugins-experimental' 'compizconfig-python' 'libcompizconfig' 'simple-ccsm')
-provides=("compiz-core=${pkgver}" "compiz-bcop=${pkgver}" "ccsm=${pkgver}" "compiz-plugins-main=${pkgver}" "compiz-plugins-extra=${pkgver}" "compizconfig-python=${pkgver}" "libcompizconfig=${pkgver}")
-source=("https://launchpad.net/${pkgname}/${pkgver:0:6}/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz"
-        "focus-prevention-disable.patch"
-        "gtk-extents.patch"
-        "reverse-unity-config.patch"
-        "screenshot-launch-fix.patch"
-        "no-compile-gschemas.patch")
-sha256sums=('cfa061e93b032275ff9e7041f582a8f6d5ae271cf8a89e6bc74e3d3635999d3c'
-            'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
-            '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
-            '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b'
-            '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61'
-            '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a')
+conflicts=(
+  'ccsm'
+  'compiz-bcop'
+  'compiz-core'
+  'compiz-fusion-plugins-experimental'
+  'compiz-fusion-plugins-extra'
+  'compiz-fusion-plugins-main'
+  'compiz-gtk'
+  'compizconfig-python'
+  'libcompizconfig'
+  'simple-ccsm'
+)
+provides=(
+  "ccsm=${pkgver}"
+  "compiz-bcop=${pkgver}"
+  "compiz-core=${pkgver}"
+  "compiz-plugins-extra=${pkgver}"
+  "compiz-plugins-main=${pkgver}"
+  "compizconfig-python=${pkgver}"
+  "libcompizconfig=${pkgver}"
+)
+source=(
+  "https://launchpad.net/${pkgname}/${pkgver:0:6}/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz"
+  "focus-prevention-disable.patch"
+  "gtk-extents.patch"
+  "reverse-unity-config.patch"
+  "screenshot-launch-fix.patch"
+  "no-compile-gschemas.patch"
+)
+sha256sums=(
+  'cfa061e93b032275ff9e7041f582a8f6d5ae271cf8a89e6bc74e3d3635999d3c'
+  'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
+  '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
+  '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b'
+  '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61'
+  '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a'
+)
 
 prepare() {
   cd "${pkgname}-${pkgver}"