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

Proposed by Jackson Doak on 2014-11-01
Status: Merged
Merged at revision: 98
Proposed branch: lp:~noskcaj/ubuntu/vivid/thunar/merge
Merge into: lp:ubuntu/vivid/thunar
Diff against target: 194 lines (+106/-11)
6 files modified
.pc/applied-patches (+1/-0)
debian/changelog (+35/-0)
debian/control (+10/-10)
debian/patches/02_fix-default-application-selection.patch (+39/-0)
debian/patches/series (+1/-0)
thunar/thunar-file.c (+20/-1)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/vivid/thunar/merge
Reviewer Review Type Date Requested Status
Sean Davis (community) xubuntu-dev Approve on 2014-11-03
Ubuntu branches 2014-11-01 Pending
Review via email: mp+240349@code.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Sean Davis (bluesabre) wrote :

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

review: Approve (xubuntu-dev)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
101_support-non-multiarch-modules.patch101_support-non-multiarch-modules.patch
202_fix-default-application-selection.patch
2git-xfdesktop-4.11.patch3git-xfdesktop-4.11.patch
3gtk3-bookmarks.patch4gtk3-bookmarks.patch
4git-save-keyboard-shortcuts.patch5git-save-keyboard-shortcuts.patch
56
=== 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 @@
1thunar (1.6.3-2ubuntu1) vivid; urgency=medium
2
3 * Merge from Debian. Remaining changes:
4 - debian/control: recommend udisks2 for mounting devices.
5 - Use dh-autoreconf and xdt-autogen to update libtool.m4 for new ports.
6 - Add git-xfdesktop-4.11.patch.
7 - Add gtk3-bookmarks.patch, use new gtk3 bookmark location
8 - Add git-save-keyboard-shortcuts.patch.
9 + Keyboard shortcuts save when changed rather than when thunar is closed
10 - Add menu-icon-tweaks.patch.
11 + Don't use generic folder icons for open with default application
12 + Add icons for open in new tab, new window
13 - Add git-force-toolbr-icons.patch
14 + Fix for "Home" and "Open Parent" icons going missing from toolbar
15
16 -- Jackson Doak <noskcaj@ubuntu.com> Fri, 31 Oct 2014 07:27:27 +1100
17
18thunar (1.6.3-2) unstable; urgency=medium
19
20 [ Evgeni Golov ]
21 * Correct Vcs-* URLs to point to anonscm.debian.org
22
23 [ Jackson Doak ]
24 * Bump standards-version to 3.9.6
25
26 [ Yves-Alexis Perez ]
27 * debian/control:
28 - update long descriptions.
29 - fix typo in thunar-dbg long description
30 * debian/patches:
31 - 02_fix-default-application-selection added, fix selection of default
32 application for opening files, broken since glib 2.42. closes: #763726
33
34 -- Yves-Alexis Perez <corsac@debian.org> Thu, 30 Oct 2014 11:00:02 +0100
35
1thunar (1.6.3-1ubuntu5) trusty; urgency=medium36thunar (1.6.3-1ubuntu5) trusty; urgency=medium
237
3 * Add git-save-keyboard-shortcuts.patch. LP: #118684638 * Add git-save-keyboard-shortcuts.patch. LP: #1186846
439
=== 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 @@
11 libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.10.0), libnotify-dev,11 libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.10.0), libnotify-dev,
12 libgudev-1.0-dev [linux-any], xfce4-panel-dev (>= 4.10.0),12 libgudev-1.0-dev [linux-any], xfce4-panel-dev (>= 4.10.0),
13 dh-autoreconf, xfce4-dev-tools, gtk-doc-tools13 dh-autoreconf, xfce4-dev-tools, gtk-doc-tools
14Standards-Version: 3.9.314Standards-Version: 3.9.6
15Homepage: http://thunar.xfce.org15Homepage: http://thunar.xfce.org
16Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/16Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/thunar/
17Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/17Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/thunar/
1818
19Package: libthunarx-2-dev19Package: libthunarx-2-dev
20Section: libdevel20Section: libdevel
@@ -44,24 +44,24 @@
44Breaks: thunar-data (<< 1.2.3-3)44Breaks: thunar-data (<< 1.2.3-3)
45Replaces: thunar-data (<< 1.2.3-3)45Replaces: thunar-data (<< 1.2.3-3)
46Description: File Manager for Xfce46Description: File Manager for Xfce
47 Thunar is the file manager designed to be the default file manager of Xfce 4.647 Thunar is the file manager designed to be the default file manager for the
48 It has been designed to be fast and easy to use.48 Xfce desktop environment. It has been designed to be fast and easy to use.
49 .49 .
50 An Xfce plugin can manages the trash, if xfce4-panel is installed as well.50 Also included is an Xfce panel plugin which can manage the desktop trash.
51 Please read README.Debian for volume management stuff.
5251
53Package: thunar-data52Package: thunar-data
54Section: xfce53Section: xfce
55Architecture: all54Architecture: all
56Depends: ${misc:Depends}55Depends: ${misc:Depends}
57Description: Provides thunar documentation, icons and translations56Description: Provides thunar documentation, icons and translations
58 This package contains architecture-independent files for thunar.57 This package contains architecture-independent files for thunar, the file
58 manager and file management libraries for Xfce desktop environment.
5959
60Package: thunar-dbg60Package: thunar-dbg
61Section: debug61Section: debug
62Architecture: any62Architecture: any
63Priority: extra63Priority: extra
64Depends: ${shlibs:Depends}, thunar (= ${binary:Version}), ${misc:Depends}64Depends: ${shlibs:Depends}, thunar (= ${binary:Version}), ${misc:Depends}
65Description: debugging informations for thunar65Description: debugging information for thunar
66 This package contains debugging symbols for thunar and libthunarx, the file66 This package contains debugging symbols for thunar and libthunarx, the file
67 manager and file management libraries for Xfce Desktop Environment.67 manager and file management libraries for Xfce desktop environment.
6868
=== 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 @@
1Index: Thunar-1.6.3/thunar/thunar-file.c
2===================================================================
3--- Thunar-1.6.3.orig/thunar/thunar-file.c
4+++ Thunar-1.6.3/thunar/thunar-file.c
5@@ -3963,6 +3963,7 @@ thunar_file_list_get_applications (GList
6 GList *next;
7 GList *ap;
8 GList *lp;
9+ GAppInfo *default_application;
10 const gchar *previous_type = NULL;
11 const gchar *current_type;
12
13@@ -3981,7 +3982,25 @@ thunar_file_list_get_applications (GList
14
15 /* determine the list of applications that can open this file */
16 if (G_UNLIKELY (current_type != NULL))
17- list = g_app_info_get_all_for_type (current_type);
18+ {
19+ list = g_app_info_get_all_for_type (current_type);
20+
21+ /* move any default application in front of the list */
22+ default_application = g_app_info_get_default_for_type (current_type, FALSE);
23+ if (G_LIKELY (default_application != NULL))
24+ {
25+ for (ap = list; ap != NULL; ap = ap->next)
26+ {
27+ if (g_app_info_equal (ap->data, default_application))
28+ {
29+ g_object_unref (ap->data);
30+ list = g_list_delete_link (list, ap);
31+ break;
32+ }
33+ }
34+ list = g_list_prepend (list, default_application);
35+ }
36+ }
37 else
38 list = NULL;
39
040
=== 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 @@
101_support-non-multiarch-modules.patch101_support-non-multiarch-modules.patch
202_fix-default-application-selection.patch
2git-xfdesktop-4.11.patch3git-xfdesktop-4.11.patch
3gtk3-bookmarks.patch4gtk3-bookmarks.patch
4git-save-keyboard-shortcuts.patch5git-save-keyboard-shortcuts.patch
56
=== 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 @@
3963 GList *next;3963 GList *next;
3964 GList *ap;3964 GList *ap;
3965 GList *lp;3965 GList *lp;
3966 GAppInfo *default_application;
3966 const gchar *previous_type = NULL;3967 const gchar *previous_type = NULL;
3967 const gchar *current_type;3968 const gchar *current_type;
39683969
@@ -3981,7 +3982,25 @@
39813982
3982 /* determine the list of applications that can open this file */3983 /* determine the list of applications that can open this file */
3983 if (G_UNLIKELY (current_type != NULL))3984 if (G_UNLIKELY (current_type != NULL))
3984 list = g_app_info_get_all_for_type (current_type);3985 {
3986 list = g_app_info_get_all_for_type (current_type);
3987
3988 /* move any default application in front of the list */
3989 default_application = g_app_info_get_default_for_type (current_type, FALSE);
3990 if (G_LIKELY (default_application != NULL))
3991 {
3992 for (ap = list; ap != NULL; ap = ap->next)
3993 {
3994 if (g_app_info_equal (ap->data, default_application))
3995 {
3996 g_object_unref (ap->data);
3997 list = g_list_delete_link (list, ap);
3998 break;
3999 }
4000 }
4001 list = g_list_prepend (list, default_application);
4002 }
4003 }
3985 else4004 else
3986 list = NULL;4005 list = NULL;
39874006

Subscribers

People subscribed via source and target branches

to all changes: