r22359 - in /desktop/experimental/gvfs/debian: changelog control control.in rules

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Nov 16 17:39:10 2009
New Revision: 22359

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22359
Log:
* Require dk-disks >> 009-1 to have IDE support.
* Replace part of the sed magic by linux-any magic.

Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/control
    desktop/experimental/gvfs/debian/control.in
    desktop/experimental/gvfs/debian/rules

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=22359&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Mon Nov 16 17:39:10 2009
@@ -1,6 +1,8 @@
 gvfs (1.4.1-5+gdu) experimental; urgency=low
 
   * Merge changes in unstable to the experimental (GDU-enabled) branch.
+  * Require dk-disks >> 009-1 to have IDE support.
+  * Replace part of the sed magic by linux-any magic.
 
  -- Josselin Mouette <joss at debian.org>  Mon, 16 Nov 2009 18:28:56 +0100
 

Modified: desktop/experimental/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control?rev=22359&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control [utf-8] Mon Nov 16 17:39:10 2009
@@ -41,11 +41,11 @@
 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]
+         devicekit-disks (>> 009-1) [linux-any]
 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]
+            hal (>= 0.5.10) [!linux-any],
+            gnome-mount [!linux-any] | exo-utils [!linux-any],
+            policykit-1-gnome [linux-any]
 Breaks: brasero (<< 2.28.0-2)
 Suggests: gvfs-backends
 Conflicts: gvfs-backends (<< 1.0.2-2), libgvfscommon0

Modified: desktop/experimental/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control.in?rev=22359&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control.in [utf-8] (original)
+++ desktop/experimental/gvfs/debian/control.in [utf-8] Mon Nov 16 17:39:10 2009
@@ -41,11 +41,11 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          x11-utils,
-         devicekit-disks [@LINUX_ARCHES@]
+         devicekit-disks (>> 009-1) [linux-any]
 Recommends: dbus,
-            hal (>= 0.5.10) [@NOLINUX_ARCHES@],
-            gnome-mount [@NOLINUX_ARCHES@] | exo-utils [@NOLINUX_ARCHES@],
-            policykit-1-gnome [@LINUX_ARCHES@]
+            hal (>= 0.5.10) [!linux-any],
+            gnome-mount [!linux-any] | exo-utils [!linux-any],
+            policykit-1-gnome [linux-any]
 Breaks: brasero (<< 2.28.0-2)
 Suggests: gvfs-backends
 Conflicts: gvfs-backends (<< 1.0.2-2), libgvfscommon0

Modified: desktop/experimental/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/rules?rev=22359&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/rules [utf-8] (original)
+++ desktop/experimental/gvfs/debian/rules [utf-8] Mon Nov 16 17:39:10 2009
@@ -16,14 +16,12 @@
 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))
 
 %.1: %.pod
 	pod2man --release="Gvfs $(DEB_UPSTREAM_VERSION)" \
-	        --center="Debian GNU/Linux" $< $@
+	        --center="Debian GNU/Not Linux" $< $@
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 
@@ -68,7 +66,5 @@
 common-build-arch:: $(MANPAGES)
 
 clean::
-	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
+	sed -i -e 's/@FUSE_ARCHES@/$(FUSE_ARCHES)/g' debian/control
 	rm -f $(MANPAGES)