Merge lp:~noskcaj/ubuntu/vivid/thunar/merge into lp:ubuntu/vivid/thunar

[Jackson Doak]

Merge from debian

[Sean Davis (bluesabre)]

Tested the package and all looks well. Uploaded to vivid-proposed.

review: Approve (xubuntu-dev)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-04-05 08:22:40 +0000
+++ .pc/applied-patches	2014-11-01 05:54:59 +0000
@@ -1,4 +1,5 @@
 01_support-non-multiarch-modules.patch
+02_fix-default-application-selection.patch
 git-xfdesktop-4.11.patch
 gtk3-bookmarks.patch
 git-save-keyboard-shortcuts.patch
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-04-05 08:22:40 +0000
+++ debian/changelog	2014-11-01 05:54:59 +0000
@@ -1,3 +1,38 @@
+thunar (1.6.3-2ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - debian/control: recommend udisks2 for mounting devices.
+    - Use dh-autoreconf and xdt-autogen to update libtool.m4 for new ports.
+    - Add git-xfdesktop-4.11.patch.
+    - Add gtk3-bookmarks.patch, use new gtk3 bookmark location
+    - Add git-save-keyboard-shortcuts.patch.
+      + Keyboard shortcuts save when changed rather than when thunar is closed
+    - Add menu-icon-tweaks.patch.
+      + Don't use generic folder icons for open with default application
+      + Add icons for open in new tab, new window
+    - Add git-force-toolbr-icons.patch
+      + Fix for "Home" and "Open Parent" icons going missing from toolbar
+
+ -- Jackson Doak <[e-mail]>  Fri, 31 Oct 2014 07:27:27 +1100
+
+thunar (1.6.3-2) unstable; urgency=medium
+
+  [ Evgeni Golov ]
+  * Correct Vcs-* URLs to point to anonscm.debian.org
+
+  [ Jackson Doak ]
+  * Bump standards-version to 3.9.6
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - update long descriptions.
+    - fix typo in thunar-dbg long description
+  * debian/patches:
+    - 02_fix-default-application-selection added, fix selection of default
+      application for opening files, broken since glib 2.42.    closes: #763726
+
+ -- Yves-Alexis Perez <[e-mail]>  Thu, 30 Oct 2014 11:00:02 +0100
+
 thunar (1.6.3-1ubuntu5) trusty; urgency=medium
 
   * Add git-save-keyboard-shortcuts.patch. LP: #1186846
 
=== modified file 'debian/control'
--- debian/control	2013-12-26 22:09:24 +0000
+++ debian/control	2014-11-01 05:54:59 +0000
@@ -11,10 +11,10 @@
  libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.10.0), libnotify-dev,
  libgudev-1.0-dev [linux-any], xfce4-panel-dev (>= 4.10.0),
  dh-autoreconf, xfce4-dev-tools, gtk-doc-tools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.6
 Homepage: http://thunar.xfce.org
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/
+Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/thunar/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/thunar/
 
 Package: libthunarx-2-dev
 Section: libdevel
@@ -44,24 +44,24 @@
 Breaks: thunar-data (<< 1.2.3-3)
 Replaces: thunar-data (<< 1.2.3-3)
 Description: File Manager for Xfce
- Thunar is the file manager designed to be the default file manager of Xfce 4.6
- It has been designed to be fast and easy to use.
+ Thunar is the file manager designed to be the default file manager for the
+ Xfce desktop environment. It has been designed to be fast and easy to use.
  .
- An Xfce plugin can manages the trash, if xfce4-panel is installed as well.
- Please read README.Debian for volume management stuff.
+ Also included is an Xfce panel plugin which can manage the desktop trash.
 
 Package: thunar-data
 Section: xfce
 Architecture: all
 Depends: ${misc:Depends}
 Description: Provides thunar documentation, icons and translations
- This package contains architecture-independent files for thunar.
+ This package contains architecture-independent files for thunar, the file
+ manager and file management libraries for Xfce desktop environment.
 
 Package: thunar-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends}, thunar (= ${binary:Version}), ${misc:Depends}
-Description: debugging informations for thunar
+Description: debugging information for thunar
  This package contains debugging symbols for thunar and libthunarx, the file
- manager and file management libraries for Xfce Desktop Environment.
+ manager and file management libraries for Xfce desktop environment.
 
=== added file 'debian/patches/02_fix-default-application-selection.patch'
--- debian/patches/02_fix-default-application-selection.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_fix-default-application-selection.patch	2014-11-01 05:54:59 +0000
@@ -0,0 +1,39 @@
+Index: Thunar-1.6.3/thunar/thunar-file.c
+===================================================================
+--- Thunar-1.6.3.orig/thunar/thunar-file.c
++++ Thunar-1.6.3/thunar/thunar-file.c
+@@ -3963,6 +3963,7 @@ thunar_file_list_get_applications (GList
+   GList       *next;
+   GList       *ap;
+   GList       *lp;
++  GAppInfo    *default_application;
+   const gchar *previous_type = NULL;
+   const gchar *current_type;
+ 
+@@ -3981,7 +3982,25 @@ thunar_file_list_get_applications (GList
+ 
+       /* determine the list of applications that can open this file */
+       if (G_UNLIKELY (current_type != NULL))
+-        list = g_app_info_get_all_for_type (current_type);
++        {
++          list = g_app_info_get_all_for_type (current_type);
++
++          /* move any default application in front of the list */
++          default_application = g_app_info_get_default_for_type (current_type, FALSE);
++          if (G_LIKELY (default_application != NULL))
++            {
++              for (ap = list; ap != NULL; ap = ap->next)
++                {
++                  if (g_app_info_equal (ap->data, default_application))
++                    {
++                      g_object_unref (ap->data);
++                      list = g_list_delete_link (list, ap);
++                      break;
++                    }
++                }
++              list = g_list_prepend (list, default_application);
++            }
++        }
+       else
+         list = NULL;
+ 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-04-05 08:22:40 +0000
+++ debian/patches/series	2014-11-01 05:54:59 +0000
@@ -1,4 +1,5 @@
 01_support-non-multiarch-modules.patch
+02_fix-default-application-selection.patch
 git-xfdesktop-4.11.patch
 gtk3-bookmarks.patch
 git-save-keyboard-shortcuts.patch
 
=== modified file 'thunar/thunar-file.c'
--- thunar/thunar-file.c	2013-08-15 21:37:17 +0000
+++ thunar/thunar-file.c	2014-11-01 05:54:59 +0000
@@ -3963,6 +3963,7 @@
   GList       *next;
   GList       *ap;
   GList       *lp;
+  GAppInfo    *default_application;
   const gchar *previous_type = NULL;
   const gchar *current_type;
 
@@ -3981,7 +3982,25 @@
 
       /* determine the list of applications that can open this file */
       if (G_UNLIKELY (current_type != NULL))
-        list = g_app_info_get_all_for_type (current_type);
+        {
+          list = g_app_info_get_all_for_type (current_type);
+
+          /* move any default application in front of the list */
+          default_application = g_app_info_get_default_for_type (current_type, FALSE);
+          if (G_LIKELY (default_application != NULL))
+            {
+              for (ap = list; ap != NULL; ap = ap->next)
+                {
+                  if (g_app_info_equal (ap->data, default_application))
+                    {
+                      g_object_unref (ap->data);
+                      list = g_list_delete_link (list, ap);
+                      break;
+                    }
+                }
+              list = g_list_prepend (list, default_application);
+            }
+        }
       else
         list = NULL;