r37904 - in /desktop/unstable/gvfs/debian: changelog control control.in patches/03_xdg-mount.patch patches/05_shared_libdaemon.patch patches/series rules xdg-mount xdg-mount.pod

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri May 24 16:31:35 UTC 2013


Author: biebl
Date: Fri May 24 16:31:34 2013
New Revision: 37904

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37904
Log:
Stop building with HAL support on non-Linux. This code is no longer
maintained and tested and HAL is scheduled to be removed.

Removed:
    desktop/unstable/gvfs/debian/patches/03_xdg-mount.patch
    desktop/unstable/gvfs/debian/xdg-mount
    desktop/unstable/gvfs/debian/xdg-mount.pod
Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/control
    desktop/unstable/gvfs/debian/control.in
    desktop/unstable/gvfs/debian/patches/05_shared_libdaemon.patch
    desktop/unstable/gvfs/debian/patches/series
    desktop/unstable/gvfs/debian/rules

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=37904&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog [utf-8] Fri May 24 16:31:34 2013
@@ -1,6 +1,8 @@
 gvfs (1.16.2-2) UNRELEASED; urgency=low
 
   * Upload to unstable.
+  * Stop building with HAL support on non-Linux. This code is no longer
+    maintained and tested and HAL is scheduled to be removed.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 24 May 2013 18:20:27 +0200
 

Modified: desktop/unstable/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control?rev=37904&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control [utf-8] (original)
+++ desktop/unstable/gvfs/debian/control [utf-8] Fri May 24 16:31:34 2013
@@ -2,11 +2,12 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
+
 Source: gvfs
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 8.1.3),
                autotools-dev,
                cdbs (>= 0.4.93),
@@ -24,7 +25,6 @@
                libavahi-glib-dev (>= 0.6),
                libavahi-client-dev (>= 0.6),
                libfuse-dev [!hurd-any],
-               libhal-dev (>= 0.5.10) [!linux-any],
                libgudev-1.0-dev (>= 001) [linux-any],
                libcdio-paranoia-dev (>= 0.78.2),
                libbluetooth-dev (>= 4.0) [linux-any],
@@ -85,8 +85,6 @@
          gvfs-libs (= ${binary:Version}),
          gvfs-common (= ${source:Version})
 Recommends: dbus,
-            hal (>= 0.5.10) [!linux-any],
-            gnome-mount [!linux-any] | exo-utils [!linux-any],
             policykit-1-gnome [linux-any],
             gvfs
 Suggests: gvfs-backends

Modified: desktop/unstable/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control.in?rev=37904&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control.in [utf-8] (original)
+++ desktop/unstable/gvfs/debian/control.in [utf-8] Fri May 24 16:31:34 2013
@@ -20,7 +20,6 @@
                libavahi-glib-dev (>= 0.6),
                libavahi-client-dev (>= 0.6),
                libfuse-dev [!hurd-any],
-               libhal-dev (>= 0.5.10) [!linux-any],
                libgudev-1.0-dev (>= 001) [linux-any],
                libcdio-paranoia-dev (>= 0.78.2),
                libbluetooth-dev (>= 4.0) [linux-any],
@@ -81,8 +80,6 @@
          gvfs-libs (= ${binary:Version}),
          gvfs-common (= ${source:Version})
 Recommends: dbus,
-            hal (>= 0.5.10) [!linux-any],
-            gnome-mount [!linux-any] | exo-utils [!linux-any],
             policykit-1-gnome [linux-any],
             gvfs
 Suggests: gvfs-backends

Modified: desktop/unstable/gvfs/debian/patches/05_shared_libdaemon.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/05_shared_libdaemon.patch?rev=37904&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/05_shared_libdaemon.patch [utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/05_shared_libdaemon.patch [utf-8] Fri May 24 16:31:34 2013
@@ -11,8 +11,10 @@
  daemon/Makefile.am |   14 +++++++++++---
  2 files changed, 15 insertions(+), 5 deletions(-)
 
---- a/common/Makefile.am
-+++ b/common/Makefile.am
+Index: gvfs-1.16.2/common/Makefile.am
+===================================================================
+--- gvfs-1.16.2.orig/common/Makefile.am	2013-05-24 18:24:28.867643627 +0200
++++ gvfs-1.16.2/common/Makefile.am	2013-05-24 18:24:28.863643583 +0200
 @@ -1,6 +1,8 @@
  NULL =
  
@@ -32,8 +34,10 @@
  
  libgvfscommon_la_LIBADD =	\
  	$(GLIB_LIBS)		\
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
+Index: gvfs-1.16.2/daemon/Makefile.am
+===================================================================
+--- gvfs-1.16.2.orig/daemon/Makefile.am	2013-05-24 18:24:28.867643627 +0200
++++ gvfs-1.16.2/daemon/Makefile.am	2013-05-24 18:24:28.863643583 +0200
 @@ -18,10 +18,12 @@
  	-DMOUNTABLE_DIR=\"$(mountdir)/\" 	\
  	-DGVFS_LOCALEDIR=\""$(localedir)"\"
@@ -58,7 +62,7 @@
  	gvfsdaemon.c gvfsdaemon.h \
  	gvfsbackend.c gvfsbackend.h \
  	gvfschannel.c gvfschannel.h \
-@@ -197,6 +199,12 @@
+@@ -198,6 +200,12 @@
  	gvfskeyring.h gvfskeyring.c \
          $(NULL)
  

Modified: desktop/unstable/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/series?rev=37904&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/series [utf-8] Fri May 24 16:31:34 2013
@@ -1,5 +1,4 @@
 01_modules_dir.patch
-03_xdg-mount.patch
 04_hurd_path_max.patch
 05_shared_libdaemon.patch
 06_metadata_nfs.patch

Modified: desktop/unstable/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/rules?rev=37904&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/rules [utf-8] (original)
+++ desktop/unstable/gvfs/debian/rules [utf-8] Fri May 24 16:31:34 2013
@@ -16,17 +16,10 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	--libexecdir=/usr/lib/gvfs
-
-MANPAGES += $(patsubst %.pod,%.1,$(wildcard debian/*.pod))
-
-%.1: %.pod
-	pod2man --release="Gvfs $(DEB_UPSTREAM_VERSION)" \
-	        --center="Debian GNU/Not Linux" $< $@
+	--libexecdir=/usr/lib/gvfs \
+	--disable-hal
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-hal
 
 install/gvfs-backends::
 	# Those are only available on Linux:
@@ -39,18 +32,6 @@
 		debian/tmp/usr/lib/gvfs/gvfs-udisks2-volume-monitor \
 		debian/tmp/usr/share/dbus-1/services/org.gtk.Private.UDisks2VolumeMonitor.service \
 		debian/tmp/usr/share/gvfs/remote-volume-monitors/udisks2.monitor
-
-else
-
-DEB_INSTALL_MANPAGES_gvfs += $(MANPAGES)
-
-install/gvfs::
-	dh_install --autodest -pgvfs-daemons --ignore=debian/gvfs-daemons.install \
-		debian/tmp/usr/lib/gvfs/gvfs-hal-volume-monitor \
-		debian/tmp/usr/share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service \
-		debian/tmp/usr/share/gvfs/remote-volume-monitors/hal.monitor
-	dh_install -pgvfs-daemons --ignore=debian/gvfs-daemons.install \
-		debian/xdg-mount usr/bin
 
 endif
 




More information about the pkg-gnome-commits mailing list