r26481 - in /desktop/unstable/gnome-vfs/debian: changelog control control.in rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Feb  7 22:33:19 2011
New Revision: 26481

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26481
Log:
* Disable HAL support. Closes: #599020
  This will make gnome-vfs fall back to good old /etc/mtab, which is good
  enough for legacy applications which still actually use the deprecated
  gnome-vfs.
* Make samba and avahi configure flags not arch specific.

Modified:
    desktop/unstable/gnome-vfs/debian/changelog
    desktop/unstable/gnome-vfs/debian/control
    desktop/unstable/gnome-vfs/debian/control.in
    desktop/unstable/gnome-vfs/debian/rules

Modified: desktop/unstable/gnome-vfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/changelog?rev=26481&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/changelog [utf-8] Mon Feb  7 22:33:19 2011
@@ -9,7 +9,14 @@
   * Drop type-handling usage. Closes: #587877.
   * Bump standards version accordingly.
 
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 31 May 2010 15:55:16 +0200
+  [ Michael Biebl ]
+  * Disable HAL support. Closes: #599020
+    This will make gnome-vfs fall back to good old /etc/mtab, which is good
+    enough for legacy applications which still actually use the deprecated
+    gnome-vfs.
+  * Make samba and avahi configure flags not arch specific.
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 07 Feb 2011 23:19:17 +0100
 
 gnome-vfs (1:2.24.3-1) unstable; urgency=low
 

Modified: desktop/unstable/gnome-vfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/control?rev=26481&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/control [utf-8] Mon Feb  7 22:33:19 2011
@@ -7,7 +7,7 @@
 Section: oldlibs
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Otavio Salvador <otavio at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Otavio Salvador <otavio at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs,
                quilt,
                gtk-doc-tools (>= 1.0),
@@ -26,8 +26,6 @@
                gnome-pkg-tools (>= 0.11.3),
                dpkg-dev (>= 1.13.19),
                libdbus-glib-1-dev (>= 0.70),
-               libhal-dev (>= 0.5.7),
-               libhal-storage-dev (>= 0.5.7),
                libavahi-client-dev (>= 0.6),
                libavahi-glib-dev (>= 0.6),
                libselinux1-dev [linux-any],

Modified: desktop/unstable/gnome-vfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/control.in?rev=26481&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/control.in [utf-8] Mon Feb  7 22:33:19 2011
@@ -21,8 +21,6 @@
                gnome-pkg-tools (>= 0.11.3),
                dpkg-dev (>= 1.13.19),
                libdbus-glib-1-dev (>= 0.70),
-               libhal-dev (>= 0.5.7),
-               libhal-storage-dev (>= 0.5.7),
                libavahi-client-dev (>= 0.6),
                libavahi-glib-dev (>= 0.6),
                libselinux1-dev [linux-any],

Modified: desktop/unstable/gnome-vfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/rules?rev=26481&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/rules [utf-8] Mon Feb  7 22:33:19 2011
@@ -11,19 +11,20 @@
 GNOME_MODULE := gnome-vfs
 
 ifeq ($(DEB_HOST_ARCH),hurd-i386)
-  HOST_ARCH_CONFIGURE_FLAGS=--disable-samba
+  HOST_ARCH_CONFIGURE_FLAGS=--disable-ipv6
 else
-  HOST_ARCH_CONFIGURE_FLAGS=--enable-ipv6 --enable-hal \
-    --with-hal-mount=/usr/bin/pmount-hal --with-hal-umount=/usr/bin/pumount \
-    --enable-avahi
+  HOST_ARCH_CONFIGURE_FLAGS=--enable-ipv6
 endif
 
 #debug lib
 DEB_DH_STRIP_ARGS := --dbg-package=libgnomevfs2-0-dbg
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --disable-openssl \
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc \
                              --enable-gnutls \
-			     --libexecdir=/usr/lib/gnome-vfs-2.0 \
+                             --enable-avahi \
+                             --disable-openssl \
+                             --disable-hal \
+                             --libexecdir=/usr/lib/gnome-vfs-2.0 \
                              $(HOST_ARCH_CONFIGURE_FLAGS)
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"