update

3 files changed, 98 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index adce3c98a828..7f73b6fd6a50 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,40 +10,40 @@ pkgbase = compiz-git
 	license = MIT
 	makedepends = boost
 	makedepends = cmake
+	makedepends = cython
 	makedepends = git
 	makedepends = intltool
-	makedepends = cython
 	depends = boost-libs
-	depends = xorg-server
 	depends = fuse2
 	depends = glibmm
+	depends = glu
 	depends = libwnck3
-	depends = python-gobject
-	depends = python-cairo
-	depends = protobuf
+	depends = libxslt
 	depends = metacity
-	depends = glu
+	depends = protobuf
+	depends = python-cairo
+	depends = python-gobject
+	depends = xorg-server
 	optdepends = xorg-xprop: grab various window properties for use in window matching rules
-	provides = compiz=0.9.14
-	provides = compiz-core=0.9.14
-	provides = compiz-bcop=0.9.14
 	provides = ccsm=0.9.14
-	provides = compiz-plugins-main=0.9.14
+	provides = compiz-bcop=0.9.14
+	provides = compiz-core=0.9.14
 	provides = compiz-plugins-extra=0.9.14
+	provides = compiz-plugins-main=0.9.14
+	provides = compiz=0.9.14
 	provides = compizconfig-python=0.9.14
 	provides = libcompizconfig=0.9.14
+	conflicts = ccsm
 	conflicts = compiz
-	conflicts = compiz-core
-	conflicts = compiz-gtk
 	conflicts = compiz-bcop
-	conflicts = ccsm
-	conflicts = compiz-fusion-plugins-main
-	conflicts = compiz-fusion-plugins-extra
+	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
-	replaces = compiz-bzr
 	source = git+https://git.launchpad.net/compiz
 	source = focus-prevention-disable.patch
 	source = gtk-extents.patch
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 036cc4e49da3..a3bb784ef47d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,42 +5,84 @@
 # Contributor: Iven Hsu <ivenvd AT gmail>
 # Contributor: Nathan Hulse <nat.hulse@gmail.com>
 
-pkgname=compiz-git
+_pkgname='compiz'
+pkgname="$_pkgname-git"
 pkgver=0.9.14.2.r0.g12aca6852
 pkgrel=1
-_gitname=compiz
 pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM (development version)"
 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' 'git' 'intltool' 'cython')
+depends=(
+  'boost-libs'
+  'fuse2'
+  'glibmm'
+  'glu'
+  'libwnck3'
+  'libxslt'
+  'metacity'
+  'protobuf'
+  'python-cairo'
+  'python-gobject'
+  'xorg-server'
+)
+makedepends=(
+  'boost'
+  'cmake'
+  'cython'
+  'git'
+  'intltool'
+)
 optdepends=(
   'xorg-xprop: grab various window properties for use in window matching rules'
 )
-conflicts=("${_gitname}" '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=("${_gitname}=${pkgver:0:6}" "compiz-core=${pkgver:0:6}" "compiz-bcop=${pkgver:0:6}" "ccsm=${pkgver:0:6}" "compiz-plugins-main=${pkgver:0:6}" "compiz-plugins-extra=${pkgver:0:6}" "compizconfig-python=${pkgver:0:6}" "libcompizconfig=${pkgver:0:6}")
-replaces=('compiz-bzr')
-source=("git+https://git.launchpad.net/${_gitname}"
-        "focus-prevention-disable.patch"
-        "gtk-extents.patch"
-        "reverse-unity-config.patch"
-        "screenshot-launch-fix.patch"
-        "no-compile-gschemas.patch")
-sha256sums=('SKIP'
-            'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
-            '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
-            '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b'
-            '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61'
-            '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a')
+conflicts=(
+  'ccsm'
+  'compiz'
+  '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:0:6}"
+  "compiz-bcop=${pkgver:0:6}"
+  "compiz-core=${pkgver:0:6}"
+  "compiz-plugins-extra=${pkgver:0:6}"
+  "compiz-plugins-main=${pkgver:0:6}"
+  "compiz=${pkgver:0:6}"
+  "compizconfig-python=${pkgver:0:6}"
+  "libcompizconfig=${pkgver:0:6}"
+)
+source=(
+  "git+https://git.launchpad.net/compiz"
+  "focus-prevention-disable.patch"
+  "gtk-extents.patch"
+  "reverse-unity-config.patch"
+  "screenshot-launch-fix.patch"
+  "no-compile-gschemas.patch"
+)
+sha256sums=(
+  'SKIP'
+  'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'
+  '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'
+  '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b'
+  '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61'
+  '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a'
+)
 
 pkgver() {
-  cd "${_gitname}"
+  cd "$srcdir/$_pkgname"
   git describe --long --tags | sed 's/.%//;s/\+.*ubuntu.//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd "${_gitname}"
+  cd "$srcdir/$_pkgname"
 
   # Reverse Unity specific configuration patches
   patch -p1 -i "${srcdir}/reverse-unity-config.patch"
@@ -59,9 +101,10 @@ prepare() {
 }
 
 build() {
-  cd "${_gitname}"
+  cd "$srcdir/$_pkgname"
 
-  mkdir build; cd build
+  mkdir -p build
+  cd build
 
   cmake .. \
     -DCMAKE_INSTALL_PREFIX="/usr" \
@@ -80,26 +123,28 @@ build() {
 }
 
 package() {
-  cd "${_gitname}/build"
-  make DESTDIR="${pkgdir}" install
+  cd "$srcdir/$_pkgname"
+  cd build
+
+  make DESTDIR="$pkgdir" install
 
   # findcompiz_install needs COMPIZ_DESTDIR and install needs DESTDIR
   # make findcompiz_install
   CMAKE_DIR=$(cmake --system-information | grep '^CMAKE_ROOT' | awk -F\" '{print $2}')
-  install -dm755 "${pkgdir}${CMAKE_DIR}/Modules/"
-  install -m644 ../cmake/FindCompiz.cmake "${pkgdir}${CMAKE_DIR}/Modules/"	
+  install -Dm644 ../cmake/FindCompiz.cmake \
+    -t "${pkgdir}${CMAKE_DIR}/Modules/"	
 
   # Add documentation
-  install -dm755 "${pkgdir}/usr/share/doc/compiz/"
-  install ../{AUTHORS,NEWS,README} "${pkgdir}/usr/share/doc/compiz/"
+  install -Dm644 ../{AUTHORS,NEWS,README} \
+    -t "$pkgdir/usr/share/doc/compiz/"
 
   # Add gsettings schema files
   if ls generated/glib-2.0/schemas/ | grep -qm1 .gschema.xml; then
-    install -dm755 "${pkgdir}/usr/share/glib-2.0/schemas/" 
-    install -m644 generated/glib-2.0/schemas/*.gschema.xml "${pkgdir}/usr/share/glib-2.0/schemas/" 
+    install -Dm644 generated/glib-2.0/schemas/*.gschema.xml \
+      -t "$pkgdir/usr/share/glib-2.0/schemas/" 
   fi 
 
   # Install licenses
-  install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/${_gitname}"/{COPYING,COPYING.GPL,COPYING.LGPL,COPYING.MIT} "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm644 "$srcdir/$_pkgname"/{COPYING,COPYING.GPL,COPYING.LGPL,COPYING.MIT} \
+    -t "$pkgdir/usr/share/licenses/$pkgname"
 }