[maemo-commits] [maemo-commits] r17847 - projects/haf/trunk/gvfs

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2009-03-27 20:48:11 +0200 (Fri, 27 Mar 2009)
New Revision: 17847

Added:
   projects/haf/trunk/gvfs/runtime-ssh.patch
   projects/haf/trunk/gvfs/shlib.patch
   projects/haf/trunk/gvfs/strip-l10n.patch
   projects/haf/trunk/gvfs/strip-smb.patch
Log:
Added patches that went into 0.2.5-1maemo3.


Added: projects/haf/trunk/gvfs/runtime-ssh.patch
===================================================================
--- projects/haf/trunk/gvfs/runtime-ssh.patch	2009-03-27 15:23:24 UTC (rev 17846)
+++ projects/haf/trunk/gvfs/runtime-ssh.patch	2009-03-27 18:48:11 UTC (rev 17847)
@@ -0,0 +1,18 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 16301)
++++ configure.ac	(revision 17130)
+@@ -96,7 +96,12 @@ dnl ****************************
+ 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 ***

Added: projects/haf/trunk/gvfs/shlib.patch
===================================================================
--- projects/haf/trunk/gvfs/shlib.patch	2009-03-27 15:23:24 UTC (rev 17846)
+++ projects/haf/trunk/gvfs/shlib.patch	2009-03-27 18:48:11 UTC (rev 17847)
@@ -0,0 +1,26 @@
+Index: daemon/Makefile.am
+===================================================================
+--- daemon/Makefile.am	(revision 16301)
++++ daemon/Makefile.am	(revision 17130)
+@@ -16,10 +16,10 @@ INCLUDES =					\
+ 	-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)
+ 
+@@ -105,7 +105,7 @@ noinst_PROGRAMS =				\
+ 	gvfsd-test			\
+ 	$(NULL)
+ 
+-libdaemon_la_SOURCES = \
++libgvfsdaemon_la_SOURCES = \
+ 	gvfsdaemon.c gvfsdaemon.h \
+ 	gvfsbackend.c gvfsbackend.h \
+ 	gvfschannel.c gvfschannel.h \

Added: projects/haf/trunk/gvfs/strip-l10n.patch
===================================================================
--- projects/haf/trunk/gvfs/strip-l10n.patch	2009-03-27 15:23:24 UTC (rev 17846)
+++ projects/haf/trunk/gvfs/strip-l10n.patch	2009-03-27 18:48:11 UTC (rev 17847)
@@ -0,0 +1,10 @@
+Index: debian/gvfs.install
+===================================================================
+--- debian/gvfs.install	(revision 16301)
++++ debian/gvfs.install	(revision 17130)
+@@ -1,5 +1,3 @@
+ debian/tmp/usr/lib/gio/modules/*.so
+ debian/tmp/usr/lib/gvfs/gvfsd
+ debian/tmp/usr/share/dbus-1
+-debian/tmp/usr/share/locale
+-

Added: projects/haf/trunk/gvfs/strip-smb.patch
===================================================================
--- projects/haf/trunk/gvfs/strip-smb.patch	2009-03-27 15:23:24 UTC (rev 17846)
+++ projects/haf/trunk/gvfs/strip-smb.patch	2009-03-27 18:48:11 UTC (rev 17847)
@@ -0,0 +1,22 @@
+Index: debian/gvfs-backends.install
+===================================================================
+--- debian/gvfs-backends.install	(revision 16301)
++++ debian/gvfs-backends.install	(revision 17130)
+@@ -6,7 +6,5 @@ debian/tmp/usr/lib/gvfs/gvfsd-localtest
+ 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/gvfsd-trash
+ debian/tmp/usr/share/gvfs
+Index: debian/rules
+===================================================================
+--- debian/rules	(revision 16301)
++++ debian/rules	(revision 17130)
+@@ -7,3 +7,5 @@ include /usr/share/cdbs/1/class/gnome.mk
+ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+ include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+ -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
++
++DEB_CONFIGURE_EXTRA_FLAGS := --disable-smbclient