r21701 - in /desktop/experimental/gvfs: ./ debian/changelog debian/control debian/control.in debian/gvfs.install debian/gvfs.postinst debian/rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Sep 29 22:56:47 UTC 2009
Author: joss
Date: Tue Sep 29 22:56:47 2009
New Revision: 21701
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21701
Log:
* Enable GDU support on Linux.
* Disable HAL on Linux.
* Recommend policykit 1 (to mount stuff using devicekit-disks) instead
of gnome-mount.
* Only install xdg-mount on !linux.
* Enable libgudev on linux.
Added:
desktop/experimental/gvfs/
- copied from r21619, desktop/unstable/gvfs/
desktop/experimental/gvfs/debian/changelog
- copied, changed from r21698, desktop/unstable/gvfs/debian/changelog
desktop/experimental/gvfs/debian/control
- copied, changed from r21698, desktop/unstable/gvfs/debian/control
desktop/experimental/gvfs/debian/control.in
- copied, changed from r21698, desktop/unstable/gvfs/debian/control.in
desktop/experimental/gvfs/debian/gvfs.install
- copied, changed from r21698, desktop/unstable/gvfs/debian/gvfs.install
desktop/experimental/gvfs/debian/gvfs.postinst
- copied unchanged from r21698, desktop/unstable/gvfs/debian/gvfs.postinst
desktop/experimental/gvfs/debian/rules
- copied, changed from r21698, desktop/unstable/gvfs/debian/rules
Copied: desktop/experimental/gvfs/debian/changelog (from r21698, desktop/unstable/gvfs/debian/changelog)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=21701&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Tue Sep 29 22:56:47 2009
@@ -1,12 +1,21 @@
+gvfs (1.4.0-2+gdu1) experimental; urgency=low
+
+ * Enable GDU support on Linux.
+ * Disable HAL on Linux.
+ * Recommend policykit 1 (to mount stuff using devicekit-disks) instead
+ of gnome-mount.
+ * Only install xdg-mount on !linux.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 30 Sep 2009 00:55:17 +0200
+
gvfs (1.4.0-2) unstable; urgency=low
* 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
Copied: desktop/experimental/gvfs/debian/control (from r21698, desktop/unstable/gvfs/debian/control)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control?rev=21701&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control [utf-8] Tue Sep 29 22:56:47 2009
@@ -22,8 +22,8 @@
libfuse-dev | hurd,
libgconf2-dev,
libhal-dev (>= 0.5.10) | linux-gnu,
- libgdu-dev (>= 0.5),
- libgudev-1.0-dev (>= 001),
+ libgdu-dev (>= 0.5) | not+linux-gnu,
+ 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,
@@ -44,7 +44,8 @@
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]
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],
- gnome-mount | exo-utils
+ gnome-mount [!alpha !amd64 !arm !armeb !armel !avr32 !hppa !i386 !ia64 !lpia !m32r !m68k !mips !mipsel !powerpc !ppc64 !s390 !s390x !sh3 !sh3eb !sh4 !sh4eb !sparc] | exo-utils [!alpha !amd64 !arm !armeb !armel !avr32 !hppa !i386 !ia64 !lpia !m32r !m68k !mips !mipsel !powerpc !ppc64 !s390 !s390x !sh3 !sh3eb !sh4 !sh4eb !sparc],
+ policykit-1-gnome [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]
Suggests: gvfs-backends
Conflicts: gvfs-backends (<< 1.0.2-2), libgvfscommon0
Replaces: libgvfscommon0
Copied: desktop/experimental/gvfs/debian/control.in (from r21698, desktop/unstable/gvfs/debian/control.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control.in?rev=21701&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control.in [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control.in [utf-8] Tue Sep 29 22:56:47 2009
@@ -22,8 +22,8 @@
libfuse-dev | hurd,
libgconf2-dev,
libhal-dev (>= 0.5.10) | linux-gnu,
- libgdu-dev (>= 0.5),
- libgudev-1.0-dev (>= 001),
+ libgdu-dev (>= 0.5) | not+linux-gnu,
+ 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,
@@ -44,7 +44,8 @@
devicekit-disks [@LINUX_ARCHES@]
Recommends: dbus,
hal (>= 0.5.10) [@NOLINUX_ARCHES@],
- gnome-mount | exo-utils
+ gnome-mount [@NOLINUX_ARCHES@] | exo-utils [@NOLINUX_ARCHES@],
+ policykit-1-gnome [@LINUX_ARCHES@]
Suggests: gvfs-backends
Conflicts: gvfs-backends (<< 1.0.2-2), libgvfscommon0
Replaces: libgvfscommon0
Copied: desktop/experimental/gvfs/debian/gvfs.install (from r21698, desktop/unstable/gvfs/debian/gvfs.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/gvfs.install?rev=21701&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/gvfs.install [utf-8] (original)
+++ desktop/experimental/gvfs/debian/gvfs.install [utf-8] Tue Sep 29 22:56:47 2009
@@ -13,8 +13,8 @@
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/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
+# debian/xdg-mount /usr/bin/
Copied: desktop/experimental/gvfs/debian/rules (from r21698, desktop/unstable/gvfs/debian/rules)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/rules?rev=21701&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/rules [utf-8] (original)
+++ desktop/experimental/gvfs/debian/rules [utf-8] Tue Sep 29 22:56:47 2009
@@ -49,13 +49,15 @@
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 --ignore=debian/gvfs.install \
+ debian/xdg-mount usr/bin
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 -e 's/@FUSE_ARCHES@/$(FUSE_ARCHES)/g' \
+ -e 's/@LINUX_ARCHES@/$(LINUX_ARCHES)/g' \
+ -e 's/@NOLINUX_ARCHES@/$(NOLINUX_ARCHES)/g' debian/control
rm -f $(MANPAGES)
More information about the pkg-gnome-commits
mailing list