r16196 - in /desktop/unstable/nautilus/debian: changelog patches/06_dont_create_Desktop.patch patches/20_upstream_nautilus-dnd-user-owned.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jun  7 13:38:12 2008
New Revision: 16196

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16196
Log:
06_dont_create_Desktop.patch, 
20_upstream_nautilus-dnd-user-owned.patch: make patches apply with 
-p1. Closes: #484953.

Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch
    desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch
    desktop/unstable/nautilus/debian/patches/series

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=16196&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Sat Jun  7 13:38:12 2008
@@ -3,6 +3,9 @@
   * 05_places-sidebar_single-click.patch: replaced by upstream version 
     of the patch, that does not activate items while right-clicking 
     them. Closes: #414960.
+  * 06_dont_create_Desktop.patch, 
+    20_upstream_nautilus-dnd-user-owned.patch: make patches apply with 
+    -p1. Closes: #484953.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 07 Jun 2008 13:05:26 +0200
 

Modified: desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch?rev=16196&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch (original)
+++ desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch Sat Jun  7 13:38:12 2008
@@ -3,8 +3,8 @@
 Don't create the Desktop folder when launched with --no-desktop.
 Index: libnautilus-private/nautilus-monitor.c
 ===================================================================
---- libnautilus-private/nautilus-monitor.c.orig	2007-04-03 12:08:46.000000000 +0200
-+++ libnautilus-private/nautilus-monitor.c	2007-09-24 11:38:42.713813039 +0200
+--- a/libnautilus-private/nautilus-monitor.c	2007-04-03 12:08:46.000000000 +0200
++++ b/libnautilus-private/nautilus-monitor.c	2007-09-24 11:38:42.713813039 +0200
 @@ -38,6 +38,13 @@
  	GnomeVFSMonitorHandle *handle;
  };
@@ -54,8 +54,8 @@
  
 Index: libnautilus-private/nautilus-monitor.h
 ===================================================================
---- libnautilus-private/nautilus-monitor.h.orig	2007-04-03 12:08:46.000000000 +0200
-+++ libnautilus-private/nautilus-monitor.h	2007-09-24 11:38:42.713813039 +0200
+--- a/libnautilus-private/nautilus-monitor.h	2007-04-03 12:08:46.000000000 +0200
++++ b/libnautilus-private/nautilus-monitor.h	2007-09-24 11:38:42.713813039 +0200
 @@ -30,6 +30,7 @@
  
  typedef struct NautilusMonitor NautilusMonitor;
@@ -66,8 +66,8 @@
  NautilusMonitor *nautilus_monitor_directory (const char      *uri);
 Index: src/nautilus-application.c
 ===================================================================
---- src/nautilus-application.c.orig	2007-09-10 08:56:43.000000000 +0200
-+++ src/nautilus-application.c	2007-09-24 11:38:42.713813039 +0200
+--- a/src/nautilus-application.c	2007-09-10 08:56:43.000000000 +0200
++++ b/src/nautilus-application.c	2007-09-24 11:38:42.713813039 +0200
 @@ -245,7 +245,7 @@
  }
  

Modified: desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch?rev=16196&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch (original)
+++ desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch Sat Jun  7 13:38:12 2008
@@ -2,8 +2,8 @@
 GNOME #339154
 Index: libnautilus-private/nautilus-dnd.c
 ===================================================================
---- libnautilus-private/nautilus-dnd.c.orig	2007-04-10 14:06:07.000000000 +0200
-+++ libnautilus-private/nautilus-dnd.c	2007-04-26 00:31:56.596966250 +0200
+--- a/libnautilus-private/nautilus-dnd.c	2007-04-10 14:06:07.000000000 +0200
++++ b/libnautilus-private/nautilus-dnd.c	2007-04-26 00:31:56.596966250 +0200
 @@ -303,6 +303,26 @@
  	return context->suggested_action;
  }

Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=16196&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series (original)
+++ desktop/unstable/nautilus/debian/patches/series Sat Jun  7 13:38:12 2008
@@ -3,7 +3,7 @@
 03_sftp_connect.patch
 04_show_backup_files.patch
 05_places-sidebar_single-click.patch
-06_dont_create_Desktop.patch -p0
+06_dont_create_Desktop.patch
 07_desktop_file_activation.patch
 08_folder_handler.patch
 10_location_titlebar.patch
@@ -12,7 +12,7 @@
 14_sidebar_network-protocol.patch
 15_tracker_check.patch
 16_missing_thumbnails.patch
-20_upstream_nautilus-dnd-user-owned.patch -p0
+20_upstream_nautilus-dnd-user-owned.patch
 21_nautilus_xmp.patch
 23_thumbnails_add-border.patch
 99_ltmain_as-needed.patch