[arch-commits] Commit in gnome-device-manager/repos (3 files)

[Jan de Groot]

    Date: Tuesday, August 18, 2009 @ 05:14:32
  Author: jgc
Revision: 49988

Merged revisions 49921 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gnome-device-manager/trunk

........
  r49921 | jgc | 2009-08-16 23:33:58 +0200 (Sun, 16 Aug 2009) | 1 line
  
  upgpkg: gnome-device-manager 0.2-2
........

Modified:
  gnome-device-manager/repos/extra-i686/	(properties)
  gnome-device-manager/repos/extra-i686/PKGBUILD
  gnome-device-manager/repos/extra-i686/gnome-device-manager.install

------------------------------+
 PKGBUILD                     |   14 +++++++-------
 gnome-device-manager.install |    6 ------
 2 files changed, 7 insertions(+), 13 deletions(-)


Property changes on: gnome-device-manager/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnome-device-manager/trunk:1-8854
   + /gnome-device-manager/trunk:1-49986

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-18 09:14:20 UTC (rev 49987)
+++ extra-i686/PKGBUILD	2009-08-18 09:14:32 UTC (rev 49988)
@@ -3,12 +3,12 @@
 
 pkgname=gnome-device-manager
 pkgver=0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Device Manager, replaces hal-device-manager"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui' 'hal>=0.5.10')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.0')
+depends=('libgnomeui>=2.24.1' 'hal>=0.5.11' 'hicolor-icon-theme')
+makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.16.0')
 replaces=('hal-device-manager')
 options=('!libtool' '!emptydirs')
 install=gnome-device-manager.install
@@ -17,10 +17,10 @@
 md5sums=('b833a90c940dd6cc992c42ad05ca6831')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-scrollkeeper \
-	      --disable-static
+      --localstatedir=/var --disable-scrollkeeper \
+      --disable-static || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }

Modified: extra-i686/gnome-device-manager.install
===================================================================
--- extra-i686/gnome-device-manager.install	2009-08-18 09:14:20 UTC (rev 49987)
+++ extra-i686/gnome-device-manager.install	2009-08-18 09:14:32 UTC (rev 49988)
@@ -9,9 +9,3 @@
 post_remove() {
   post_install
 }
-
-op=$1
-shift
-[ "$(type -t "$op")" = "function" ] && $op "$@"
-
-# vim:set ts=2 sw=2 et: