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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2009-03-30 20:22:51 +0300 (Mon, 30 Mar 2009)
New Revision: 17894

Modified:
   projects/haf/trunk/gvfs-1.0.3/debian/patches/03_pre_unmount.patch
   projects/haf/trunk/gvfs-1.0.3/debian/patches/99_ltmain_as-needed.patch
   projects/haf/trunk/gvfs-1.0.3/debian/patches/series
Log:
Patches.


Modified: projects/haf/trunk/gvfs-1.0.3/debian/patches/03_pre_unmount.patch
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/patches/03_pre_unmount.patch	2009-03-30 17:21:25 UTC (rev 17893)
+++ projects/haf/trunk/gvfs-1.0.3/debian/patches/03_pre_unmount.patch	2009-03-30 17:22:51 UTC (rev 17894)
@@ -1,7 +1,7 @@
 Index: gvfs-1.0.3/monitor/hal/ghalmount.c
 ===================================================================
---- gvfs-1.0.3.orig/monitor/hal/ghalmount.c	2008-09-14 15:05:05.000000000 +0300
-+++ gvfs-1.0.3/monitor/hal/ghalmount.c	2009-03-30 17:17:17.000000000 +0300
+--- gvfs-1.0.3.orig/monitor/hal/ghalmount.c	2009-03-30 18:49:23.000000000 +0300
++++ gvfs-1.0.3/monitor/hal/ghalmount.c	2009-03-30 19:43:57.000000000 +0300
 @@ -906,6 +906,7 @@
    guint error_channel_source_id;
    GString *error_string;
@@ -98,8 +98,8 @@
  g_hal_mount_unmount (GMount              *mount,
 Index: gvfs-1.0.3/monitor/proxy/gproxyvolumemonitor.c
 ===================================================================
---- gvfs-1.0.3.orig/monitor/proxy/gproxyvolumemonitor.c	2008-09-23 21:54:17.000000000 +0300
-+++ gvfs-1.0.3/monitor/proxy/gproxyvolumemonitor.c	2009-03-30 17:17:34.000000000 +0300
+--- gvfs-1.0.3.orig/monitor/proxy/gproxyvolumemonitor.c	2009-03-30 18:49:23.000000000 +0300
++++ gvfs-1.0.3/monitor/proxy/gproxyvolumemonitor.c	2009-03-30 19:43:57.000000000 +0300
 @@ -602,10 +602,7 @@
        {
          mount = g_hash_table_lookup (monitor->mounts, id);

Modified: projects/haf/trunk/gvfs-1.0.3/debian/patches/99_ltmain_as-needed.patch
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/patches/99_ltmain_as-needed.patch	2009-03-30 17:21:25 UTC (rev 17893)
+++ projects/haf/trunk/gvfs-1.0.3/debian/patches/99_ltmain_as-needed.patch	2009-03-30 17:22:51 UTC (rev 17894)
@@ -1,8 +1,8 @@
-Index: bug-buddy-2.24.1/ltmain.sh
+Index: gvfs-1.0.3/ltmain.sh
 ===================================================================
---- bug-buddy-2.24.1.orig/ltmain.sh	2008-11-13 16:38:58.930987388 +0100
-+++ bug-buddy-2.24.1/ltmain.sh	2008-11-13 16:39:01.278988042 +0100
-@@ -1807,6 +1807,11 @@ EOF
+--- gvfs-1.0.3.orig/ltmain.sh	2009-03-27 21:37:40.000000000 +0200
++++ gvfs-1.0.3/ltmain.sh	2009-03-30 19:46:39.000000000 +0300
+@@ -1794,6 +1794,11 @@
  	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
  	;;
  
@@ -14,7 +14,7 @@
        -Wl,*)
  	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
  	arg=
-@@ -2150,6 +2155,15 @@ EOF
+@@ -2134,6 +2139,15 @@
  	lib=
  	found=no
  	case $deplib in

Modified: projects/haf/trunk/gvfs-1.0.3/debian/patches/series
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/debian/patches/series	2009-03-30 17:21:25 UTC (rev 17893)
+++ projects/haf/trunk/gvfs-1.0.3/debian/patches/series	2009-03-30 17:22:51 UTC (rev 17894)
@@ -1,4 +1,7 @@
 02_http_unescape.patch
 03_pre_unmount.patch
-90_relibtoolize.patch
+04_maemostrip.patch -p0
+05_killall.patch -p0
+06_shlib.patch -p0
+07_runtime-ssh.patch -p0
 99_ltmain_as-needed.patch