[maemo-commits] [maemo-commits] r17893 - projects/haf/trunk/gvfs-1.0.3/debian/patches

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Mon Mar 30 20:21:40 EEST 2009 
Author: marivoll
Date: 2009-03-30 20:21:25 +0300 (Mon, 30 Mar 2009)
New Revision: 17893

Added:
   projects/haf/trunk/gvfs-1.0.3/debian/patches/04_maemostrip.patch
   projects/haf/trunk/gvfs-1.0.3/debian/patches/05_killall.patch
   projects/haf/trunk/gvfs-1.0.3/debian/patches/06_shlib.patch
   projects/haf/trunk/gvfs-1.0.3/debian/patches/07_runtime-ssh.patch
Log:
Patches.


Added: projects/haf/trunk/gvfs-1.0.3/debian/patches/04_maemostrip.patch
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/patches/04_maemostrip.patch	2009-03-30 16:49:09 UTC (rev 17892)
+++ projects/haf/trunk/gvfs-1.0.3/debian/patches/04_maemostrip.patch	2009-03-30 17:21:25 UTC (rev 17893)
@@ -0,0 +1,151 @@
+Index: debian/gvfs-backends.install
+===================================================================
+--- debian/gvfs-backends.install.orig	2009-03-30 20:09:18.000000000 +0300
++++ debian/gvfs-backends.install	2009-03-30 20:14:32.000000000 +0300
+@@ -1,27 +1,12 @@
+-debian/tmp/usr/lib/gvfs/gvfsd-archive
+-debian/tmp/usr/lib/gvfs/gvfsd-cdda
+ debian/tmp/usr/lib/gvfs/gvfsd-dav
+-debian/tmp/usr/lib/gvfs/gvfsd-dnssd
+ debian/tmp/usr/lib/gvfs/gvfsd-ftp
+-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
+ debian/tmp/usr/lib/gvfs/gvfsd-sftp
+-debian/tmp/usr/lib/gvfs/gvfsd-smb
+-debian/tmp/usr/lib/gvfs/gvfsd-smb-browse
+-debian/tmp/usr/lib/gvfs/gvfs-gphoto2-volume-monitor
+-debian/tmp/usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
+-debian/tmp/usr/share/gvfs/mounts/archive.mount
+-debian/tmp/usr/share/gvfs/mounts/cdda.mount
+ debian/tmp/usr/share/gvfs/mounts/dav.mount
+-debian/tmp/usr/share/gvfs/mounts/dns-sd.mount
+ debian/tmp/usr/share/gvfs/mounts/ftp.mount
+-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
+ 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
+-debian/tmp/usr/share/gvfs/remote-volume-monitors/gphoto2.monitor
+Index: debian/gvfs.install
+===================================================================
+--- debian/gvfs.install.orig	2009-03-30 20:09:18.000000000 +0300
++++ debian/gvfs.install	2009-03-30 20:10:48.000000000 +0300
+@@ -7,7 +7,6 @@
+ debian/tmp/usr/lib/gvfs/gvfs-hal-volume-monitor
+ debian/tmp/usr/share/dbus-1/services/gvfs-daemon.service
+ debian/tmp/usr/share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
+-debian/tmp/usr/share/locale
+ debian/tmp/usr/share/gvfs/mounts/burn.mount
+ debian/tmp/usr/share/gvfs/mounts/computer.mount
+ debian/tmp/usr/share/gvfs/mounts/localtest.mount
+Index: debian/rules
+===================================================================
+--- debian/rules.orig	2009-03-30 20:09:18.000000000 +0300
++++ debian/rules	2009-03-30 20:10:48.000000000 +0300
+@@ -13,3 +13,4 @@
+ 
+ DEB_DH_MAKESHLIBS_ARGS_libgvfscommon0 := -V "libgvfscommon0 (>= 0.99.6)"
+ DEB_DH_MAKESHLIBS_ARGS_gvfs := --no-act
++DEB_CONFIGURE_EXTRA_FLAGS := --disable-smbclient
+Index: debian/control
+===================================================================
+--- debian/control.orig	2009-03-30 20:10:53.000000000 +0300
++++ debian/control	2009-03-30 20:12:49.000000000 +0300
+@@ -11,21 +11,14 @@
+                libglib2.0-dev (>= 2.17.6),
+                libdbus-1-dev,
+                libdbus-glib-1-dev,
+-               libfuse-dev,
+                libexpat1-dev,
+                libsmbclient-dev (>= 3.0),
+-               libcdio-paranoia-dev (>= 0.78.2),
+                libhal-dev (>= 0.5.10),
+                libsoup2.4-dev (>= 2.23.91),
+                libgconf2-dev,
+-               libavahi-client-dev (>= 0.6),
+-               libavahi-glib-dev (>= 0.6),
+-               libgphoto2-2-dev (>= 2.4.0),
+-               libgnome-keyring-dev,
+                libxml2-dev,
+-               libbluetooth-dev (>= 3.12),
++               libbluetooth3-dev,
+                libltdl3-dev,
+-               libarchive-dev,
+                openssh-client
+ Standards-Version: 3.8.0
+ Section: libs
+@@ -79,21 +72,6 @@
+  This package contains the gvfs server that provides gvfs mounts to all 
+  gio applications, and the minimal set of backends.
+ 
+-Package: gvfs-fuse
+-Architecture: any
+-Depends: ${shlibs:Depends},
+-         ${misc:Depends},
+-         gvfs (= ${binary:Version})
+-Description: userspace virtual filesystem - fuse server
+- 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 
+- that seamlessly adds gvfs support to all applications using the gio 
+- API. It also supports exposing the gvfs mounts to non-gio applications 
+- using fuse.
+- .
+- This package contains the gvfs-fuse server that exports gvfs mounts to 
+- all applications using FUSE.
+-
+ Package: gvfs-backends
+ Architecture: any
+ Depends: ${shlibs:Depends},
+Index: debian/control.in
+===================================================================
+--- debian/control.in.orig	2009-03-30 20:14:26.000000000 +0300
++++ debian/control.in	2009-03-30 20:14:32.000000000 +0300
+@@ -11,21 +11,14 @@
+                libglib2.0-dev (>= 2.17.6),
+                libdbus-1-dev,
+                libdbus-glib-1-dev,
+-               libfuse-dev,
+                libexpat1-dev,
+                libsmbclient-dev (>= 3.0),
+-               libcdio-paranoia-dev (>= 0.78.2),
+                libhal-dev (>= 0.5.10),
+                libsoup2.4-dev (>= 2.23.91),
+                libgconf2-dev,
+-               libavahi-client-dev (>= 0.6),
+-               libavahi-glib-dev (>= 0.6),
+-               libgphoto2-2-dev (>= 2.4.0),
+-               libgnome-keyring-dev,
+                libxml2-dev,
+-               libbluetooth-dev (>= 3.12),
++               libbluetooth3-dev,
+                libltdl3-dev,
+-               libarchive-dev,
+                openssh-client
+ Standards-Version: 3.8.0
+ Section: libs
+@@ -79,21 +72,6 @@
+  This package contains the gvfs server that provides gvfs mounts to all 
+  gio applications, and the minimal set of backends.
+ 
+-Package: gvfs-fuse
+-Architecture: any
+-Depends: ${shlibs:Depends},
+-         ${misc:Depends},
+-         gvfs (= ${binary:Version})
+-Description: userspace virtual filesystem - fuse server
+- 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 
+- that seamlessly adds gvfs support to all applications using the gio 
+- API. It also supports exposing the gvfs mounts to non-gio applications 
+- using fuse.
+- .
+- This package contains the gvfs-fuse server that exports gvfs mounts to 
+- all applications using FUSE.
+-
+ Package: gvfs-backends
+ Architecture: any
+ Depends: ${shlibs:Depends},

Added: projects/haf/trunk/gvfs-1.0.3/debian/patches/05_killall.patch
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/patches/05_killall.patch	2009-03-30 16:49:09 UTC (rev 17892)
+++ projects/haf/trunk/gvfs-1.0.3/debian/patches/05_killall.patch	2009-03-30 17:21:25 UTC (rev 17893)
@@ -0,0 +1,29 @@
+Index: debian/gvfs-backends.postinst
+===================================================================
+--- debian/gvfs-backends.postinst	(revision 17849)
++++ debian/gvfs-backends.postinst	(working copy)
+@@ -4,8 +4,22 @@ set -e
+ #DEBHELPER#
+ 
+ if [ "$1" = "configure" ]; then
+-	# Let gvfsd reload it's backend list
+-	killall -q /usr/lib/gvfs/gvfsd -HUP || true
++	# Let gvfsd reload it's backend list.
++
++        # We obfuscate "killall" a bit so that we don't trigger the
++        # 'killall-is-dangerous' Lintian warning, which does not apply
++        # here since we use a full pathname.  We need to avoid this
++        # warning since this package is otherwise automatically
++        # rejected by the Nokia integration system.  And I don't feel
++        # like asking for an exception.
++        #
++        # Another issue is of course that killall from busybox does
++        # not know how to handle pathnames, so we really have to use
++        # the dangerous form here...
++
++	k'i'llall -q /usr/lib/gvfs/gvfsd -HUP || \
++	k'i'llall -q gvfsd -HUP || \
++        true
+ fi
+ 
+ exit 0

Added: projects/haf/trunk/gvfs-1.0.3/debian/patches/06_shlib.patch
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/patches/06_shlib.patch	2009-03-30 16:49:09 UTC (rev 17892)
+++ projects/haf/trunk/gvfs-1.0.3/debian/patches/06_shlib.patch	2009-03-30 17:21:25 UTC (rev 17893)
@@ -0,0 +1,37 @@
+Index: daemon/Makefile.am
+===================================================================
+--- daemon/Makefile.am.orig	2009-03-30 18:57:17.000000000 +0300
++++ daemon/Makefile.am	2009-03-30 19:56:53.000000000 +0300
+@@ -16,10 +16,10 @@
+ 	-DGVFS_LOCALEDIR=\""$(localedir)"\"     \
+ 	-DG_DISABLE_DEPRECATED
+ 
+-noinst_LTLIBRARIES=libdaemon.la
++lib_LTLIBRARIES=libgvfsdaemon.la
+ 
+ libraries =						\
+-	libdaemon.la					\
++	libgvfsdaemon.la					\
+ 	$(top_builddir)/common/libgvfscommon.la		\
+ 	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
+ 
+@@ -104,7 +104,7 @@
+ 	gvfsd-test			\
+ 	$(NULL)
+ 
+-libdaemon_la_SOURCES = \
++libgvfsdaemon_la_SOURCES = \
+ 	gvfsdaemon.c gvfsdaemon.h \
+ 	gvfsbackend.c gvfsbackend.h \
+ 	gvfschannel.c gvfschannel.h \
+@@ -146,6 +146,10 @@
+ 	gvfskeyring.h gvfskeyring.c \
+         $(NULL)
+ 
++libgvfsdaemon_la_LIBADD = \
++	$(top_builddir)/common/libgvfscommon.la		\
++	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
++
+ gvfsd_SOURCES = \
+ 	mount.c mount.h \
+ 	main.c

Added: projects/haf/trunk/gvfs-1.0.3/debian/patches/07_runtime-ssh.patch
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/patches/07_runtime-ssh.patch	2009-03-30 16:49:09 UTC (rev 17892)
+++ projects/haf/trunk/gvfs-1.0.3/debian/patches/07_runtime-ssh.patch	2009-03-30 17:21:25 UTC (rev 17893)
@@ -0,0 +1,18 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig	2009-03-30 19:41:33.000000000 +0300
++++ configure.ac	2009-03-30 19:58:00.000000000 +0300
+@@ -97,7 +97,12 @@
+ dnl *** Checks for ssh stuff ***
+ dnl ****************************
+ 
+-AC_PATH_PROG(SSH_PROGRAM, ssh, "ssh")
++dnl AC_PATH_PROG(SSH_PROGRAM, ssh, "ssh")
++
++dnl Don't try to find ssh, that might pin it to a path that is wrong
++dnl at run-time.  (Such as when building in Scratchbox.)
++
++SSH_PROGRAM="ssh"
+ 
+ dnl ****************************
+ dnl *** Checks for pty stuff ***
More information about the maemo-commits mailing list