r21699 - in /desktop/unstable/gvfs/debian: changelog control control.in gvfs.install rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Sep 29 22:33:55 UTC 2009
Author: joss
Date: Tue Sep 29 22:33:41 2009
New Revision: 21699
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21699
Log:
Revert the GDU bits, only keep the libgudev change.
Modified:
desktop/unstable/gvfs/debian/changelog
desktop/unstable/gvfs/debian/control
desktop/unstable/gvfs/debian/control.in
desktop/unstable/gvfs/debian/gvfs.install
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=21699&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog [utf-8] Tue Sep 29 22:33:41 2009
@@ -3,10 +3,9 @@
* Do not build-depend on libudev on !linux.
* gvfs.postinst: add big fat warning asking to restart the session
after the upgrade. Closes: #548898.
- * Enable GDU and gudev support on Linux.
- * Disable HAL on Linux.
-
- -- Josselin Mouette <joss at debian.org> Tue, 29 Sep 2009 22:59:20 +0200
+ * Enable libgudev on linux.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 30 Sep 2009 00:32:46 +0200
gvfs (1.4.0-1) unstable; urgency=low
Modified: desktop/unstable/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control?rev=21699&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control [utf-8] (original)
+++ desktop/unstable/gvfs/debian/control [utf-8] Tue Sep 29 22:33:41 2009
@@ -21,9 +21,8 @@
libavahi-client-dev (>= 0.6),
libfuse-dev | hurd,
libgconf2-dev,
- libhal-dev (>= 0.5.10) | linux-gnu,
- libgdu-dev (>= 0.5),
- libgudev-1.0-dev (>= 001),
+ libhal-dev (>= 0.5.10),
+ libgudev-1.0-dev (>= 001) | not+linux-gnu,
libcdio-paranoia-dev (>= 0.78.2) | hurd,
libbluetooth-dev (>= 4.0) | not+linux-gnu,
libdbus-glib-1-dev,
@@ -40,10 +39,9 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- x11-utils,
- devicekit-disks [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]
+ x11-utils
Recommends: dbus,
- hal (>= 0.5.10) [!alpha !amd64 !arm !armeb !armel !avr32 !hppa !i386 !ia64 !lpia !m32r !m68k !mips !mipsel !powerpc !ppc64 !s390 !s390x !sh3 !sh3eb !sh4 !sh4eb !sparc],
+ hal (>= 0.5.10),
gnome-mount | exo-utils
Suggests: gvfs-backends
Conflicts: gvfs-backends (<< 1.0.2-2), libgvfscommon0
Modified: desktop/unstable/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control.in?rev=21699&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control.in [utf-8] (original)
+++ desktop/unstable/gvfs/debian/control.in [utf-8] Tue Sep 29 22:33:41 2009
@@ -21,9 +21,8 @@
libavahi-client-dev (>= 0.6),
libfuse-dev | hurd,
libgconf2-dev,
- libhal-dev (>= 0.5.10) | linux-gnu,
- libgdu-dev (>= 0.5),
- libgudev-1.0-dev (>= 001),
+ libhal-dev (>= 0.5.10),
+ libgudev-1.0-dev (>= 001) | not+linux-gnu,
libcdio-paranoia-dev (>= 0.78.2) | hurd,
libbluetooth-dev (>= 4.0) | not+linux-gnu,
libdbus-glib-1-dev,
@@ -40,10 +39,9 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- x11-utils,
- devicekit-disks [@LINUX_ARCHES@]
+ x11-utils
Recommends: dbus,
- hal (>= 0.5.10) [@NOLINUX_ARCHES@],
+ hal (>= 0.5.10),
gnome-mount | exo-utils
Suggests: gvfs-backends
Conflicts: gvfs-backends (<< 1.0.2-2), libgvfscommon0
Modified: desktop/unstable/gvfs/debian/gvfs.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/gvfs.install?rev=21699&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/gvfs.install [utf-8] (original)
+++ desktop/unstable/gvfs/debian/gvfs.install [utf-8] Tue Sep 29 22:33:41 2009
@@ -5,16 +5,15 @@
debian/tmp/usr/lib/gvfs/gvfsd-localtest
debian/tmp/usr/lib/gvfs/gvfsd-metadata
debian/tmp/usr/lib/gvfs/gvfsd-trash
+debian/tmp/usr/lib/gvfs/gvfs-hal-volume-monitor
debian/tmp/usr/lib/libgvfscommon.so.*
debian/tmp/usr/share/dbus-1/services/gvfs-daemon.service
debian/tmp/usr/share/dbus-1/services/gvfs-metadata.service
+debian/tmp/usr/share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
debian/tmp/usr/share/locale
debian/tmp/usr/share/gvfs/mounts/burn.mount
debian/tmp/usr/share/gvfs/mounts/computer.mount
debian/tmp/usr/share/gvfs/mounts/localtest.mount
debian/tmp/usr/share/gvfs/mounts/trash.mount
+debian/tmp/usr/share/gvfs/remote-volume-monitors/hal.monitor
debian/xdg-mount /usr/bin/
-# Now installed from debian/rules
-# debian/tmp/usr/lib/gvfs/gvfs-{hal,gdu}-volume-monitor
-# debian/tmp/usr/share/dbus-1/services/org.gtk.Private.{Hal,Gdu}VolumeMonitor.service
-# debian/tmp/usr/share/gvfs/remote-volume-monitors/{hal,gdu}.monitor
Modified: desktop/unstable/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/rules?rev=21699&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/rules [utf-8] (original)
+++ desktop/unstable/gvfs/debian/rules [utf-8] Tue Sep 29 22:33:41 2009
@@ -16,8 +16,6 @@
DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
FUSE_ARCHES := $(shell type-handling any linux,kfreebsd)
-LINUX_ARCHES := $(shell type-handling any linux)
-NOLINUX_ARCHES := !$(shell echo $(LINUX_ARCHES) | sed 's/ / !/g')
MANPAGES += $(patsubst %.pod,%.1,$(wildcard debian/*.pod))
DEB_INSTALL_MANPAGES_gvfs += $(MANPAGES)
@@ -27,35 +25,14 @@
--center="Debian GNU/Linux" $< $@
ifeq ($(DEB_HOST_ARCH_OS),linux)
-
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-hal
-
install/gvfs-backends::
# Those are only available on Linux:
- dh_install --autodest -pgvfs-backends --ignore=debian/gvfs-backends.install \
- debian/tmp/usr/lib/gvfs/gvfsd-obexftp \
- debian/tmp/usr/share/gvfs/mounts/obexftp.mount
-
-install/gvfs::
- dh_install --autodest -pgvfs --ignore=debian/gvfs.install \
- debian/tmp/usr/lib/gvfs/gvfs-gdu-volume-monitor \
- debian/tmp/usr/share/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service \
- debian/tmp/usr/share/gvfs/remote-volume-monitors/gdu.monitor
-
-else
-
-install/gvfs::
- dh_install --autodest -pgvfs --ignore=debian/gvfs.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-backends debian/tmp/usr/lib/gvfs/gvfsd-obexftp
+ dh_install -pgvfs-backends debian/tmp/usr/share/gvfs/mounts/obexftp.mount
endif
common-build-arch:: $(MANPAGES)
clean::
- sed -i -e 's/@FUSE_ARCHES@/$(FUSE_ARCHES)/' \
- -e 's/@LINUX_ARCHES@/$(LINUX_ARCHES)/' \
- -e 's/@NOLINUX_ARCHES@/$(NOLINUX_ARCHES)/' debian/control
+ sed -i 's/@FUSE_ARCHES@/$(FUSE_ARCHES)/' debian/control
rm -f $(MANPAGES)
More information about the pkg-gnome-commits
mailing list