r19829 - in /desktop/unstable/gvfs/debian: changelog control control.in rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Apr 29 08:47:20 UTC 2009
Author: joss
Date: Wed Apr 29 08:47:20 2009
New Revision: 19829
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19829
Log:
Require fuse, cdparanoia and bluetooth only on Linux. Use
type-handling to only build gvfs-fuse on Linux architectures.
Closes: #526073.
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=19829&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog (original)
+++ desktop/unstable/gvfs/debian/changelog Wed Apr 29 08:47:20 2009
@@ -3,6 +3,9 @@
* New upstream release.
+ Allows to trash read-only directories. Closes: #341949.
* Update build dependencies and dependencies.
+ * Require fuse, cdparanoia and bluetooth only on Linux. Use
+ type-handling to only build gvfs-fuse on Linux architectures.
+ Closes: #526073.
* Disable obexftp backend until bluez 4.0 is available.
* 02_http_unescape.patch: removed, merged upstream.
* 02_deprecated.patch: new patch. Don’t use G_DISABLE_DEPRECATED in
Modified: desktop/unstable/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control?rev=19829&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control (original)
+++ desktop/unstable/gvfs/debian/control Wed Apr 29 08:47:20 2009
@@ -1,4 +1,4 @@
-Source: gvfs
+xSource: gvfs
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
@@ -8,6 +8,7 @@
quilt,
gnome-pkg-tools (>= 0.7),
pkg-config,
+ type-handling,
gtk-doc-tools,
libglib2.0-dev (>= 2.19.1),
libdbus-1-dev,
@@ -17,20 +18,19 @@
libxml2-dev,
libavahi-glib-dev (>= 0.6),
libavahi-client-dev (>= 0.6),
- libfuse-dev,
+ libfuse-dev | not+linux-gnu,
libgconf2-dev,
libhal-dev (>= 0.5.10),
- libcdio-paranoia-dev (>= 0.78.2),
-# libbluetooth-dev (>= 4.0),
+ libcdio-paranoia-dev (>= 0.78.2) | not+linux-gnu,
+# libbluetooth-dev (>= 4.0) | not+linux-gnu,
# libdbus-glib-1-dev,
- libdbus-glib-1-devd,
- libexpat1-dev,
- libsmbclient-dev (>= 3.0),
+# libexpat1-dev,
libgphoto2-2-dev (>= 2.4.0),
libgnome-keyring-dev,
- libltdl-dev,
+ libsmbclient-dev (>= 3.0),
libarchive-dev,
-Standards-Version: 3.8.0
+ libltdl-dev
+Standards-Version: 3.8.1
Section: libs
Package: libgvfscommon0
@@ -54,7 +54,8 @@
Depends: libgvfscommon0 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
- libglib2.0-dev (>= 2.17.6)
+ libglib2.0-dev (>= 2.19.1),
+ libdbus-1-dev
Description: userspace virtual filesystem - development files
gvfs is a userspace virtual filesystem where mount runs as a separate
processes which you talk to via D-Bus. It also contains a gio module
@@ -83,7 +84,7 @@
gio applications, and the minimal set of backends.
Package: gvfs-fuse
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
Depends: ${shlibs:Depends},
${misc:Depends},
gvfs (= ${binary:Version})
@@ -102,7 +103,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
gvfs (= ${binary:Version})
-Recommends: obex-data-server
+# Recommends: obex-data-server
Description: userspace virtual filesystem - backends
gvfs is a userspace virtual filesystem where mount runs as a separate
processes which you talk to via D-Bus. It also contains a gio module
@@ -111,7 +112,7 @@
using fuse.
.
This package contains the archive, cdda, dav, dnssd, ftp, gphoto2,
- http, network, obexftp, sftp, smb and smb-browse backends.
+ http, network, sftp, smb and smb-browse backends.
Package: gvfs-bin
Architecture: any
Modified: desktop/unstable/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/control.in?rev=19829&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/control.in (original)
+++ desktop/unstable/gvfs/debian/control.in Wed Apr 29 08:47:20 2009
@@ -1,4 +1,4 @@
-Source: gvfs
+xSource: gvfs
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: @GNOME_TEAM@
@@ -8,6 +8,7 @@
quilt,
gnome-pkg-tools (>= 0.7),
pkg-config,
+ type-handling,
gtk-doc-tools,
libglib2.0-dev (>= 2.19.1),
libdbus-1-dev,
@@ -17,11 +18,11 @@
libxml2-dev,
libavahi-glib-dev (>= 0.6),
libavahi-client-dev (>= 0.6),
- libfuse-dev,
+ libfuse-dev | not+linux-gnu,
libgconf2-dev,
libhal-dev (>= 0.5.10),
- libcdio-paranoia-dev (>= 0.78.2),
-# libbluetooth-dev (>= 4.0),
+ libcdio-paranoia-dev (>= 0.78.2) | not+linux-gnu,
+# libbluetooth-dev (>= 4.0) | not+linux-gnu,
# libdbus-glib-1-dev,
# libexpat1-dev,
libgphoto2-2-dev (>= 2.4.0),
@@ -83,7 +84,7 @@
gio applications, and the minimal set of backends.
Package: gvfs-fuse
-Architecture: any
+Architecture: @LINUX@
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=19829&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/rules (original)
+++ desktop/unstable/gvfs/debian/rules Wed Apr 29 08:47:20 2009
@@ -14,3 +14,8 @@
DEB_DH_MAKESHLIBS_ARGS_libgvfscommon0 := -V "libgvfscommon0 (>= 1.2.1)"
DEB_DH_MAKESHLIBS_ARGS_gvfs := --no-act
DEB_DH_STRIP_ARGS := --dbg-package=gvfs-dbg
+
+LINUX_ARCHES := $(shell type-handling any linux)
+
+clean::
+ sed -i 's/@LINUX@/$(LINUX_ARCHES)/' debian/control
More information about the pkg-gnome-commits
mailing list