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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2009-03-31 16:20:42 +0300 (Tue, 31 Mar 2009)
New Revision: 17906

Modified:
   projects/haf/trunk/gvfs-1.0.3/debian/patches/06_shlib.patch
Log:
Refreshed patch.


Modified: 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-31 13:20:21 UTC (rev 17905)
+++ projects/haf/trunk/gvfs-1.0.3/debian/patches/06_shlib.patch	2009-03-31 13:20:42 UTC (rev 17906)
@@ -38,7 +38,7 @@
 Index: daemon/Makefile.in
 ===================================================================
 --- daemon/Makefile.in.orig	2009-03-30 23:09:13.000000000 +0300
-+++ daemon/Makefile.in	2009-03-30 23:09:34.000000000 +0300
++++ daemon/Makefile.in	2009-03-30 23:10:39.000000000 +0300
 @@ -66,24 +66,37 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
@@ -139,7 +139,15 @@
  mountDATA_INSTALL = $(INSTALL_DATA)
  serviceDATA_INSTALL = $(INSTALL_DATA)
  DATA = $(mount_DATA) $(service_DATA)
-@@ -441,9 +445,9 @@
+@@ -365,7 +369,6 @@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-SSH_PROGRAM = @SSH_PROGRAM@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -441,9 +444,9 @@
  	-DGVFS_LOCALEDIR=\""$(localedir)"\"     \
  	-DG_DISABLE_DEPRECATED
  
@@ -151,7 +159,7 @@
  	$(top_builddir)/common/libgvfscommon.la		\
  	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
  
-@@ -462,7 +466,7 @@
+@@ -462,7 +465,7 @@
  @USE_OBEXFTP_TRUE at BUILT_SOURCES = obexftp-marshal.c obexftp-marshal.h
  EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
  DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
@@ -160,7 +168,7 @@
  	gvfsdaemon.c gvfsdaemon.h \
  	gvfsbackend.c gvfsbackend.h \
  	gvfschannel.c gvfschannel.h \
-@@ -504,6 +508,10 @@
+@@ -504,6 +507,10 @@
  	gvfskeyring.h gvfskeyring.c \
          $(NULL)
  
@@ -171,7 +179,7 @@
  gvfsd_SOURCES = \
  	mount.c mount.h \
  	main.c
-@@ -768,17 +776,35 @@
+@@ -768,17 +775,35 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -212,7 +220,7 @@
  install-libexecPROGRAMS: $(libexec_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-@@ -1971,7 +1997,7 @@
+@@ -1971,7 +1996,7 @@
  	$(MAKE) $(AM_MAKEFLAGS) check-am
  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
  installdirs:
@@ -221,7 +229,7 @@
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
-@@ -2003,8 +2029,8 @@
+@@ -2003,8 +2028,8 @@
  	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
  clean: clean-am
  
@@ -232,7 +240,7 @@
  
  distclean: distclean-am
  	-rm -rf ./$(DEPDIR)
-@@ -2026,7 +2052,7 @@
+@@ -2026,7 +2051,7 @@
  
  install-dvi: install-dvi-am
  
@@ -241,7 +249,7 @@
  
  install-html: install-html-am
  
-@@ -2058,26 +2084,28 @@
+@@ -2058,26 +2083,28 @@
  
  ps-am: