r31734 - in /desktop/unstable/nautilus/debian: changelog patches/03_deprecated.patch patches/12_list-view_expand.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Nov 21 19:52:36 2011
New Revision: 31734

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31734
Log:
Refresh patches.

Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/03_deprecated.patch
    desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=31734&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Mon Nov 21 19:52:36 2011
@@ -14,8 +14,9 @@
     - Update Vcs-* URLs.
   * debian/nautilus-data.gconf-defaults:
     - Removed, obsolete.
-
- -- Michael Biebl <biebl at debian.org>  Mon, 21 Nov 2011 14:58:00 +0100
+  * Refresh patches.
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 21 Nov 2011 20:52:11 +0100
 
 nautilus (3.2.1-1) experimental; urgency=low
 

Modified: desktop/unstable/nautilus/debian/patches/03_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/03_deprecated.patch?rev=31734&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/03_deprecated.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/03_deprecated.patch [utf-8] Mon Nov 21 19:52:36 2011
@@ -1,8 +1,8 @@
-Index: nautilus-3.0.2/configure.in
+Index: nautilus-3.2.1/configure.in
 ===================================================================
---- nautilus-3.0.2.orig/configure.in	2011-05-24 20:49:07.000000000 +0200
-+++ nautilus-3.0.2/configure.in	2011-05-29 11:34:17.862190932 +0200
-@@ -302,7 +302,7 @@ PKG_CHECK_MODULES(NAUTILUS, [
+--- nautilus-3.2.1.orig/configure.in	2011-10-17 23:18:37.000000000 +0200
++++ nautilus-3.2.1/configure.in	2011-11-21 20:51:57.975414128 +0100
+@@ -322,7 +322,7 @@
  AC_SUBST(NAUTILUS_CFLAGS)
  AC_SUBST(NAUTILUS_LIBS)
  

Modified: desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch?rev=31734&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/12_list-view_expand.patch [utf-8] Mon Nov 21 19:52:36 2011
@@ -1,10 +1,10 @@
 Revert upstream commits r12779 and r13045.
 We can do this because we fix GNOME #316087 in our GTK+ packages.
-Index: nautilus-3.0.2/src/nautilus-list-view.c
+Index: nautilus-3.2.1/src/nautilus-list-view.c
 ===================================================================
---- nautilus-3.0.2.orig/src/nautilus-list-view.c	2011-05-24 20:46:25.000000000 +0200
-+++ nautilus-3.0.2/src/nautilus-list-view.c	2011-05-31 19:53:21.745355384 +0200
-@@ -59,7 +59,6 @@
+--- nautilus-3.2.1.orig/src/nautilus-list-view.c	2011-10-17 22:29:15.000000000 +0200
++++ nautilus-3.2.1/src/nautilus-list-view.c	2011-11-21 20:52:02.675413957 +0100
+@@ -58,7 +58,6 @@
  #include <libnautilus-private/nautilus-module.h>
  #include <libnautilus-private/nautilus-tree-view-drag-dest.h>
  #include <libnautilus-private/nautilus-clipboard.h>
@@ -12,7 +12,7 @@
  
  #define DEBUG_FLAG NAUTILUS_DEBUG_LIST_VIEW
  #include <libnautilus-private/nautilus-debug.h>
-@@ -1673,7 +1672,7 @@ create_and_set_up_tree_view (NautilusLis
+@@ -1661,7 +1660,7 @@
  
  	for (l = nautilus_columns; l != NULL; l = l->next) {
  		NautilusColumn *nautilus_column;
@@ -21,7 +21,7 @@
  		char *name;
  		char *label;
  		float xalign;
-@@ -1696,6 +1695,9 @@ create_and_set_up_tree_view (NautilusLis
+@@ -1684,6 +1683,9 @@
  			view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell;
  			
  			view->details->file_name_column = gtk_tree_view_column_new ();
@@ -31,7 +31,7 @@
  			g_object_ref_sink (view->details->file_name_column);
  			view->details->file_name_column_num = column_num;
  			
-@@ -1715,7 +1717,11 @@ create_and_set_up_tree_view (NautilusLis
+@@ -1703,7 +1705,11 @@
  							     "pixbuf", NAUTILUS_LIST_MODEL_SMALLEST_ICON_COLUMN,
  							     NULL);