r24632 - in /desktop/unstable/gvfs/debian: changelog control control.in rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Jul 2 16:44:50 UTC 2010
Author: joss
Date: Fri Jul 2 16:44:47 2010
New Revision: 24632
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24632
Log:
* Drop type-handling usage. Closes: #587874.
* Bump standards version accordingly.
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=24632&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog [utf-8] Fri Jul 2 16:44:47 2010
@@ -1,3 +1,10 @@
+gvfs (1.6.2-2) UNRELEASED; urgency=low
+
+ * Drop type-handling usage. Closes: #587874.
+ * Bump standards version accordingly.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 02 Jul 2010 18:44:02 +0200
+
gvfs (1.6.2-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=24632&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control [utf-8] (original)
+++ desktop/unstable/gvfs/debian/control [utf-8] Fri Jul 2 16:44:47 2010
@@ -12,7 +12,6 @@
cdbs,
gnome-pkg-tools (>= 0.7),
pkg-config,
- type-handling,
gtk-doc-tools,
libglib2.0-dev (>= 2.23.4),
libdbus-1-dev,
@@ -20,16 +19,16 @@
openssh-client,
libsoup-gnome2.4-dev (>= 2.26.0),
libxml2-dev,
- libudev-dev (>= 0.138) | not+linux-gnu,
+ libudev-dev (>= 0.138) [linux-any],
libavahi-glib-dev (>= 0.6),
libavahi-client-dev (>= 0.6),
- libfuse-dev | hurd,
+ libfuse-dev [!hurd-i386],
libgconf2-dev,
- libhal-dev (>= 0.5.10) | linux-gnu,
- libgdu-dev (>= 2.29.0) | not+linux-gnu,
- libgudev-1.0-dev (>= 001) | not+linux-gnu,
+ libhal-dev (>= 0.5.10) [!linux-any],
+ libgdu-dev (>= 2.29.0) [linux-any],
+ libgudev-1.0-dev (>= 001) [linux-any],
libcdio-paranoia-dev (>= 0.78.2),
- libbluetooth-dev (>= 4.0) | not+linux-gnu,
+ libbluetooth-dev (>= 4.0) [linux-any],
libdbus-glib-1-dev,
libexpat1-dev,
libgphoto2-2-dev (>= 2.4.0),
@@ -37,8 +36,8 @@
libsmbclient-dev (>= 3.0),
libarchive-dev,
libltdl-dev,
- libimobiledevice-dev (>= 0.9.7) | hurd
-Standards-Version: 3.8.4
+ libimobiledevice-dev (>= 0.9.7) [!hurd-i386]
+Standards-Version: 3.9.0
Section: libs
Package: gvfs
@@ -67,7 +66,7 @@
gio applications, and the minimal set of backends.
Package: gvfs-fuse
-Architecture: kfreebsd-alpha alpha kfreebsd-amd64 amd64 kfreebsd-arm arm kfreebsd-armeb armeb armel kfreebsd-avr32 avr32 kfreebsd-hppa hppa kfreebsd-i386 i386 kfreebsd-ia64 ia64 lpia kfreebsd-m32r m32r kfreebsd-m68k m68k kfreebsd-mips mips kfreebsd-mipsel mipsel kfreebsd-powerpc powerpc powerpcspe kfreebsd-ppc64 ppc64 kfreebsd-s390 s390 kfreebsd-s390x s390x kfreebsd-sh3 sh3 kfreebsd-sh3eb sh3eb kfreebsd-sh4 sh4 kfreebsd-sh4eb sh4eb kfreebsd-sparc sparc kfreebsd-sparc64 sparc64
+Architecture: linux-any kfreebsd-any
Depends: ${shlibs:Depends},
${misc:Depends},
gvfs (= ${binary:Version}),
Modified: desktop/unstable/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control.in?rev=24632&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control.in [utf-8] (original)
+++ desktop/unstable/gvfs/debian/control.in [utf-8] Fri Jul 2 16:44:47 2010
@@ -7,7 +7,6 @@
cdbs,
gnome-pkg-tools (>= 0.7),
pkg-config,
- type-handling,
gtk-doc-tools,
libglib2.0-dev (>= 2.23.4),
libdbus-1-dev,
@@ -15,16 +14,16 @@
openssh-client,
libsoup-gnome2.4-dev (>= 2.26.0),
libxml2-dev,
- libudev-dev (>= 0.138) | not+linux-gnu,
+ libudev-dev (>= 0.138) [linux-any],
libavahi-glib-dev (>= 0.6),
libavahi-client-dev (>= 0.6),
- libfuse-dev | hurd,
+ libfuse-dev [!hurd-i386],
libgconf2-dev,
- libhal-dev (>= 0.5.10) | linux-gnu,
- libgdu-dev (>= 2.29.0) | not+linux-gnu,
- libgudev-1.0-dev (>= 001) | not+linux-gnu,
+ libhal-dev (>= 0.5.10) [!linux-any],
+ libgdu-dev (>= 2.29.0) [linux-any],
+ libgudev-1.0-dev (>= 001) [linux-any],
libcdio-paranoia-dev (>= 0.78.2),
- libbluetooth-dev (>= 4.0) | not+linux-gnu,
+ libbluetooth-dev (>= 4.0) [linux-any],
libdbus-glib-1-dev,
libexpat1-dev,
libgphoto2-2-dev (>= 2.4.0),
@@ -32,8 +31,8 @@
libsmbclient-dev (>= 3.0),
libarchive-dev,
libltdl-dev,
- libimobiledevice-dev (>= 0.9.7) | hurd
-Standards-Version: 3.8.4
+ libimobiledevice-dev (>= 0.9.7) [!hurd-i386]
+Standards-Version: 3.9.0
Section: libs
Package: gvfs
@@ -62,7 +61,7 @@
gio applications, and the minimal set of backends.
Package: gvfs-fuse
-Architecture: @FUSE_ARCHES@
+Architecture: linux-any kfreebsd-any
Depends: ${shlibs:Depends},
${misc:Depends},
gvfs (= ${binary:Version}),
Modified: desktop/unstable/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/rules?rev=24632&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/rules [utf-8] (original)
+++ desktop/unstable/gvfs/debian/rules [utf-8] Fri Jul 2 16:44:47 2010
@@ -13,8 +13,6 @@
DEB_DH_STRIP_ARGS := --dbg-package=gvfs-dbg
DEB_DH_MAKESHLIBS_ARGS_ALL := -Xlib/gio -Xlib/gvfs
DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
-FUSE_ARCHES := $(shell type-handling any linux,kfreebsd)
MANPAGES += $(patsubst %.pod,%.1,$(wildcard debian/*.pod))
@@ -70,5 +68,4 @@
common-build-arch:: $(MANPAGES)
clean::
- sed -i -e 's/@FUSE_ARCHES@/$(FUSE_ARCHES)/g' debian/control
rm -f $(MANPAGES)
More information about the pkg-gnome-commits
mailing list