r20847 - in /desktop/unstable/gvfs/debian: changelog gvfs-backends.install rules

[pochu-guest at users.alioth.debian.org]

Author: pochu-guest
Date: Sat Aug  8 23:11:50 2009
New Revision: 20847

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20847
Log:
Only install obexftp on Linux systems, it's not available elsewhere.
Thanks Cyril Brulebois. Closes: #540482.

Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/gvfs-backends.install
    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=20847&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog [utf-8] Sat Aug  8 23:11:50 2009
@@ -5,6 +5,8 @@
 
   [ Emilio Pozuelo Monfort ]
   * Add a watch file.
+  * Only install obexftp on Linux systems, it's not available elsewhere.
+    Thanks Cyril Brulebois. Closes: #540482.
 
  -- Josselin Mouette <joss at debian.org>  Wed, 10 Jun 2009 13:21:01 +0200
 

Modified: desktop/unstable/gvfs/debian/gvfs-backends.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/gvfs-backends.install?rev=20847&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/gvfs-backends.install [utf-8] (original)
+++ desktop/unstable/gvfs/debian/gvfs-backends.install [utf-8] Sat Aug  8 23:11:50 2009
@@ -6,7 +6,8 @@
 debian/tmp/usr/lib/gvfs/gvfsd-gphoto2
 debian/tmp/usr/lib/gvfs/gvfsd-http
 debian/tmp/usr/lib/gvfs/gvfsd-network
-debian/tmp/usr/lib/gvfs/gvfsd-obexftp
+# Now installed from debian/rules:
+# debian/tmp/usr/lib/gvfs/gvfsd-obexftp
 debian/tmp/usr/lib/gvfs/gvfsd-sftp
 debian/tmp/usr/lib/gvfs/gvfsd-smb
 debian/tmp/usr/lib/gvfs/gvfsd-smb-browse
@@ -22,7 +23,8 @@
 debian/tmp/usr/share/gvfs/mounts/gphoto2.mount
 debian/tmp/usr/share/gvfs/mounts/http.mount
 debian/tmp/usr/share/gvfs/mounts/network.mount
-debian/tmp/usr/share/gvfs/mounts/obexftp.mount
+# Now installed from debian/rules:
+# debian/tmp/usr/share/gvfs/mounts/obexftp.mount
 debian/tmp/usr/share/gvfs/mounts/sftp.mount
 debian/tmp/usr/share/gvfs/mounts/smb-browse.mount
 debian/tmp/usr/share/gvfs/mounts/smb.mount

Modified: desktop/unstable/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/rules?rev=20847&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/rules [utf-8] (original)
+++ desktop/unstable/gvfs/debian/rules [utf-8] Sat Aug  8 23:11:50 2009
@@ -13,8 +13,16 @@
 
 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)
 
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+install/gvfs-backends::
+	# Those are only available on Linux:
+	dh_install -pgvfs-backends debian/tmp/usr/lib/gvfs/gvfsd-obexftp
+	dh_install -pgvfs-backends debian/tmp/usr/share/gvfs/mounts/obexftp.mount
+endif
+
 clean::
 	sed -i 's/@FUSE_ARCHES@/$(FUSE_ARCHES)/' debian/control