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
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2014-04-05 08:22:40 +0000
3+++ .pc/applied-patches 2014-11-01 05:54:59 +0000
4@@ -1,4 +1,5 @@
5 01_support-non-multiarch-modules.patch
6+02_fix-default-application-selection.patch
7 git-xfdesktop-4.11.patch
8 gtk3-bookmarks.patch
9 git-save-keyboard-shortcuts.patch
10
11=== modified file 'debian/changelog'
12--- debian/changelog 2014-04-05 08:22:40 +0000
13+++ debian/changelog 2014-11-01 05:54:59 +0000
14@@ -1,3 +1,38 @@
15+thunar (1.6.3-2ubuntu1) vivid; urgency=medium
16+
17+ * Merge from Debian. Remaining changes:
18+ - debian/control: recommend udisks2 for mounting devices.
19+ - Use dh-autoreconf and xdt-autogen to update libtool.m4 for new ports.
20+ - Add git-xfdesktop-4.11.patch.
21+ - Add gtk3-bookmarks.patch, use new gtk3 bookmark location
22+ - Add git-save-keyboard-shortcuts.patch.
23+ + Keyboard shortcuts save when changed rather than when thunar is closed
24+ - Add menu-icon-tweaks.patch.
25+ + Don't use generic folder icons for open with default application
26+ + Add icons for open in new tab, new window
27+ - Add git-force-toolbr-icons.patch
28+ + Fix for "Home" and "Open Parent" icons going missing from toolbar
29+
30+ -- Jackson Doak <noskcaj@ubuntu.com> Fri, 31 Oct 2014 07:27:27 +1100
31+
32+thunar (1.6.3-2) unstable; urgency=medium
33+
34+ [ Evgeni Golov ]
35+ * Correct Vcs-* URLs to point to anonscm.debian.org
36+
37+ [ Jackson Doak ]
38+ * Bump standards-version to 3.9.6
39+
40+ [ Yves-Alexis Perez ]
41+ * debian/control:
42+ - update long descriptions.
43+ - fix typo in thunar-dbg long description
44+ * debian/patches:
45+ - 02_fix-default-application-selection added, fix selection of default
46+ application for opening files, broken since glib 2.42. closes: #763726
47+
48+ -- Yves-Alexis Perez <corsac@debian.org> Thu, 30 Oct 2014 11:00:02 +0100
49+
50 thunar (1.6.3-1ubuntu5) trusty; urgency=medium
51
52 * Add git-save-keyboard-shortcuts.patch. LP: #1186846
53
54=== modified file 'debian/control'
55--- debian/control 2013-12-26 22:09:24 +0000
56+++ debian/control 2014-11-01 05:54:59 +0000
57@@ -11,10 +11,10 @@
58 libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.10.0), libnotify-dev,
59 libgudev-1.0-dev [linux-any], xfce4-panel-dev (>= 4.10.0),
60 dh-autoreconf, xfce4-dev-tools, gtk-doc-tools
61-Standards-Version: 3.9.3
62+Standards-Version: 3.9.6
63 Homepage: http://thunar.xfce.org
64-Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/
65-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/
66+Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/thunar/
67+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/thunar/
68
69 Package: libthunarx-2-dev
70 Section: libdevel
71@@ -44,24 +44,24 @@
72 Breaks: thunar-data (<< 1.2.3-3)
73 Replaces: thunar-data (<< 1.2.3-3)
74 Description: File Manager for Xfce
75- Thunar is the file manager designed to be the default file manager of Xfce 4.6
76- It has been designed to be fast and easy to use.
77+ Thunar is the file manager designed to be the default file manager for the
78+ Xfce desktop environment. It has been designed to be fast and easy to use.
79 .
80- An Xfce plugin can manages the trash, if xfce4-panel is installed as well.
81- Please read README.Debian for volume management stuff.
82+ Also included is an Xfce panel plugin which can manage the desktop trash.
83
84 Package: thunar-data
85 Section: xfce
86 Architecture: all
87 Depends: ${misc:Depends}
88 Description: Provides thunar documentation, icons and translations
89- This package contains architecture-independent files for thunar.
90+ This package contains architecture-independent files for thunar, the file
91+ manager and file management libraries for Xfce desktop environment.
92
93 Package: thunar-dbg
94 Section: debug
95 Architecture: any
96 Priority: extra
97 Depends: ${shlibs:Depends}, thunar (= ${binary:Version}), ${misc:Depends}
98-Description: debugging informations for thunar
99+Description: debugging information for thunar
100 This package contains debugging symbols for thunar and libthunarx, the file
101- manager and file management libraries for Xfce Desktop Environment.
102+ manager and file management libraries for Xfce desktop environment.
103
104=== added file 'debian/patches/02_fix-default-application-selection.patch'
105--- debian/patches/02_fix-default-application-selection.patch 1970-01-01 00:00:00 +0000
106+++ debian/patches/02_fix-default-application-selection.patch 2014-11-01 05:54:59 +0000
107@@ -0,0 +1,39 @@
108+Index: Thunar-1.6.3/thunar/thunar-file.c
109+===================================================================
110+--- Thunar-1.6.3.orig/thunar/thunar-file.c
111++++ Thunar-1.6.3/thunar/thunar-file.c
112+@@ -3963,6 +3963,7 @@ thunar_file_list_get_applications (GList
113+ GList *next;
114+ GList *ap;
115+ GList *lp;
116++ GAppInfo *default_application;
117+ const gchar *previous_type = NULL;
118+ const gchar *current_type;
119+
120+@@ -3981,7 +3982,25 @@ thunar_file_list_get_applications (GList
121+
122+ /* determine the list of applications that can open this file */
123+ if (G_UNLIKELY (current_type != NULL))
124+- list = g_app_info_get_all_for_type (current_type);
125++ {
126++ list = g_app_info_get_all_for_type (current_type);
127++
128++ /* move any default application in front of the list */
129++ default_application = g_app_info_get_default_for_type (current_type, FALSE);
130++ if (G_LIKELY (default_application != NULL))
131++ {
132++ for (ap = list; ap != NULL; ap = ap->next)
133++ {
134++ if (g_app_info_equal (ap->data, default_application))
135++ {
136++ g_object_unref (ap->data);
137++ list = g_list_delete_link (list, ap);
138++ break;
139++ }
140++ }
141++ list = g_list_prepend (list, default_application);
142++ }
143++ }
144+ else
145+ list = NULL;
146+
147
148=== modified file 'debian/patches/series'
149--- debian/patches/series 2014-04-05 08:22:40 +0000
150+++ debian/patches/series 2014-11-01 05:54:59 +0000
151@@ -1,4 +1,5 @@
152 01_support-non-multiarch-modules.patch
153+02_fix-default-application-selection.patch
154 git-xfdesktop-4.11.patch
155 gtk3-bookmarks.patch
156 git-save-keyboard-shortcuts.patch
157
158=== modified file 'thunar/thunar-file.c'
159--- thunar/thunar-file.c 2013-08-15 21:37:17 +0000
160+++ thunar/thunar-file.c 2014-11-01 05:54:59 +0000
161@@ -3963,6 +3963,7 @@
162 GList *next;
163 GList *ap;
164 GList *lp;
165+ GAppInfo *default_application;
166 const gchar *previous_type = NULL;
167 const gchar *current_type;
168
169@@ -3981,7 +3982,25 @@
170
171 /* determine the list of applications that can open this file */
172 if (G_UNLIKELY (current_type != NULL))
173- list = g_app_info_get_all_for_type (current_type);
174+ {
175+ list = g_app_info_get_all_for_type (current_type);
176+
177+ /* move any default application in front of the list */
178+ default_application = g_app_info_get_default_for_type (current_type, FALSE);
179+ if (G_LIKELY (default_application != NULL))
180+ {
181+ for (ap = list; ap != NULL; ap = ap->next)
182+ {
183+ if (g_app_info_equal (ap->data, default_application))
184+ {
185+ g_object_unref (ap->data);
186+ list = g_list_delete_link (list, ap);
187+ break;
188+ }
189+ }
190+ list = g_list_prepend (list, default_application);
191+ }
192+ }
193 else
194 list = NULL;
195

Subscribers

People subscribed via source and target branches

to all changes: