[arch-commits] Commit in pmount/repos (3 files)

[Tobias Powalowski]

    Date: Tuesday, June 9, 2009 @ 13:57:30
  Author: tpowa
Revision: 42041

Merged revisions 42039 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/pmount/trunk

........
  r42039 | tpowa | 2009-06-09 17:50:45 +0000 (Di, 09 Jun 2009) | 1 line
  
  upgpkg: pmount 0.9.19-3
........

Modified:
  pmount/repos/extra-i686/	(properties)
  pmount/repos/extra-i686/PKGBUILD
Deleted:
  pmount/repos/extra-i686/pmount-dbus-close.patch

-------------------------+
 PKGBUILD                |   10 +++-------
 pmount-dbus-close.patch |   11 -----------
 2 files changed, 3 insertions(+), 18 deletions(-)


Property changes on: pmount/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /pmount/trunk:1-29587
   + /pmount/trunk:1-42040

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-06-09 17:52:05 UTC (rev 42040)
+++ extra-i686/PKGBUILD	2009-06-09 17:57:30 UTC (rev 42041)
@@ -3,7 +3,7 @@
 
 pkgname=pmount
 pkgver=0.9.19
-pkgrel=2
+pkgrel=3
 pkgdesc="mount removable devices as normal user"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -11,17 +11,13 @@
 backup=('etc/pmount.allow')
 depends=('sysfsutils>=2.0.0-1' 'bash' 'hal>=0.5.11')
 makedepends=('intltool')
-source=(http://alioth.debian.org/frs/download.php/2867/${pkgname}-${pkgver}.tar.gz
-	pmount-dbus-close.patch)
+source=(http://alioth.debian.org/frs/download.php/2867/${pkgname}-${pkgver}.tar.gz)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # we have a shared connection! patch it to work correct
-  patch -Np1 -i ${srcdir}/pmount-dbus-close.patch || return 1
   ./configure --prefix=/usr --with-cryptsetup-prog=/usr/sbin/cryptsetup || return 1
   make || return 1 
   make DESTDIR="${pkgdir}" install || return 1
 }
 
-md5sums=('2fd9fe103375dbd0c91af2f302250a8c'
-         'b7ea1afd82ffebf510dc89f74cd39f09')
+md5sums=('2fd9fe103375dbd0c91af2f302250a8c')

Deleted: extra-i686/pmount-dbus-close.patch
===================================================================
--- extra-i686/pmount-dbus-close.patch	2009-06-09 17:52:05 UTC (rev 42040)
+++ extra-i686/pmount-dbus-close.patch	2009-06-09 17:57:30 UTC (rev 42041)
@@ -1,11 +0,0 @@
-diff -ruN pmount-0.9.13/src/pmount-hal.c pmount-0.9.13-new/src/pmount-hal.c
---- pmount-0.9.13/src/pmount-hal.c	2006-08-15 22:31:02.000000000 +0200
-+++ pmount-0.9.13-new/src/pmount-hal.c	2007-02-05 12:01:09.000000000 +0100
-@@ -361,7 +361,6 @@
-     /* shut down hal connection */
-     libhal_ctx_shutdown( hal_ctx, &error );
-     libhal_ctx_free( hal_ctx );
--    dbus_connection_close( dbus_conn );
-     dbus_connection_unref( dbus_conn );
- 
-     /* go */