r22095 - in /desktop/unstable/gvfs/debian: changelog control control.in rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Oct 24 06:45:53 UTC 2009
Author: joss
Date: Sat Oct 24 06:45:53 2009
New Revision: 22095
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22095
Log:
* Disable GDU because of the ide-cd fiasco in devicekit-disks.
* Yes, we suck.
Modified:
desktop/unstable/gvfs/debian/changelog
desktop/unstable/gvfs/debian/control
desktop/unstable/gvfs/debian/control.in
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=22095&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog [utf-8] Sat Oct 24 06:45:53 2009
@@ -1,3 +1,10 @@
+gvfs (1.4.1-2) unstable; urgency=low
+
+ * Disable GDU because of the ide-cd fiasco in devicekit-disks.
+ * Yes, we suck.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 24 Oct 2009 08:45:42 +0200
+
gvfs (1.4.1-1) unstable; urgency=low
* New upstream bugfix release.
Modified: desktop/unstable/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control?rev=22095&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control [utf-8] (original)
+++ desktop/unstable/gvfs/debian/control [utf-8] Sat Oct 24 06:45:53 2009
@@ -21,8 +21,7 @@
libavahi-client-dev (>= 0.6),
libfuse-dev | hurd,
libgconf2-dev,
- libhal-dev (>= 0.5.10) | linux-gnu,
- libgdu-dev (>= 0.5) | not+linux-gnu,
+ 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,
@@ -40,13 +39,10 @@
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],
- 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]
-Breaks: brasero (<< 2.28.0-2)
+ hal (>= 0.5.10),
+ gnome-mount | exo-utils
Suggests: gvfs-backends
Conflicts: gvfs-backends (<< 1.0.2-2), libgvfscommon0
Replaces: libgvfscommon0
Modified: desktop/unstable/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control.in?rev=22095&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control.in [utf-8] (original)
+++ desktop/unstable/gvfs/debian/control.in [utf-8] Sat Oct 24 06:45:53 2009
@@ -21,8 +21,7 @@
libavahi-client-dev (>= 0.6),
libfuse-dev | hurd,
libgconf2-dev,
- libhal-dev (>= 0.5.10) | linux-gnu,
- libgdu-dev (>= 0.5) | not+linux-gnu,
+ 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,
@@ -40,13 +39,10 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- x11-utils,
- devicekit-disks [@LINUX_ARCHES@]
+ x11-utils
Recommends: dbus,
- hal (>= 0.5.10) [@NOLINUX_ARCHES@],
- gnome-mount [@NOLINUX_ARCHES@] | exo-utils [@NOLINUX_ARCHES@],
- policykit-1-gnome [@LINUX_ARCHES@]
-Breaks: brasero (<< 2.28.0-2)
+ hal (>= 0.5.10),
+ gnome-mount | exo-utils
Suggests: gvfs-backends
Conflicts: gvfs-backends (<< 1.0.2-2), libgvfscommon0
Replaces: libgvfscommon0
Modified: desktop/unstable/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/rules?rev=22095&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/rules [utf-8] (original)
+++ desktop/unstable/gvfs/debian/rules [utf-8] Sat Oct 24 06:45:53 2009
@@ -25,24 +25,6 @@
pod2man --release="Gvfs $(DEB_UPSTREAM_VERSION)" \
--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
-
DEB_INSTALL_MANPAGES_gvfs += $(MANPAGES)
install/gvfs::
@@ -53,8 +35,6 @@
dh_install -pgvfs --ignore=debian/gvfs.install \
debian/xdg-mount usr/bin
-endif
-
common-build-arch:: $(MANPAGES)
clean::
More information about the pkg-gnome-commits
mailing list