[Pkg-xfce-commits] r5777 - in desktop/trunk/thunar/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-05-27 06:00:15 +0000 (Fri, 27 May 2011)
New Revision: 5777

Removed:
   desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch
Modified:
   desktop/trunk/thunar/debian/changelog
   desktop/trunk/thunar/debian/patches/series
Log:
  - 02_thunar-icon-naming-spec-compliance dropped, don't replace stock icons
    even if they aren't part of the spec.
  - 03_Don-t-interpret-file-display-names-as-format-strings dropped,
    included upstream.

Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2011-05-27 05:57:06 UTC (rev 5776)
+++ desktop/trunk/thunar/debian/changelog	2011-05-27 06:00:15 UTC (rev 5777)
@@ -4,13 +4,16 @@
     - load network stuff later to speed up start (Xfce #7373).  closes: #626200
   * debian/patches:
     - 01_use-system-td dropped, included upstream.
-    - 03_Don-t-interpret-file-display-names-as-format-strings as well.
+    - 02_thunar-icon-naming-spec-compliance dropped, don't replace stock icons
+      even if they aren't part of the spec.
+    - 03_Don-t-interpret-file-display-names-as-format-strings dropped,
+      included upstream.
   * debian/control:
     - drop build-dep on xfce4-dev-tools, libtool and gtk-doc-tools
   * debian/rules:
     - don't run xdt-autogen anymore.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 27 May 2011 00:27:39 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 27 May 2011 07:59:39 +0200
 
 thunar (1.2.1-6) unstable; urgency=low
 

Deleted: desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch	2011-05-27 05:57:06 UTC (rev 5776)
+++ desktop/trunk/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch	2011-05-27 06:00:15 UTC (rev 5777)
@@ -1,63 +0,0 @@
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-index dc12c08..ec1b178 100644
---- a/po/POTFILES.skip
-+++ b/po/POTFILES.skip
-@@ -6,3 +6,5 @@ thunarx/thunarx-property-page-provider.c
- thunarx/thunarx-provider-factory.c
- thunarx/thunarx-provider-module.c
- thunarx/thunarx-renamer-provider.c
-+.pc/02_thunar-icon-naming-spec-compliance.patch/thunar/thunar-application.c
-+.pc/02_thunar-icon-naming-spec-compliance.patch/thunar/thunar-dialogs.c
-diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
-index dc12c08..ec1b178 100644
---- a/thunar/thunar-application.c
-+++ b/thunar/thunar-application.c
-@@ -1282,7 +1282,7 @@ thunar_application_copy_to (ThunarApplication *application,
-   _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
- 
-   /* launch the operation */
--  thunar_application_launch (application, parent, "stock_folder-copy",
-+  thunar_application_launch (application, parent, "gtk-copy",
-                              _("Copying files..."), thunar_io_jobs_copy_files,
-                              source_file_list, target_file_list, new_files_closure);
- }
-@@ -1323,7 +1323,7 @@ thunar_application_copy_into (ThunarApplication *application,
-    g_free (display_name);
- 
-   /* collect the target files and launch the job */
--  thunar_application_collect_and_launch (application, parent, "stock_folder-copy",
-+  thunar_application_collect_and_launch (application, parent, "gtk-copy",
-                                          title, thunar_io_jobs_copy_files,
-                                          source_file_list, target_file, 
-                                          new_files_closure);
-@@ -1423,7 +1423,7 @@ thunar_application_move_into (ThunarApplication *application,
- 
-       /* collect the target files and launch the job */
-       thunar_application_collect_and_launch (application, parent, 
--                                             "stock_folder-move", title,
-+                                             "folder-move", title,
-                                              thunar_io_jobs_move_files, 
-                                              source_file_list, target_file, 
-                                              new_files_closure);
-@@ -1785,7 +1785,7 @@ thunar_application_restore_files (ThunarApplication *application,
-   else
-     {
-       /* launch the operation */
--      thunar_application_launch (application, parent, "stock_folder-move",
-+      thunar_application_launch (application, parent, "folder-move",
-                                  _("Restoring files..."), thunar_io_jobs_restore_files,
-                                  source_path_list, target_path_list, new_files_closure);
-     }
-diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
-index fecaac4..ae55dba 100644
---- a/thunar/thunar-dialogs.c
-+++ b/thunar/thunar-dialogs.c
-@@ -586,7 +586,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow  *parent,
-   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0);
-   gtk_widget_show (table);
- 
--  image = gtk_image_new_from_icon_name ("stock_folder-copy", GTK_ICON_SIZE_BUTTON);
-+  image = gtk_image_new_from_icon_name ("gtk-copy", GTK_ICON_SIZE_BUTTON);
-   gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
-   gtk_misc_set_padding (GTK_MISC (image), 6, 6);
-   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);

Modified: desktop/trunk/thunar/debian/patches/series
===================================================================
--- desktop/trunk/thunar/debian/patches/series	2011-05-27 05:57:06 UTC (rev 5776)
+++ desktop/trunk/thunar/debian/patches/series	2011-05-27 06:00:15 UTC (rev 5777)
@@ -1,2 +1 @@
-02_thunar-icon-naming-spec-compliance.patch
 04_fix-maxpathlen-hurd.patch