[arch-commits] Commit in libgphoto2 (3 files)

[Jan de Groot]

    Date: Wednesday, August 12, 2009 @ 04:01:12
  Author: jgc
Revision: 49547

Move hal to optdepends. It's needed for the disk backend. This has been done to move hal out of the dependency chain for GNOME 2.28

Added:
  libgphoto2/gnome-unstable/
Modified:
  libgphoto2/gnome-unstable/PKGBUILD
  libgphoto2/gnome-unstable/libgphoto2.install

--------------------+
 PKGBUILD           |    8 +++++---
 libgphoto2.install |   12 ++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

Modified: gnome-unstable/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2009-08-11 23:40:05 UTC (rev 49546)
+++ gnome-unstable/PKGBUILD	2009-08-12 08:01:12 UTC (rev 49547)
@@ -4,16 +4,18 @@
 
 pkgname=libgphoto2
 pkgver=2.4.6
-pkgrel=2
+pkgrel=3
 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
 arch=(i686 x86_64)
 url="http://www.gphoto.org"
-depends=('libexif>=0.6.17' 'libjpeg>=7' 'libtool>=2.2.6a' 'hal>=0.5.12git20090421.4fc367')
 license=(LGPL)
+depends=('libexif>=0.6.17' 'libjpeg>=7' 'libtool>=2.2.6a')
+makedepends=('hal')
+optdepends=('hal')
 install=(libgphoto2.install)
+options=('libtool')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
 md5sums=('3ad331acbe7e6ff4601705d504bdff94')
-options=('libtool')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: gnome-unstable/libgphoto2.install
===================================================================
--- trunk/libgphoto2.install	2009-08-11 23:40:05 UTC (rev 49546)
+++ gnome-unstable/libgphoto2.install	2009-08-12 08:01:12 UTC (rev 49547)
@@ -1,20 +1,16 @@
-# arg 1:  the new package version
 post_install() {
-getent group camera >/dev/null || usr/sbin/groupadd -g 97 camera
-	/bin/cat <<THEEND
+  getent group camera >/dev/null || usr/sbin/groupadd -g 97 camera
+  /bin/cat <<THEEND
 NOTE
 ----
 Add your user to group 'camera' to use camera devices.
 THEEND
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+  getent group camera >/dev/null || usr/sbin/groupadd -g 97 camera
 }
 
-# arg 1:  the old package version
-pre_remove() {
+post_remove() {
   usr/sbin/groupdel camera &>/dev/null
 }