Merge lp:~noskcaj/gnome-menus/3.13.3 into lp:~ubuntu-desktop/gnome-menus/ubuntu

Proposed by Jackson Doak
Status: Merged
Merged at revision: 147
Proposed branch: lp:~noskcaj/gnome-menus/3.13.3
Merge into: lp:~ubuntu-desktop/gnome-menus/ubuntu
Diff against target: 1855 lines (+440/-1165)
24 files modified
debian/changelog (+145/-0)
debian/control (+5/-7)
debian/control.in (+4/-6)
debian/gir1.2-gmenu-3.0.install (+1/-1)
debian/gnome-menus-blacklist (+2/-0)
debian/gnome-menus.maintscript (+0/-1)
debian/menus.blacklist (+32/-0)
debian/patches/04_fix-other.patch (+17/-0)
debian/patches/08_settings-menus.patch (+5/-4)
debian/patches/09_games-menu.patch (+9/-10)
debian/patches/12_alacarte.patch (+36/-0)
debian/patches/20_show-admin-tools-for-admin-group.patch (+0/-218)
debian/patches/30_xdg_syntax.patch (+158/-0)
debian/patches/31_nl_translation.patch (+13/-0)
debian/patches/50_add-gcc-apps.patch (+0/-9)
debian/patches/fix-menus-in-gnome-flashback-session.patch (+0/-351)
debian/patches/revert_leak_fix_from_git.patch (+0/-443)
debian/patches/series (+5/-5)
debian/patches/ubuntu_gcc_translations.patch (+0/-101)
debian/po-up/de.po (+4/-4)
debian/po-up/es.po (+2/-2)
debian/po-up/pt.po (+1/-1)
debian/po-up/ru.po (+1/-1)
debian/rules (+0/-1)
To merge this branch: bzr merge lp:~noskcaj/gnome-menus/3.13.3
Reviewer Review Type Date Requested Status
Daniel Holbach Approve
Review via email: mp+266319@code.launchpad.net

Description of the change

Merge from debian.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-03-17 06:47:41 +0000
3+++ debian/changelog 2015-07-29 19:52:19 +0000
4@@ -1,3 +1,140 @@
5+gnome-menus (3.13.3-6ubuntu1) wily; urgency=medium
6+
7+ * Merge from Debian unstable. (LP: #1421907) Remaining changes:
8+ - debian/control.in:
9+ + Use ubuntu vcs
10+ - debian/desktop-files/
11+ + Update some of the directory icon names. lp:1201128
12+ - debian/gnome-menus.postinst, debian/gnome-menus.prerm:
13+ + Remove since they may cause issues with ubuntu-gnome-default-settings
14+ - debian/gnome-menus.triggers: Drop "gmenucache".
15+ - debian/patches/09_app_install_entry.patch:
16+ + Include Software Center in menus
17+ - debian/patches/70_ubuntu-directories.patch
18+ + Add Ubuntu-specific directories back to POTFILES.in
19+ - debian/rules:
20+ + Enable parallel build
21+
22+ -- Jackson Doak <noskcaj@ubuntu.com> Thu, 30 Jul 2015 05:36:05 +1000
23+
24+gnome-menus (3.13.3-6) unstable; urgency=medium
25+
26+ * 31_nl_translation.patch: patch from Geert Stappers to fix seriously
27+ confusing translation. Closes: #776595.
28+
29+ -- Josselin Mouette <joss@debian.org> Thu, 26 Mar 2015 20:43:36 +0100
30+
31+gnome-menus (3.13.3-5) unstable; urgency=medium
32+
33+ * 30_xdg_syntax.patch: fix typo in the patch as provided by upstream.
34+ Thanks Jerad Simpson.
35+
36+ -- Josselin Mouette <joss@debian.org> Sun, 14 Dec 2014 13:19:14 +0100
37+
38+gnome-menus (3.13.3-4) unstable; urgency=medium
39+
40+ * menus.blacklist:
41+ + Add everything from xscreensaver-data. Closes: #771710.
42+ * 30_xdg_syntax.patch: patch from upstream git. Support multiple
43+ desktops in XDG_CURRENT_DESKTOP. Closes: #773013.
44+
45+ -- Josselin Mouette <joss@debian.org> Sat, 13 Dec 2014 21:48:50 +0100
46+
47+gnome-menus (3.13.3-3) unstable; urgency=medium
48+
49+ * menus.blacklist:
50+ + Add vim.desktop (useful as MIME handler, not much so in the menu).
51+ + Add (v)prerex.desktop (texlive dependency).
52+ + Add nm-connection-editor.desktop (managed by control-center).
53+ + Add orca.desktop (managed by gnome-shell).
54+ + Add gnome-power-statistics.desktop (called from other places).
55+ * 12_alacarte.patch: new patch. Don’t exclude alacarte.
56+
57+ -- Josselin Mouette <joss@debian.org> Sun, 30 Nov 2014 14:37:49 +0100
58+
59+gnome-menus (3.13.3-2) unstable; urgency=low
60+
61+ [ Pedro Beja ]
62+ * translate few bits: po-up/ pt, es. Thanks Rafael Belmonte. Closes:
63+ #692986.
64+ * translate few bits: po-up/ de, ru. Thanks Helge Kreutzmann and Andrey
65+ Kumykov. Closes: #715455, #636480.
66+
67+ [ Iain Lane ]
68+ * Update gir package to install in MA libdir.
69+
70+ -- Iain Lane <iain@orangesquash.org.uk> Thu, 25 Sep 2014 11:26:23 +0100
71+
72+gnome-menus (3.13.3-1) unstable; urgency=medium
73+
74+ [ Pierangelo Mancusi ]
75+ * New Upstream release.
76+ + Fix some crashes (Closes: #756197)
77+ + Fix some refcounting bugs
78+ + Fix some leaks
79+ * debian/control.in:
80+ + Bump Standards-Version to 3.9.5, no changes needed.
81+
82+ -- Pierangelo Mancusi <pierangelo.mancusi@gmail.com> Wed, 06 Aug 2014 19:24:46 +0200
83+
84+gnome-menus (3.10.1-1) unstable; urgency=low
85+
86+ * Team upload.
87+
88+ [ Emilio Pozuelo Monfort ]
89+ * debian/control.in:
90+ + Bump Standards-Version to 3.9.4, no changes needed.
91+ * debian/patches/20_show-admin-tools-for-admin-group.patch:
92+ + Removed. It was never used in Debian and doesn't apply anymore.
93+
94+ [ Jeremy Bicha ]
95+ * debian/patches/04_fix_other.patch:
96+ - Fix apps showing in "Other" that already show in other categories.
97+ * debian/patches/08_settings-menus.patch:
98+ + Exclude "Sundry" items so that they aren't duplicated in the menus
99+
100+ [ Fabian Greffrath ]
101+ * gnome-menus-blacklist: re-apply patch to correctly handle
102+ menu files with missing ending newlines. Closes: #692141.
103+
104+ [ Pierangelo Mancusi ]
105+ * New upstream release.
106+ * debian/patches/30-gnome-calculator-desktop-file.patch:
107+ + Removed. It was integrated in the new upstream release.
108+ * debian/patches/:
109+ + debian/patches/*: refreshed.
110+
111+ -- Andreas Henriksson <andreas@fatal.se> Thu, 31 Jul 2014 20:37:09 +0200
112+
113+gnome-menus (3.10.1-0ubuntu6) wily; urgency=medium
114+
115+ * No-change rebuild for python3.5 transition
116+
117+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 22 Jul 2015 17:06:53 +0000
118+
119+gnome-menus (3.10.1-0ubuntu5) vivid; urgency=medium
120+
121+ * Update support_multiple_desktops.patch to fix a logic error. Thanks to
122+ Alberts Muktup�vels for the fix.
123+
124+ -- Brian Murray <brian@ubuntu.com> Tue, 13 Jan 2015 12:13:43 -0800
125+
126+gnome-menus (3.10.1-0ubuntu4) vivid; urgency=medium
127+
128+ * Remove fix-menus-in-gnome-flashback-session.patch, the menu file for
129+ Flashback session will be shipped in gnome-flashback package instead.
130+ * Add a patch to support multiple desktop names in XDG_CURRENT_DESKTOP
131+ (taken from upstream Git).
132+
133+ -- Dmitry Shachnev <mitya57@ubuntu.com> Mon, 17 Nov 2014 18:42:20 +0300
134+
135+gnome-menus (3.10.1-0ubuntu3) vivid; urgency=medium
136+
137+ * Install typelib files into MA libdir and BD on the version of g-i
138+ which started supporting this
139+
140+ -- Iain Lane <iain@orangesquash.org.uk> Tue, 28 Oct 2014 11:30:49 +0000
141+
142 gnome-menus (3.10.1-0ubuntu2) trusty; urgency=medium
143
144 * debian/patches/fix-menus-in-gnome-flashback-session.patch: added
145@@ -13,6 +150,14 @@
146 -- gobject-introspection to >= 0.9.5
147 -- Steve Ovens <steve_ovens@linux.com> Wed, 12 Feb 2014 11:15:35 +0100
148
149+gnome-menus (3.8.0-2) unstable; urgency=low
150+
151+ * debian/patches/30-gnome-calculator-desktop-file.patch:
152+ + Cherry-pick change from upstream, gnome-calculator's desktop
153+ file was renamed back to gcalctool.desktop. Closes: #711605.
154+
155+ -- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 10 Jun 2013 13:02:02 +0200
156+
157 gnome-menus (3.8.1-0ubuntu2) trusty; urgency=medium
158
159 * Enable parallel build
160
161=== modified file 'debian/control'
162--- debian/control 2014-02-12 10:09:12 +0000
163+++ debian/control 2015-07-29 19:52:19 +0000
164@@ -7,18 +7,16 @@
165 Priority: optional
166 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
167 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
168-Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jeremy Bicha <jbicha@ubuntu.com>
169+Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>
170 Build-Depends: debhelper (>= 9),
171 cdbs (>= 0.4.73),
172- dh-autoreconf,
173- gnome-common,
174+ libglib2.0-dev (>= 2.30.0),
175 gnome-pkg-tools,
176- gobject-introspection (>= 0.9.5),
177+ python3 (>= 3.1),
178 intltool (>= 0.40.0),
179 libgirepository1.0-dev (>= 0.10.7-1~),
180- libglib2.0-dev (>= 2.30.0),
181- python3 (>= 3.1)
182-Standards-Version: 3.9.3
183+ gobject-introspection (>= 0.9.12-4~)
184+Standards-Version: 3.9.5
185 X-Python3-Version: >= 3.1
186 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-menus/ubuntu
187
188
189=== modified file 'debian/control.in'
190--- debian/control.in 2014-02-12 10:09:12 +0000
191+++ debian/control.in 2015-07-29 19:52:19 +0000
192@@ -6,15 +6,13 @@
193 Uploaders: @GNOME_TEAM@
194 Build-Depends: debhelper (>= 9),
195 cdbs (>= 0.4.73),
196- dh-autoreconf,
197- gnome-common,
198+ libglib2.0-dev (>= 2.30.0),
199 gnome-pkg-tools,
200- gobject-introspection (>= 0.9.5),
201+ python3 (>= 3.1),
202 intltool (>= 0.40.0),
203 libgirepository1.0-dev (>= 0.10.7-1~),
204- libglib2.0-dev (>= 2.30.0),
205- python3 (>= 3.1)
206-Standards-Version: 3.9.3
207+ gobject-introspection (>= 0.9.12-4~)
208+Standards-Version: 3.9.5
209 X-Python3-Version: >= 3.1
210 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-menus/ubuntu
211
212
213=== modified file 'debian/gir1.2-gmenu-3.0.install'
214--- debian/gir1.2-gmenu-3.0.install 2011-12-23 20:30:50 +0000
215+++ debian/gir1.2-gmenu-3.0.install 2015-07-29 19:52:19 +0000
216@@ -1,1 +1,1 @@
217-usr/lib/girepository-1.0
218+usr/lib/*/girepository-1.0
219
220=== modified file 'debian/gnome-menus-blacklist'
221--- debian/gnome-menus-blacklist 2012-11-20 01:52:35 +0000
222+++ debian/gnome-menus-blacklist 2015-07-29 19:52:19 +0000
223@@ -64,6 +64,8 @@
224 if l.startswith ("NoDisplay="):
225 continue
226 fp_out.write(l)
227+ if not l.endswith ("\n"):
228+ fp_out.write("\n")
229 fp_out.write("NoDisplay=true\n")
230
231 # Set mtime so that the file is not touched unless it has changed
232
233=== modified file 'debian/gnome-menus.maintscript'
234--- debian/gnome-menus.maintscript 2013-09-08 18:03:16 +0000
235+++ debian/gnome-menus.maintscript 2015-07-29 19:52:19 +0000
236@@ -1,3 +1,2 @@
237 rm_conffile /etc/xdg/menus/gnome-preferences.menu 2.24.2-1~ gnome-menus
238 rm_conffile /etc/xdg/menus/gnome-settings.menu 3.0.1-3~ gnome-menus
239-mv_conffile /etc/xdg/menus/applications.menu /etc/xdg/menus/gnome-applications.menu 3.8.0-1ubuntu3~ gnome-menus
240
241=== modified file 'debian/menus.blacklist'
242--- debian/menus.blacklist 2013-06-05 02:03:25 +0000
243+++ debian/menus.blacklist 2015-07-29 19:52:19 +0000
244@@ -196,6 +196,23 @@
245 # xscreensaver
246 xscreensaver.desktop
247 xscreensaver-properties.desktop
248+screensavers/tessellimage.desktop
249+screensavers/distort.desktop
250+screensavers/fuzzyflakes.desktop
251+screensavers/xlyap.desktop
252+screensavers/ripples.desktop
253+screensavers/abstractile.desktop
254+screensavers/slidescreen.desktop
255+screensavers/shadebobs.desktop
256+screensavers/fiberlamp.desktop
257+screensavers/metaballs.desktop
258+screensavers/hexadrop.desktop
259+screensavers/cwaves.desktop
260+screensavers/galaxy.desktop
261+screensavers/deco.desktop
262+screensavers/swirl.desktop
263+screensavers/penrose.desktop
264+screensavers/m6502.desktop
265
266 # IDLE - we don't need one entry for each Python version
267 idle-python2.5.desktop
268@@ -209,3 +226,18 @@
269 Thunar-bulk-rename.desktop
270 Thunar.desktop
271 thunar-volman-settings.desktop
272+
273+# ViM
274+vim.desktop
275+
276+# prerex
277+prerex.desktop
278+vprerex.desktop
279+
280+# NetworkManager (already in control-center)
281+nm-connection-editor.desktop
282+
283+# Orca (already in accessibility menu)
284+orca.desktop
285+# GNOME power manager (used from other places)
286+gnome-power-statistics.desktop
287
288=== added file 'debian/patches/04_fix-other.patch'
289--- debian/patches/04_fix-other.patch 1970-01-01 00:00:00 +0000
290+++ debian/patches/04_fix-other.patch 2015-07-29 19:52:19 +0000
291@@ -0,0 +1,17 @@
292+Index: gnome-menus-3.8.0/layout/gnome-applications.menu
293+===================================================================
294+--- gnome-menus-3.8.0.orig/layout/gnome-applications.menu 2013-06-14 20:39:38.683935194 -0400
295++++ gnome-menus-3.8.0/layout/gnome-applications.menu 2013-06-14 20:40:48.623936681 -0400
296+@@ -281,7 +281,11 @@
297+ <And>
298+ <Not><Category>Core</Category></Not>
299+ <Not><Category>Screensaver</Category></Not>
300+-
301++ <Not><Category>AudioVideo</Category></Not>
302++ <Not><Category>Graphics</Category></Not>
303++ <Not><Category>Network</Category></Not>
304++ <Not><Category>Office</Category></Not>
305++ <Not><Category>Utility</Category></Not>
306+ <!-- Really Fedora ??? -->
307+ <Not><Filename>gnome-eog.desktop</Filename></Not>
308+ <Not><Filename>gnome-file-roller.desktop</Filename></Not>
309
310=== modified file 'debian/patches/08_settings-menus.patch'
311--- debian/patches/08_settings-menus.patch 2014-02-12 10:06:34 +0000
312+++ debian/patches/08_settings-menus.patch 2015-07-29 19:52:19 +0000
313@@ -1,11 +1,12 @@
314-Index: b/layout/gnome-applications.menu
315+Index: a/layout/gnome-applications.menu
316 ===================================================================
317---- a/layout/gnome-applications.menu
318-+++ b/layout/gnome-applications.menu
319-@@ -259,6 +259,118 @@
320+--- a/layout/gnome-applications.menu (revision 9)
321++++ b/layout/gnome-applications.menu (working copy)
322+@@ -259,6 +259,119 @@
323 <Filename>dconf-editor.desktop</Filename>
324 <Filename>setroubleshoot.desktop</Filename>
325 </Exclude>
326++
327 + <Menu>
328 + <Name>Preferences</Name>
329 + <Directory>Settings.directory</Directory>
330
331=== modified file 'debian/patches/09_games-menu.patch'
332--- debian/patches/09_games-menu.patch 2014-02-12 10:06:34 +0000
333+++ debian/patches/09_games-menu.patch 2015-07-29 19:52:19 +0000
334@@ -1,13 +1,11 @@
335-Index: b/layout/gnome-applications.menu
336+Index: a/layout/gnome-applications.menu
337 ===================================================================
338---- a/layout/gnome-applications.menu
339-+++ b/layout/gnome-applications.menu
340+--- a/layout/gnome-applications.menu (revision 10)
341++++ b/layout/gnome-applications.menu (working copy)
342 @@ -115,8 +115,107 @@
343 <Include>
344 <And>
345 <Category>Game</Category>
346-- </And>
347-- </Include>
348 + <Not><Category>ActionGame</Category></Not>
349 + <Not><Category>AdventureGame</Category></Not>
350 + <Not><Category>ArcadeGame</Category></Not>
351@@ -19,8 +17,8 @@
352 + <Not><Category>Simulation</Category></Not>
353 + <Not><Category>SportsGame</Category></Not>
354 + <Not><Category>StrategyGame</Category></Not>
355-+ </And>
356-+ </Include>
357+ </And>
358+ </Include>
359 + <DefaultLayout inline="true" inline_limit="6" inline_header="false">
360 + <Merge type="menus"/>
361 + <Merge type="files"/>
362@@ -112,11 +110,12 @@
363 </Menu> <!-- End Games -->
364
365 <!-- Graphics -->
366-@@ -239,6 +338,7 @@
367+@@ -238,6 +337,7 @@
368+ <Include>
369 <And>
370 <Category>System</Category>
371++ <Not><Category>Game</Category></Not>
372 <Not><Category>Settings</Category></Not>
373-+ <Not><Category>Game</Category></Not>
374 <Not><Category>X-GNOME-Utilities</Category></Not>
375 </And>
376- </Include>
377+
378
379=== added file 'debian/patches/12_alacarte.patch'
380--- debian/patches/12_alacarte.patch 1970-01-01 00:00:00 +0000
381+++ debian/patches/12_alacarte.patch 2015-07-29 19:52:19 +0000
382@@ -0,0 +1,36 @@
383+Index: gnome-menus-3.13.3/layout/gnome-applications.menu
384+===================================================================
385+--- gnome-menus-3.13.3.orig/layout/gnome-applications.menu 2014-11-30 14:27:37.140211890 +0100
386++++ gnome-menus-3.13.3/layout/gnome-applications.menu 2014-11-30 14:28:01.619840917 +0100
387+@@ -54,7 +54,6 @@
388+ <Filename>yelp.desktop</Filename>
389+
390+ <!-- Exclude Sundry items -->
391+- <Filename>alacarte.desktop</Filename>
392+ </Exclude>
393+ </Menu> <!-- End Accessories -->
394+
395+@@ -306,7 +305,6 @@
396+ <Name>Sundry</Name>
397+ <Directory>X-GNOME-Sundry.directory</Directory>
398+ <Include>
399+- <Filename>alacarte.desktop</Filename>
400+ <Filename>authconfig.desktop</Filename>
401+ <Filename>dconf-editor.desktop</Filename>
402+ <Filename>fedora-release-notes.desktop</Filename>
403+@@ -383,7 +381,6 @@
404+ <Or>
405+ <Category>System</Category>
406+ <Category>X-GNOME-Settings-Panel</Category>
407+- <Filename>alacarte.desktop</Filename>
408+ <Filename>caribou.desktop</Filename>
409+ <Filename>dconf-editor.desktop</Filename>
410+ <Filename>fedora-im-chooser.desktop</Filename>
411+@@ -439,7 +436,6 @@
412+ <Not>
413+ <Or>
414+ <Category>X-GNOME-Settings-Panel</Category>
415+- <Filename>alacarte.desktop</Filename>
416+ <Filename>caribou.desktop</Filename>
417+ <Filename>dconf-editor.desktop</Filename>
418+ <Filename>fedora-im-chooser.desktop</Filename>
419
420=== removed file 'debian/patches/20_show-admin-tools-for-admin-group.patch'
421--- debian/patches/20_show-admin-tools-for-admin-group.patch 2011-05-16 11:00:23 +0000
422+++ debian/patches/20_show-admin-tools-for-admin-group.patch 1970-01-01 00:00:00 +0000
423@@ -1,218 +0,0 @@
424---- gnome-menus-2.19.6.orig/libmenu/desktop-entries.c 2007-07-30 22:06:51.000000000 +0200
425-+++ gnome-menus-2.19.6/libmenu/desktop-entries.c 2007-08-03 11:38:29.000000000 +0200
426-@@ -24,6 +24,7 @@
427- #include <string.h>
428-
429- #include "menu-util.h"
430-+#include "user-is-sudoer.h"
431-
432- #define DESKTOP_ENTRY_GROUP "Desktop Entry"
433- #define KDE_DESKTOP_ENTRY_GROUP "KDE Desktop Entry"
434-@@ -33,7 +34,8 @@
435- DESKTOP_ENTRY_NO_DISPLAY = 1 << 0,
436- DESKTOP_ENTRY_HIDDEN = 1 << 1,
437- DESKTOP_ENTRY_SHOW_IN_GNOME = 1 << 2,
438-- DESKTOP_ENTRY_TRYEXEC_FAILED = 1 << 3
439-+ DESKTOP_ENTRY_TRYEXEC_FAILED = 1 << 3,
440-+ DESKTOP_ENTRY_ROOT_REQUIRED = 1 << 4
441- };
442-
443- struct DesktopEntry
444-@@ -50,7 +52,7 @@
445- gboolean terminal;
446-
447- guint type : 2;
448-- guint flags : 4;
449-+ guint flags : 5;
450- guint refcount : 24;
451- };
452-
453-@@ -75,9 +77,20 @@
454- gboolean hidden;
455- gboolean show_in_gnome;
456- gboolean tryexec_failed;
457-+ gboolean root_required_flag;
458- char *tryexec;
459- guint flags;
460- int i;
461-+
462-+ static gboolean sudoer_flag_set = FALSE;
463-+ static gboolean sudoer_flag = TRUE;
464-+
465-+ /* If we don't know yet whether the user is sudoer or not, let's see */
466-+ if (!sudoer_flag_set)
467-+ {
468-+ sudoer_flag = user_is_sudoer ();
469-+ sudoer_flag_set = TRUE;
470-+ }
471-
472- error = NULL;
473- no_display = g_key_file_get_boolean (key_file,
474-@@ -157,6 +170,47 @@
475- g_free (tryexec);
476- }
477-
478-+ error = NULL;
479-+ root_required_flag = g_key_file_get_boolean (key_file,
480-+ desktop_entry_group,
481-+ "X-KDE-SubstituteUID",
482-+ &error);
483-+
484-+ if (error)
485-+ {
486-+ root_required_flag = FALSE;
487-+ g_error_free (error);
488-+ }
489-+ else {
490-+ if (root_required_flag) {
491-+ char *username = NULL;
492-+ username = g_key_file_get_value (key_file,
493-+ desktop_entry_group,
494-+ "X-KDE-Username",
495-+ NULL);
496-+
497-+ if (!username || (username && !strcmp (username, "root")))
498-+ root_required_flag = TRUE;
499-+ else
500-+ root_required_flag = FALSE;
501-+ g_free (username);
502-+ }
503-+ else
504-+ root_required_flag = FALSE;
505-+ }
506-+
507-+ /*
508-+ * If the desktop entry has the field and indeed requires root
509-+ * privilege and the user isn't sudoer, then the entry needs to be
510-+ * hidden.
511-+ */
512-+
513-+ if (root_required_flag
514-+ && (!sudoer_flag))
515-+ {
516-+ no_display = TRUE;
517-+ }
518-+
519- flags = 0;
520- if (no_display)
521- flags |= DESKTOP_ENTRY_NO_DISPLAY;
522-@@ -166,6 +220,8 @@
523- flags |= DESKTOP_ENTRY_SHOW_IN_GNOME;
524- if (tryexec_failed)
525- flags |= DESKTOP_ENTRY_TRYEXEC_FAILED;
526-+ if (root_required_flag)
527-+ flags |= DESKTOP_ENTRY_ROOT_REQUIRED;
528-
529- return flags;
530- }
531-@@ -297,13 +353,14 @@
532-
533- #undef GET_LOCALE_STRING
534-
535-- menu_verbose ("Desktop entry \"%s\" (%s, %s, %s) flags: NoDisplay=%s, Hidden=%s, ShowInGNOME=%s, TryExecFailed=%s\n",
536-+ menu_verbose ("Desktop entry \"%s\" (%s, %s, %s) flags: NoDisplay=%s, Hidden=%s, RootRequired: %s, ShowInGNOME=%s, TryExecFailed=%s\n",
537- retval->basename,
538- retval->name,
539- retval->comment ? retval->comment : "(null)",
540- retval->icon ? retval->icon : "(null)",
541- retval->flags & DESKTOP_ENTRY_NO_DISPLAY ? "(true)" : "(false)",
542- retval->flags & DESKTOP_ENTRY_HIDDEN ? "(true)" : "(false)",
543-+ retval->flags & DESKTOP_ENTRY_ROOT_REQUIRED ? "(true)" : "(false)",
544- retval->flags & DESKTOP_ENTRY_SHOW_IN_GNOME ? "(true)" : "(false)",
545- retval->flags & DESKTOP_ENTRY_TRYEXEC_FAILED ? "(true)" : "(false)");
546-
547---- gnome-menus-2.19.6.orig/libmenu/Makefile.am 2007-08-03 11:38:07.000000000 +0200
548-+++ gnome-menus-2.19.6/libmenu/Makefile.am 2007-08-03 11:38:29.000000000 +0200
549-@@ -35,6 +35,8 @@
550- menu-monitor-backend.h \
551- menu-util.c \
552- menu-util.h \
553-+ user-is-sudoer.c \
554-+ user-is-sudoer.h \
555- $(MONITOR_BACKEND_SOURCES) \
556- $(NULL)
557-
558---- /dev/null 1970-01-01 00:00:00.000000000 +0000
559-+++ gnome-menus-2.19.6/libmenu/user-is-sudoer.c 2007-08-03 11:38:29.000000000 +0200
560-@@ -0,0 +1,58 @@
561-+/*
562-+ * user-is-sudoer.c:
563-+ *
564-+ * Copyright (C) 2005 Manu Cornet
565-+ *
566-+ * This program is free software; you can redistribute it and/or
567-+ * modify it under the terms of the GNU General Public License as
568-+ * published by the Free Software Foundation; either version 2 of the
569-+ * License, or (at your option) any later version.
570-+ *
571-+ * This program is distributed in the hope that it will be useful, but
572-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
573-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
574-+ * General Public License for more details.
575-+ *
576-+ * You should have received a copy of the GNU General Public License
577-+ * along with this program; if not, write to the Free Software
578-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
579-+ * 02111-1307, USA.
580-+ *
581-+ * Authors:
582-+ * Manu Cornet <manu@manucornet.net>
583-+ */
584-+
585-+#include <glib.h>
586-+#include <string.h>
587-+#include <unistd.h>
588-+#include <sys/types.h>
589-+#include <grp.h>
590-+#include "user-is-sudoer.h"
591-+
592-+#define ADMIN_GROUP_NAME "admin"
593-+
594-+gboolean
595-+user_is_sudoer (void)
596-+{
597-+ const gchar *user_name;
598-+ int i = 0;
599-+ struct group *group;
600-+
601-+ if (getuid() == 0 || g_getenv ("USER_IS_ADMIN"))
602-+ return TRUE;
603-+
604-+ group = getgrnam (ADMIN_GROUP_NAME);
605-+
606-+ if (!group)
607-+ return TRUE;
608-+ else {
609-+ user_name = g_get_user_name ();
610-+
611-+ while (group->gr_mem[i]) {
612-+ if (!strcmp (user_name, group->gr_mem[i++]))
613-+ return TRUE;
614-+ }
615-+ }
616-+
617-+ return FALSE;
618-+}
619---- /dev/null 1970-01-01 00:00:00.000000000 +0000
620-+++ gnome-menus-2.19.6/libmenu/user-is-sudoer.h 2007-08-03 11:38:29.000000000 +0200
621-@@ -0,0 +1,20 @@
622-+/*
623-+ * This library is free software; you can redistribute it and/or
624-+ * modify it under the terms of the GNU Lesser General Public
625-+ * License as published by the Free Software Foundation; either
626-+ * version 2 of the License, or (at your option) any later version.
627-+ *
628-+ * This library is distributed in the hope that it will be useful,
629-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
630-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
631-+ * Lesser General Public License for more details.
632-+ *
633-+ * You should have received a copy of the GNU Lesser General Public
634-+ * License along with this library; if not, write to the
635-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
636-+ * Boston, MA 02111-1307, USA.
637-+ */
638-+
639-+#include <glib.h>
640-+
641-+gboolean user_is_sudoer (void);
642
643=== added file 'debian/patches/30_xdg_syntax.patch'
644--- debian/patches/30_xdg_syntax.patch 1970-01-01 00:00:00 +0000
645+++ debian/patches/30_xdg_syntax.patch 2015-07-29 19:52:19 +0000
646@@ -0,0 +1,158 @@
647+desktop-entries: support multiple desktops in XDG_CURRENT_DESKTOP
648+
649+Index: gnome-menus-3.13.3/libmenu/desktop-entries.c
650+===================================================================
651+--- gnome-menus-3.13.3.orig/libmenu/desktop-entries.c 2014-12-14 13:17:21.044575627 +0100
652++++ gnome-menus-3.13.3/libmenu/desktop-entries.c 2014-12-14 13:17:42.640579012 +0100
653+@@ -85,32 +85,27 @@ unix_basename_from_path (const char *pat
654+ return path;
655+ }
656+
657+-static const char *
658+-get_current_desktop (void)
659++static const gchar * const *
660++get_current_desktops (void)
661+ {
662+- static char *current_desktop = NULL;
663++ static gchar **result;
664+
665+- /* Support XDG_CURRENT_DESKTOP environment variable; this can be used
666+- * to abuse gnome-menus in non-GNOME desktops. */
667+- if (!current_desktop)
668++ if (g_once_init_enter (&result))
669+ {
670+- const char *desktop;
671++ const gchar *desktops;
672++ gchar **tmp;
673+
674+- desktop = g_getenv ("XDG_CURRENT_DESKTOP");
675++ desktops = g_getenv ("XDG_CURRENT_DESKTOP");
676+
677+- /* Note: if XDG_CURRENT_DESKTOP is set but empty, do as if it
678+- * was not set */
679+- if (!desktop || desktop[0] == '\0')
680+- current_desktop = g_strdup ("GNOME");
681+- else
682+- current_desktop = g_strdup (desktop);
683+- }
684++ if (!desktops)
685++ desktops = "";
686+
687+- /* Using "*" means skipping desktop-related checks */
688+- if (g_strcmp0 (current_desktop, "*") == 0)
689+- return NULL;
690++ tmp = g_strsplit (desktops, ":", 0);
691++
692++ g_once_init_leave (&result, tmp);
693++ }
694+
695+- return current_desktop;
696++ return (const gchar **) result;
697+ }
698+
699+ static GIcon *
700+@@ -151,52 +146,58 @@ key_file_get_icon (GKeyFile *key_file)
701+ static gboolean
702+ key_file_get_show_in (GKeyFile *key_file)
703+ {
704+- const gchar *current_desktop;
705+- gchar **strv;
706++ const gchar * const *current_desktops;
707++ gchar **only_show_in;
708++ gchar **not_show_in;
709+ gboolean show_in = TRUE;
710+- int i;
711++ gint i;
712+
713+- current_desktop = get_current_desktop ();
714+- if (!current_desktop)
715+- return TRUE;
716+-
717+- strv = g_key_file_get_string_list (key_file,
718+- DESKTOP_ENTRY_GROUP,
719+- "OnlyShowIn",
720+- NULL,
721+- NULL);
722+- if (strv)
723++ current_desktops = get_current_desktops ();
724++ only_show_in = g_key_file_get_string_list (key_file,
725++ DESKTOP_ENTRY_GROUP,
726++ "OnlyShowIn",
727++ NULL,
728++ NULL);
729++ not_show_in = g_key_file_get_string_list (key_file,
730++ DESKTOP_ENTRY_GROUP,
731++ "NotShowIn",
732++ NULL,
733++ NULL);
734++
735++ for (i = 0; current_desktops[i]; i++)
736+ {
737+- show_in = FALSE;
738+- for (i = 0; strv[i]; i++)
739++ gint j;
740++
741++ if (only_show_in)
742+ {
743+- if (!strcmp (strv[i], current_desktop))
744++ show_in = FALSE;
745++ for (j = 0; only_show_in[j]; j++)
746+ {
747+- show_in = TRUE;
748+- break;
749++ if (g_str_equal (only_show_in[j], current_desktops[i]))
750++ {
751++ show_in = TRUE;
752++ goto out;
753++ }
754+ }
755+ }
756+- }
757+- else
758+- {
759+- strv = g_key_file_get_string_list (key_file,
760+- DESKTOP_ENTRY_GROUP,
761+- "NotShowIn",
762+- NULL,
763+- NULL);
764+- if (strv)
765++
766++ if (not_show_in)
767+ {
768+ show_in = TRUE;
769+- for (i = 0; strv[i]; i++)
770++ for (j = 0; not_show_in[j]; j++)
771+ {
772+- if (!strcmp (strv[i], current_desktop))
773++ if (g_str_equal (not_show_in[j], current_desktops[i]))
774+ {
775+ show_in = FALSE;
776++ goto out;
777+ }
778+ }
779+ }
780+ }
781+- g_strfreev (strv);
782++
783++out:
784++ g_strfreev (only_show_in);
785++ g_strfreev (not_show_in);
786+
787+ return show_in;
788+ }
789+@@ -581,14 +582,7 @@ gboolean
790+ desktop_entry_get_show_in (DesktopEntry *entry)
791+ {
792+ if (entry->type == DESKTOP_ENTRY_DESKTOP)
793+- {
794+- const char *current_desktop = get_current_desktop ();
795+-
796+- if (current_desktop == NULL)
797+- return TRUE;
798+- else
799+- return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, current_desktop);
800+- }
801++ return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, NULL);
802+ return ((DesktopEntryDirectory*)entry)->showin;
803+ }
804+
805
806=== added file 'debian/patches/31_nl_translation.patch'
807--- debian/patches/31_nl_translation.patch 1970-01-01 00:00:00 +0000
808+++ debian/patches/31_nl_translation.patch 2015-07-29 19:52:19 +0000
809@@ -0,0 +1,13 @@
810+Index: gnome-menus-3.13.3/po/nl.po
811+===================================================================
812+--- gnome-menus-3.13.3.orig/po/nl.po 2013-03-26 21:04:14.000000000 +0100
813++++ gnome-menus-3.13.3/po/nl.po 2015-03-26 20:42:24.569861793 +0100
814+@@ -92,7 +92,7 @@ msgstr "Toegankelijkheidsinstellingen"
815+
816+ #: ../desktop-directories/Utility.directory.in.h:1
817+ msgid "Accessories"
818+-msgstr "Hulpmiddelen"
819++msgstr "Accessoires"
820+
821+ #: ../desktop-directories/Utility.directory.in.h:2
822+ msgid "Desktop accessories"
823
824=== removed file 'debian/patches/50_add-gcc-apps.patch'
825--- debian/patches/50_add-gcc-apps.patch 2013-06-05 02:03:25 +0000
826+++ debian/patches/50_add-gcc-apps.patch 1970-01-01 00:00:00 +0000
827@@ -1,9 +0,0 @@
828-Index: gnome-menus-3.7.90/desktop-directories/X-GNOME-SystemSettings.directory.in
829-===================================================================
830---- gnome-menus-3.7.90.orig/desktop-directories/X-GNOME-SystemSettings.directory.in 2013-02-15 20:48:56.000000000 -0500
831-+++ gnome-menus-3.7.90/desktop-directories/X-GNOME-SystemSettings.directory.in 2013-03-03 01:12:40.241503804 -0500
832-@@ -2,4 +2,3 @@
833- Name=System Settings
834- Icon=gnome-settings
835- Type=Directory
836--NoDisplay=true
837
838=== removed file 'debian/patches/fix-menus-in-gnome-flashback-session.patch'
839--- debian/patches/fix-menus-in-gnome-flashback-session.patch 2014-03-17 06:05:26 +0000
840+++ debian/patches/fix-menus-in-gnome-flashback-session.patch 1970-01-01 00:00:00 +0000
841@@ -1,351 +0,0 @@
842-## Description: Fix menus in gnome-flashback-session by adding older menu file.
843-## Bug: https://bugs.launchpad.net/gnome-panel/+bug/1267787
844---- a/layout/Makefile.am
845-+++ b/layout/Makefile.am
846-@@ -1,7 +1,8 @@
847- menudir = $(sysconfdir)/xdg/menus
848-
849- menu_DATA = \
850-- gnome-applications.menu
851-+ gnome-applications.menu \
852-+ gnome-flashback-applications.menu
853-
854- EXTRA_DIST= $(menu_DATA)
855-
856---- /dev/null
857-+++ b/layout/gnome-flashback-applications.menu
858-@@ -0,0 +1,334 @@
859-+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
860-+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
861-+
862-+<Menu>
863-+
864-+ <Name>Applications</Name>
865-+ <Directory>X-GNOME-Menu-Applications.directory</Directory>
866-+
867-+ <!-- Scan legacy dirs first, as later items take priority -->
868-+ <LegacyDir>/etc/X11/applnk</LegacyDir>
869-+ <LegacyDir>/usr/share/gnome/apps</LegacyDir>
870-+
871-+ <!-- Read standard .directory and .desktop file locations -->
872-+ <DefaultAppDirs/>
873-+ <DefaultDirectoryDirs/>
874-+
875-+ <!-- Read in overrides and child menus from applications-merged/ -->
876-+ <DefaultMergeDirs/>
877-+
878-+ <!-- Accessories submenu -->
879-+ <Menu>
880-+ <Name>Accessories</Name>
881-+ <Directory>Utility.directory</Directory>
882-+ <Include>
883-+ <And>
884-+ <Category>Utility</Category>
885-+ <!-- Accessibility spec must have either the Utility or Settings
886-+ category, and we display an accessibility submenu already for
887-+ the ones that do not have Settings, so don't display accessibility
888-+ applications here -->
889-+ <Not><Category>Accessibility</Category></Not>
890-+ <Not><Category>System</Category></Not>
891-+ </And>
892-+ </Include>
893-+ </Menu> <!-- End Accessories -->
894-+
895-+ <!-- Accessibility submenu -->
896-+ <Menu>
897-+ <Name>Universal Access</Name>
898-+ <Directory>Utility-Accessibility.directory</Directory>
899-+ <Include>
900-+ <And>
901-+ <Category>Accessibility</Category>
902-+ <Not><Category>Settings</Category></Not>
903-+ </And>
904-+ </Include>
905-+ </Menu> <!-- End Accessibility -->
906-+
907-+ <!-- Development Tools -->
908-+ <Menu>
909-+ <Name>Development</Name>
910-+ <Directory>Development.directory</Directory>
911-+ <Include>
912-+ <And>
913-+ <Category>Development</Category>
914-+ </And>
915-+ <Filename>emacs.desktop</Filename>
916-+ </Include>
917-+ </Menu> <!-- End Development Tools -->
918-+
919-+ <!-- Education -->
920-+ <Menu>
921-+ <Name>Education</Name>
922-+ <Directory>Education.directory</Directory>
923-+ <Include>
924-+ <And>
925-+ <Category>Education</Category>
926-+ <Not><Category>Science</Category></Not>
927-+ </And>
928-+ </Include>
929-+ </Menu> <!-- End Education -->
930-+
931-+ <!-- Science -->
932-+ <Menu>
933-+ <Name>Science</Name>
934-+ <Directory>GnomeScience.directory</Directory>
935-+ <Include>
936-+ <And>
937-+ <Category>Education</Category>
938-+ <Category>Science</Category>
939-+ </And>
940-+ </Include>
941-+ </Menu> <!-- End Science -->
942-+
943-+ <!-- Games -->
944-+ <Menu>
945-+ <Name>Games</Name>
946-+ <Directory>Game.directory</Directory>
947-+ <Include>
948-+ <And>
949-+ <Category>Game</Category>
950-+ <Not><Category>ActionGame</Category></Not>
951-+ <Not><Category>AdventureGame</Category></Not>
952-+ <Not><Category>ArcadeGame</Category></Not>
953-+ <Not><Category>BoardGame</Category></Not>
954-+ <Not><Category>BlocksGame</Category></Not>
955-+ <Not><Category>CardGame</Category></Not>
956-+ <Not><Category>KidsGame</Category></Not>
957-+ <Not><Category>LogicGame</Category></Not>
958-+ <Not><Category>Simulation</Category></Not>
959-+ <Not><Category>SportsGame</Category></Not>
960-+ <Not><Category>StrategyGame</Category></Not>
961-+ </And>
962-+ </Include>
963-+ <DefaultLayout inline="true" inline_limit="6" inline_header="false">
964-+ <Merge type="menus"/>
965-+ <Merge type="files"/>
966-+ </DefaultLayout>
967-+ <Menu>
968-+ <Name>Action</Name>
969-+ <Directory>ActionGames.directory</Directory>
970-+ <Include>
971-+ <Category>ActionGame</Category>
972-+ </Include>
973-+ </Menu>
974-+ <Menu>
975-+ <Name>Adventure</Name>
976-+ <Directory>AdventureGames.directory</Directory>
977-+ <Include>
978-+ <Category>AdventureGame</Category>
979-+ </Include>
980-+ </Menu>
981-+ <Menu>
982-+ <Name>Arcade</Name>
983-+ <Directory>ArcadeGames.directory</Directory>
984-+ <Include>
985-+ <Category>ArcadeGame</Category>
986-+ </Include>
987-+ </Menu>
988-+ <Menu>
989-+ <Name>Board</Name>
990-+ <Directory>BoardGames.directory</Directory>
991-+ <Include>
992-+ <Category>BoardGame</Category>
993-+ </Include>
994-+ </Menu>
995-+ <Menu>
996-+ <Name>Blocks</Name>
997-+ <Directory>BlocksGames.directory</Directory>
998-+ <Include>
999-+ <Category>BlocksGame</Category>
1000-+ </Include>
1001-+ </Menu>
1002-+ <Menu>
1003-+ <Name>Cards</Name>
1004-+ <Directory>CardGames.directory</Directory>
1005-+ <Include>
1006-+ <Category>CardGame</Category>
1007-+ </Include>
1008-+ </Menu>
1009-+ <Menu>
1010-+ <Name>Kids</Name>
1011-+ <Directory>KidsGames.directory</Directory>
1012-+ <Include>
1013-+ <Category>KidsGame</Category>
1014-+ </Include>
1015-+ </Menu>
1016-+ <Menu>
1017-+ <Name>Logic</Name>
1018-+ <Directory>LogicGames.directory</Directory>
1019-+ <Include>
1020-+ <Category>LogicGame</Category>
1021-+ </Include>
1022-+ </Menu>
1023-+ <Menu>
1024-+ <Name>Role Playing</Name>
1025-+ <Directory>RolePlayingGames.directory</Directory>
1026-+ <Include>
1027-+ <Category>RolePlaying</Category>
1028-+ </Include>
1029-+ </Menu>
1030-+ <Menu>
1031-+ <Name>Simulation</Name>
1032-+ <Directory>SimulationGames.directory</Directory>
1033-+ <Include>
1034-+ <Category>Simulation</Category>
1035-+ </Include>
1036-+ </Menu>
1037-+ <Menu>
1038-+ <Name>Sports</Name>
1039-+ <Directory>SportsGames.directory</Directory>
1040-+ <Include>
1041-+ <Category>SportsGame</Category>
1042-+ </Include>
1043-+ </Menu>
1044-+ <Menu>
1045-+ <Name>Strategy</Name>
1046-+ <Directory>StrategyGames.directory</Directory>
1047-+ <Include>
1048-+ <Category>StrategyGame</Category>
1049-+ </Include>
1050-+ </Menu>
1051-+ </Menu> <!-- End Games -->
1052-+
1053-+ <!-- Graphics -->
1054-+ <Menu>
1055-+ <Name>Graphics</Name>
1056-+ <Directory>Graphics.directory</Directory>
1057-+ <Include>
1058-+ <And>
1059-+ <Category>Graphics</Category>
1060-+ </And>
1061-+ </Include>
1062-+ </Menu> <!-- End Graphics -->
1063-+
1064-+ <!-- Internet -->
1065-+ <Menu>
1066-+ <Name>Internet</Name>
1067-+ <Directory>Network.directory</Directory>
1068-+ <Include>
1069-+ <And>
1070-+ <Category>Network</Category>
1071-+ <Not>
1072-+ <Category>X-GNOME-WebApplication</Category>
1073-+ </Not>
1074-+ </And>
1075-+ </Include>
1076-+ </Menu> <!-- End Internet -->
1077-+
1078-+ <!-- Web Applications -->
1079-+ <Menu>
1080-+ <Name>Web Applications</Name>
1081-+ <Directory>X-GNOME-WebApplications.directory</Directory>
1082-+ <Include>
1083-+ <And>
1084-+ <Category>Network</Category>
1085-+ <Category>X-GNOME-WebApplication</Category>
1086-+ </And>
1087-+ </Include>
1088-+ </Menu>
1089-+
1090-+ <!-- Multimedia -->
1091-+ <Menu>
1092-+ <Name>Multimedia</Name>
1093-+ <Directory>AudioVideo.directory</Directory>
1094-+ <Include>
1095-+ <And>
1096-+ <Category>AudioVideo</Category>
1097-+ </And>
1098-+ </Include>
1099-+ </Menu> <!-- End Multimedia -->
1100-+
1101-+ <!-- Office -->
1102-+ <Menu>
1103-+ <Name>Office</Name>
1104-+ <Directory>Office.directory</Directory>
1105-+ <Include>
1106-+ <And>
1107-+ <Category>Office</Category>
1108-+ </And>
1109-+ </Include>
1110-+ </Menu> <!-- End Office -->
1111-+
1112-+ <!-- System Tools-->
1113-+ <Menu>
1114-+ <Name>System</Name>
1115-+ <Directory>System-Tools.directory</Directory>
1116-+ <Include>
1117-+ <And>
1118-+ <Category>System</Category>
1119-+ <Not><Category>Settings</Category></Not>
1120-+ <Not><Category>Game</Category></Not>
1121-+ </And>
1122-+ </Include>
1123-+ <Menu>
1124-+ <Name>Preferences</Name>
1125-+ <Directory>Settings.directory</Directory>
1126-+ <Include>
1127-+ <And>
1128-+ <Category>Settings</Category>
1129-+ <Not>
1130-+ <Or>
1131-+ <Category>System</Category>
1132-+ <Category>X-GNOME-Settings-Panel</Category>
1133-+ </Or>
1134-+ </Not>
1135-+ </And>
1136-+ </Include>
1137-+ </Menu>
1138-+ <Menu>
1139-+ <Name>Administration</Name>
1140-+ <Directory>Settings-System.directory</Directory>
1141-+ <Include>
1142-+ <And>
1143-+ <Category>Settings</Category>
1144-+ <Category>System</Category>
1145-+ <Not>
1146-+ <Category>X-GNOME-Settings-Panel</Category>
1147-+ </Not>
1148-+ </And>
1149-+ </Include>
1150-+ </Menu>
1151-+ </Menu> <!-- End System Tools -->
1152-+
1153-+ <!-- Other -->
1154-+ <Menu>
1155-+ <Name>Other</Name>
1156-+ <Directory>X-GNOME-Other.directory</Directory>
1157-+ <OnlyUnallocated/>
1158-+ <Include>
1159-+ <And>
1160-+ <Not><Category>Core</Category></Not>
1161-+ <Not><Category>Screensaver</Category></Not>
1162-+ <Not><Category>X-GNOME-Settings-Panel</Category></Not>
1163-+ </And>
1164-+ </Include>
1165-+ </Menu> <!-- End Other -->
1166-+
1167-+ <Layout>
1168-+ <Merge type="menus" />
1169-+ <Menuname>Other</Menuname>
1170-+ <Merge type="files" />
1171-+ </Layout>
1172-+
1173-+ <!-- The Debian menu -->
1174-+ <Menu>
1175-+ <Name>Debian</Name>
1176-+ <MergeFile>debian-menu.menu</MergeFile>
1177-+ <Directory>Debian.directory</Directory>
1178-+ </Menu>
1179-+
1180-+<Include>
1181-+ <Filename>ubuntu-software-center.desktop</Filename>
1182-+</Include>
1183-+
1184-+<!-- Separator between menus and gnome-app-install -->
1185-+<Layout>
1186-+ <Merge type="menus"/>
1187-+ <Merge type="files"/>
1188-+ <Separator/>
1189-+ <Filename>ubuntu-software-center.desktop</Filename>
1190-+</Layout>
1191-+
1192-+</Menu> <!-- End Applications -->
1193
1194=== removed file 'debian/patches/revert_leak_fix_from_git.patch'
1195--- debian/patches/revert_leak_fix_from_git.patch 2014-02-12 10:05:17 +0000
1196+++ debian/patches/revert_leak_fix_from_git.patch 1970-01-01 00:00:00 +0000
1197@@ -1,443 +0,0 @@
1198-diff -Nur gnome-menus-3.8.0/libmenu/desktop-entries.c gnome-menus-3.8.0.new/libmenu/desktop-entries.c
1199---- gnome-menus-3.8.0/libmenu/desktop-entries.c 2013-11-12 18:25:15.000000000 +0100
1200-+++ gnome-menus-3.8.0.new/libmenu/desktop-entries.c 2013-11-12 18:25:51.338232058 +0100
1201-@@ -408,7 +408,7 @@
1202- g_return_val_if_fail (entry != NULL, NULL);
1203- g_return_val_if_fail (entry->refcount > 0, NULL);
1204-
1205-- g_atomic_int_inc (&entry->refcount);
1206-+ entry->refcount += 1;
1207-
1208- return entry;
1209- }
1210-@@ -701,7 +701,7 @@
1211- g_return_val_if_fail (set != NULL, NULL);
1212- g_return_val_if_fail (set->refcount > 0, NULL);
1213-
1214-- g_atomic_int_inc (&set->refcount);
1215-+ set->refcount += 1;
1216-
1217- return set;
1218- }
1219-@@ -709,13 +709,11 @@
1220- void
1221- desktop_entry_set_unref (DesktopEntrySet *set)
1222- {
1223-- gboolean is_zero;
1224--
1225- g_return_if_fail (set != NULL);
1226- g_return_if_fail (set->refcount > 0);
1227-
1228-- is_zero = g_atomic_int_dec_and_test (&set->refcount);
1229-- if (is_zero)
1230-+ set->refcount -= 1;
1231-+ if (set->refcount == 0)
1232- {
1233- menu_verbose (" Deleting entry set %p\n", set);
1234-
1235-diff -Nur gnome-menus-3.8.0/libmenu/entry-directories.c gnome-menus-3.8.0.new/libmenu/entry-directories.c
1236---- gnome-menus-3.8.0/libmenu/entry-directories.c 2013-03-14 01:51:38.000000000 +0100
1237-+++ gnome-menus-3.8.0.new/libmenu/entry-directories.c 2013-11-12 18:25:51.342232058 +0100
1238-@@ -40,12 +40,12 @@
1239-
1240- guint entry_type : 2;
1241- guint is_legacy : 1;
1242-- volatile gint refcount;
1243-+ guint refcount : 24;
1244- };
1245-
1246- struct EntryDirectoryList
1247- {
1248-- volatile int refcount;
1249-+ int refcount;
1250- int length;
1251- GList *dirs;
1252- };
1253-@@ -64,10 +64,7 @@
1254- guint have_read_entries : 1;
1255- guint deleted : 1;
1256-
1257-- GFunc notify;
1258-- gpointer notify_data;
1259--
1260-- volatile gint references;
1261-+ guint references : 28;
1262- };
1263-
1264- struct CachedDirMonitor
1265-@@ -82,12 +79,6 @@
1266- static void cached_dir_free (CachedDir *dir);
1267- static gboolean cached_dir_load_entries_recursive (CachedDir *dir,
1268- const char *dirname);
1269--static void cached_dir_unref (CachedDir *dir);
1270--static CachedDir * cached_dir_add_subdir (CachedDir *dir,
1271-- const char *basename,
1272-- const char *path);
1273--static gboolean cached_dir_remove_subdir (CachedDir *dir,
1274-- const char *basename);
1275-
1276- static void handle_cached_dir_changed (MenuMonitor *monitor,
1277- MenuMonitorEvent event,
1278-@@ -100,35 +91,14 @@
1279-
1280- static CachedDir *dir_cache = NULL;
1281-
1282--static void
1283--clear_cache (CachedDir *dir,
1284-- gpointer *cache)
1285--{
1286-- *cache = NULL;
1287--}
1288--
1289- static CachedDir *
1290- cached_dir_new (const char *name)
1291- {
1292- CachedDir *dir;
1293-
1294- dir = g_new0 (CachedDir, 1);
1295-- dir->name = g_strdup (name);
1296-
1297-- return dir;
1298--}
1299--
1300--static CachedDir *
1301--cached_dir_new_full (const char *name,
1302-- GFunc notify,
1303-- gpointer notify_data)
1304--{
1305-- CachedDir *dir;
1306--
1307-- dir = cached_dir_new (name);
1308--
1309-- dir->notify = notify;
1310-- dir->notify_data = notify_data;
1311-+ dir->name = g_strdup (name);
1312-
1313- return dir;
1314- }
1315-@@ -156,7 +126,7 @@
1316- dir->entries = NULL;
1317-
1318- g_slist_foreach (dir->subdirs,
1319-- (GFunc) cached_dir_unref,
1320-+ (GFunc) cached_dir_free,
1321- NULL);
1322- g_slist_free (dir->subdirs);
1323- dir->subdirs = NULL;
1324-@@ -165,36 +135,6 @@
1325- g_free (dir);
1326- }
1327-
1328--static CachedDir *
1329--cached_dir_ref (CachedDir *dir)
1330--{
1331-- g_atomic_int_inc (&dir->references);
1332--
1333-- return dir;
1334--}
1335--
1336--static void
1337--cached_dir_unref (CachedDir *dir)
1338--{
1339-- gboolean is_zero;
1340--
1341-- is_zero = g_atomic_int_dec_and_test (&dir->references);
1342-- if (is_zero)
1343-- {
1344-- CachedDir *parent;
1345--
1346-- parent = dir->parent;
1347--
1348-- if (parent != NULL)
1349-- cached_dir_remove_subdir (parent, dir->name);
1350--
1351-- if (dir->notify)
1352-- dir->notify (dir, dir->notify_data);
1353--
1354-- cached_dir_free (dir);
1355-- }
1356--}
1357--
1358- static inline CachedDir *
1359- find_subdir (CachedDir *dir,
1360- const char *subdir)
1361-@@ -224,13 +164,8 @@
1362- tmp = dir->entries;
1363- while (tmp != NULL)
1364- {
1365-- const char *entry_basename;
1366--
1367-- entry_basename = desktop_entry_get_basename (tmp->data);
1368-- if (strcmp (entry_basename, basename) == 0)
1369-- {
1370-- return tmp->data;
1371-- }
1372-+ if (strcmp (desktop_entry_get_basename (tmp->data), basename) == 0)
1373-+ return tmp->data;
1374-
1375- tmp = tmp->next;
1376- }
1377-@@ -278,9 +213,7 @@
1378- int i;
1379-
1380- if (dir_cache == NULL)
1381-- dir_cache = cached_dir_new_full ("/",
1382-- (GFunc) clear_cache,
1383-- &dir_cache);
1384-+ dir_cache = cached_dir_new ("/");
1385- dir = dir_cache;
1386-
1387- g_assert (canonical != NULL && canonical[0] == G_DIR_SEPARATOR);
1388-@@ -294,7 +227,12 @@
1389- {
1390- CachedDir *subdir;
1391-
1392-- subdir = cached_dir_add_subdir (dir, split[i], NULL);
1393-+ if ((subdir = find_subdir (dir, split[i])) == NULL)
1394-+ {
1395-+ subdir = cached_dir_new (split[i]);
1396-+ dir->subdirs = g_slist_prepend (dir->subdirs, subdir);
1397-+ subdir->parent = dir;
1398-+ }
1399-
1400- dir = subdir;
1401-
1402-@@ -334,9 +272,7 @@
1403- tmp = dir->entries;
1404- while (tmp != NULL)
1405- {
1406-- const char *entry_basename;
1407-- entry_basename = desktop_entry_get_basename (tmp->data);
1408-- if (strcmp (entry_basename, basename) == 0)
1409-+ if (strcmp (desktop_entry_get_basename (tmp->data), basename) == 0)
1410- {
1411- if (!desktop_entry_reload (tmp->data))
1412- {
1413-@@ -361,10 +297,7 @@
1414- tmp = dir->entries;
1415- while (tmp != NULL)
1416- {
1417-- const char *entry_basename;
1418-- entry_basename = desktop_entry_get_basename (tmp->data);
1419--
1420-- if (strcmp (entry_basename, basename) == 0)
1421-+ if (strcmp (desktop_entry_get_basename (tmp->data), basename) == 0)
1422- {
1423- desktop_entry_unref (tmp->data);
1424- dir->entries = g_slist_delete_link (dir->entries, tmp);
1425-@@ -377,7 +310,7 @@
1426- return FALSE;
1427- }
1428-
1429--static CachedDir *
1430-+static gboolean
1431- cached_dir_add_subdir (CachedDir *dir,
1432- const char *basename,
1433- const char *path)
1434-@@ -389,23 +322,23 @@
1435- if (subdir != NULL)
1436- {
1437- subdir->deleted = FALSE;
1438-- return subdir;
1439-+ return TRUE;
1440- }
1441-
1442- subdir = cached_dir_new (basename);
1443-
1444-- if (path != NULL && !cached_dir_load_entries_recursive (subdir, path))
1445-+ if (!cached_dir_load_entries_recursive (subdir, path))
1446- {
1447- cached_dir_free (subdir);
1448-- return NULL;
1449-+ return FALSE;
1450- }
1451-
1452- menu_verbose ("Caching dir \"%s\"\n", basename);
1453-
1454- subdir->parent = dir;
1455-- dir->subdirs = g_slist_prepend (dir->subdirs, cached_dir_ref (subdir));
1456-+ dir->subdirs = g_slist_prepend (dir->subdirs, subdir);
1457-
1458-- return subdir;
1459-+ return TRUE;
1460- }
1461-
1462- static gboolean
1463-@@ -422,7 +355,7 @@
1464-
1465- if (subdir->references == 0)
1466- {
1467-- cached_dir_unref (subdir);
1468-+ cached_dir_free (subdir);
1469- dir->subdirs = g_slist_remove (dir->subdirs, subdir);
1470- }
1471-
1472-@@ -563,7 +496,7 @@
1473- switch (event)
1474- {
1475- case MENU_MONITOR_EVENT_CREATED:
1476-- handled = cached_dir_add_subdir (dir, basename, path) != NULL;
1477-+ handled = cached_dir_add_subdir (dir, basename, path);
1478- break;
1479-
1480- case MENU_MONITOR_EVENT_CHANGED:
1481-@@ -735,7 +668,7 @@
1482- static void
1483- cached_dir_add_reference (CachedDir *dir)
1484- {
1485-- cached_dir_ref (dir);
1486-+ dir->references++;
1487-
1488- if (dir->parent != NULL)
1489- {
1490-@@ -750,7 +683,29 @@
1491-
1492- parent = dir->parent;
1493-
1494-- cached_dir_unref (dir);
1495-+ if (--dir->references == 0 && dir->deleted)
1496-+ {
1497-+ if (dir->parent != NULL)
1498-+ {
1499-+ GSList *tmp;
1500-+
1501-+ tmp = parent->subdirs;
1502-+ while (tmp != NULL)
1503-+ {
1504-+ CachedDir *subdir = tmp->data;
1505-+
1506-+ if (!strcmp (subdir->name, dir->name))
1507-+ {
1508-+ parent->subdirs = g_slist_delete_link (parent->subdirs, tmp);
1509-+ break;
1510-+ }
1511-+
1512-+ tmp = tmp->next;
1513-+ }
1514-+ }
1515-+
1516-+ cached_dir_free (dir);
1517-+ }
1518-
1519- if (parent != NULL)
1520- {
1521-@@ -822,7 +777,7 @@
1522- g_return_val_if_fail (ed != NULL, NULL);
1523- g_return_val_if_fail (ed->refcount > 0, NULL);
1524-
1525-- g_atomic_int_inc (&ed->refcount);
1526-+ ed->refcount++;
1527-
1528- return ed;
1529- }
1530-@@ -830,13 +785,10 @@
1531- void
1532- entry_directory_unref (EntryDirectory *ed)
1533- {
1534-- gboolean is_zero;
1535--
1536- g_return_if_fail (ed != NULL);
1537- g_return_if_fail (ed->refcount > 0);
1538-
1539-- is_zero = g_atomic_int_dec_and_test (&ed->refcount);
1540-- if (is_zero)
1541-+ if (--ed->refcount == 0)
1542- {
1543- cached_dir_remove_reference (ed->dir);
1544-
1545-@@ -952,12 +904,11 @@
1546-
1547- if (desktop_entry_get_type (entry) == ed->entry_type)
1548- {
1549-- gboolean ret;
1550-- char *file_id;
1551-- const char *basename;
1552-+ gboolean ret;
1553-+ char *file_id;
1554-
1555-- basename = desktop_entry_get_basename (entry);
1556-- g_string_append (relative_path, basename);
1557-+ g_string_append (relative_path,
1558-+ desktop_entry_get_basename (entry));
1559-
1560- file_id = get_desktop_file_id_from_path (ed,
1561- ed->entry_type,
1562-@@ -1037,7 +988,7 @@
1563- DesktopEntry *entry = tmp->data;
1564- const char *basename;
1565-
1566-- basename = desktop_entry_get_path (entry);
1567-+ basename = desktop_entry_get_basename (entry);
1568-
1569- if (desktop_entries &&
1570- desktop_entry_get_type (entry) == DESKTOP_ENTRY_DESKTOP)
1571-@@ -1110,7 +1061,7 @@
1572- g_return_val_if_fail (list != NULL, NULL);
1573- g_return_val_if_fail (list->refcount > 0, NULL);
1574-
1575-- g_atomic_int_inc (&list->refcount);
1576-+ list->refcount += 1;
1577-
1578- return list;
1579- }
1580-@@ -1118,13 +1069,11 @@
1581- void
1582- entry_directory_list_unref (EntryDirectoryList *list)
1583- {
1584-- gboolean is_zero;
1585--
1586- g_return_if_fail (list != NULL);
1587- g_return_if_fail (list->refcount > 0);
1588-
1589-- is_zero = g_atomic_int_dec_and_test (&list->refcount);
1590-- if (is_zero)
1591-+ list->refcount -= 1;
1592-+ if (list->refcount == 0)
1593- {
1594- g_list_foreach (list->dirs, (GFunc) entry_directory_unref, NULL);
1595- g_list_free (list->dirs);
1596-diff -Nur gnome-menus-3.8.0/libmenu/gmenu-tree.c gnome-menus-3.8.0.new/libmenu/gmenu-tree.c
1597---- gnome-menus-3.8.0/libmenu/gmenu-tree.c 2013-11-12 18:25:15.000000000 +0100
1598-+++ gnome-menus-3.8.0.new/libmenu/gmenu-tree.c 2013-11-12 18:25:51.346232058 +0100
1599-@@ -163,7 +163,7 @@
1600- MenuLayoutNode *layout);
1601- static void gmenu_tree_force_recanonicalize (GMenuTree *tree);
1602- static void gmenu_tree_invoke_monitors (GMenuTree *tree);
1603--
1604-+
1605- static void gmenu_tree_item_unref_and_unset_parent (gpointer itemp);
1606-
1607- typedef enum
1608-@@ -1255,12 +1255,8 @@
1609- append_directory_path (directory, path);
1610-
1611- if (entry != NULL)
1612-- {
1613-- const char *basename;
1614--
1615-- basename = desktop_entry_get_basename (entry->desktop_entry);
1616-- g_string_append (path, basename);
1617-- }
1618-+ g_string_append (path,
1619-+ desktop_entry_get_basename (entry->desktop_entry));
1620-
1621- return g_string_free (path, FALSE);
1622- }
1623-@@ -1290,7 +1286,7 @@
1624- const char *
1625- gmenu_tree_entry_get_desktop_file_id (GMenuTreeEntry *entry)
1626- {
1627-- g_return_val_if_fail (entry != NULL, FALSE);
1628-+ g_return_val_if_fail (entry != NULL, NULL);
1629-
1630- return entry->desktop_file_id;
1631- }
1632-@@ -1502,7 +1498,7 @@
1633- NULL);
1634- g_slist_free (directory->contents);
1635- directory->contents = NULL;
1636--
1637-+
1638- g_slist_foreach (directory->default_layout_info,
1639- (GFunc) menu_layout_node_unref,
1640- NULL);
1641
1642=== modified file 'debian/patches/series'
1643--- debian/patches/series 2014-03-17 06:09:59 +0000
1644+++ debian/patches/series 2015-07-29 19:52:19 +0000
1645@@ -1,12 +1,12 @@
1646 01_default_prefix.patch
1647 02_kill_debian_menu.patch
1648 03_kde-legacydirs.patch
1649+04_fix-other.patch
1650 08_settings-menus.patch
1651+09_games-menu.patch
1652 09_app_install_entry.patch
1653-09_games-menu.patch
1654 11_science-menu.patch
1655-50_add-gcc-apps.patch
1656+12_alacarte.patch
1657+30_xdg_syntax.patch
1658+31_nl_translation.patch
1659 70_ubuntu-directories.patch
1660-ubuntu_gcc_translations.patch
1661-revert_leak_fix_from_git.patch
1662-fix-menus-in-gnome-flashback-session.patch
1663
1664=== removed file 'debian/patches/ubuntu_gcc_translations.patch'
1665--- debian/patches/ubuntu_gcc_translations.patch 2013-10-09 13:36:19 +0000
1666+++ debian/patches/ubuntu_gcc_translations.patch 1970-01-01 00:00:00 +0000
1667@@ -1,101 +0,0 @@
1668-# Description: revert dropping of gnome-control-center categories, they got
1669-# deprecated in g-c-c 3.8 but we are still using 3.6. We can drop those
1670-# changes once we do the update.
1671-# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-menus/+bug/1232534
1672-Index: gnome-menus-3.8.0/desktop-directories/Hardware.directory.in
1673-===================================================================
1674---- /dev/null 1970-01-01 00:00:00.000000000 +0000
1675-+++ gnome-menus-3.8.0/desktop-directories/Hardware.directory.in 2013-10-09 15:21:15.269679845 +0200
1676-@@ -0,0 +1,5 @@
1677-+[Desktop Entry]
1678-+_Name=Hardware
1679-+_Comment=Settings for several hardware devices
1680-+Icon=preferences-desktop-peripherals
1681-+Type=Directory
1682-Index: gnome-menus-3.8.0/desktop-directories/Makefile.am
1683-===================================================================
1684---- gnome-menus-3.8.0.orig/desktop-directories/Makefile.am 2013-10-09 15:21:15.277679844 +0200
1685-+++ gnome-menus-3.8.0/desktop-directories/Makefile.am 2013-10-09 15:21:15.269679845 +0200
1686-@@ -1,5 +1,11 @@
1687- directorydir = $(datadir)/desktop-directories
1688-
1689-+# Should be moved to gnome-control-center:
1690-+directory_in_controlcenterfiles = \
1691-+ Hardware.directory.in \
1692-+ Personal.directory.in \
1693-+ System.directory.in
1694-+
1695- directory_in_files = \
1696- AudioVideo.directory.in \
1697- Development.directory.in \
1698-@@ -16,7 +22,8 @@
1699- X-GNOME-Sundry.directory.in \
1700- X-GNOME-Utilities.directory.in \
1701- X-GNOME-WebApplications.directory.in \
1702-- X-GNOME-SystemSettings.directory.in
1703-+ X-GNOME-SystemSettings.directory.in \
1704-+ $(directory_in_controlcenterfiles)
1705-
1706- directory_DATA = $(directory_in_files:.directory.in=.directory)
1707-
1708-Index: gnome-menus-3.8.0/desktop-directories/Makefile.in
1709-===================================================================
1710---- gnome-menus-3.8.0.orig/desktop-directories/Makefile.in 2013-10-09 15:21:15.277679844 +0200
1711-+++ gnome-menus-3.8.0/desktop-directories/Makefile.in 2013-10-09 15:21:15.273679844 +0200
1712-@@ -277,6 +277,13 @@
1713- top_builddir = @top_builddir@
1714- top_srcdir = @top_srcdir@
1715- directorydir = $(datadir)/desktop-directories
1716-+
1717-+# Should be moved to gnome-control-center:
1718-+directory_in_controlcenterfiles = \
1719-+ Hardware.directory.in \
1720-+ Personal.directory.in \
1721-+ System.directory.in
1722-+
1723- directory_in_files = \
1724- AudioVideo.directory.in \
1725- Development.directory.in \
1726-@@ -293,7 +300,8 @@
1727- X-GNOME-Sundry.directory.in \
1728- X-GNOME-Utilities.directory.in \
1729- X-GNOME-WebApplications.directory.in \
1730-- X-GNOME-SystemSettings.directory.in
1731-+ X-GNOME-SystemSettings.directory.in \
1732-+ $(directory_in_controlcenterfiles)
1733-
1734- directory_DATA = $(directory_in_files:.directory.in=.directory)
1735- EXTRA_DIST = $(directory_in_files)
1736-Index: gnome-menus-3.8.0/desktop-directories/Personal.directory.in
1737-===================================================================
1738---- /dev/null 1970-01-01 00:00:00.000000000 +0000
1739-+++ gnome-menus-3.8.0/desktop-directories/Personal.directory.in 2013-10-09 15:21:15.273679844 +0200
1740-@@ -0,0 +1,6 @@
1741-+[Desktop Entry]
1742-+# Translators: this is Personal as in "Personal settings"
1743-+_Name=Personal
1744-+_Comment=Personal settings
1745-+Icon=preferences-desktop-personal
1746-+Type=Directory
1747-Index: gnome-menus-3.8.0/desktop-directories/System.directory.in
1748-===================================================================
1749---- /dev/null 1970-01-01 00:00:00.000000000 +0000
1750-+++ gnome-menus-3.8.0/desktop-directories/System.directory.in 2013-10-09 15:21:15.273679844 +0200
1751-@@ -0,0 +1,5 @@
1752-+[Desktop Entry]
1753-+_Name=System
1754-+_Comment=System settings
1755-+Icon=preferences-system
1756-+Type=Directory
1757-Index: gnome-menus-3.8.0/po/POTFILES.in
1758-===================================================================
1759---- gnome-menus-3.8.0.orig/po/POTFILES.in 2013-10-09 15:21:15.277679844 +0200
1760-+++ gnome-menus-3.8.0/po/POTFILES.in 2013-10-09 15:21:15.273679844 +0200
1761-@@ -31,3 +31,7 @@
1762- debian/desktop-files/SimulationGames.directory.in
1763- debian/desktop-files/SportsGames.directory.in
1764- debian/desktop-files/StrategyGames.directory.in
1765-+desktop-directories/Hardware.directory.in
1766-+desktop-directories/Personal.directory.in
1767-+desktop-directories/System.directory.in
1768-+
1769
1770=== modified file 'debian/po-up/de.po'
1771--- debian/po-up/de.po 2011-12-23 20:30:50 +0000
1772+++ debian/po-up/de.po 2015-07-29 19:52:19 +0000
1773@@ -4,14 +4,14 @@
1774 # Bill Allombert <ballombe@debian.org>, 2003.
1775 # German translation:
1776 # Sebastian Rittau <srittau@debian.org>, 2003, 2004.
1777-# Helge Kreutzmann <debian@helgefjell.de>, 2007.
1778+# Helge Kreutzmann <debian@helgefjell.de>, 2007, 2013.
1779 #
1780 msgid ""
1781 msgstr ""
1782-"Project-Id-Version: menu-section 2.18.3-2\n"
1783+"Project-Id-Version: menu-section 3.8.0-2\n"
1784 "Report-Msgid-Bugs-To: \n"
1785 "POT-Creation-Date: 2011-06-04 22:08+0200\n"
1786-"PO-Revision-Date: 2007-07-24 21:26+0200\n"
1787+"PO-Revision-Date: 2013-07-08 21:53+0200\n"
1788 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
1789 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
1790 "Language: de\n"
1791@@ -81,7 +81,7 @@
1792
1793 #: ../../debian/desktop-files/GnomeScience.directory.in.h:2
1794 msgid "Scientific applications"
1795-msgstr ""
1796+msgstr "Wissenschaftliche Anwendungen"
1797
1798 #: ../../debian/desktop-files/KidsGames.directory.in.h:1
1799 msgid "Games for kids"
1800
1801=== modified file 'debian/po-up/es.po'
1802--- debian/po-up/es.po 2011-12-23 20:30:50 +0000
1803+++ debian/po-up/es.po 2015-07-29 19:52:19 +0000
1804@@ -79,11 +79,11 @@
1805
1806 #: ../../debian/desktop-files/GnomeScience.directory.in.h:1
1807 msgid "Science"
1808-msgstr ""
1809+msgstr "Ciencia"
1810
1811 #: ../../debian/desktop-files/GnomeScience.directory.in.h:2
1812 msgid "Scientific applications"
1813-msgstr ""
1814+msgstr "Aplicaciones Científicas"
1815
1816 #: ../../debian/desktop-files/KidsGames.directory.in.h:1
1817 msgid "Games for kids"
1818
1819=== modified file 'debian/po-up/pt.po'
1820--- debian/po-up/pt.po 2011-12-23 20:30:50 +0000
1821+++ debian/po-up/pt.po 2015-07-29 19:52:19 +0000
1822@@ -79,7 +79,7 @@
1823
1824 #: ../../debian/desktop-files/GnomeScience.directory.in.h:2
1825 msgid "Scientific applications"
1826-msgstr ""
1827+msgstr "Aplicações Científicas"
1828
1829 #: ../../debian/desktop-files/KidsGames.directory.in.h:1
1830 msgid "Games for kids"
1831
1832=== modified file 'debian/po-up/ru.po'
1833--- debian/po-up/ru.po 2011-12-23 20:30:50 +0000
1834+++ debian/po-up/ru.po 2015-07-29 19:52:19 +0000
1835@@ -80,7 +80,7 @@
1836
1837 #: ../../debian/desktop-files/GnomeScience.directory.in.h:1
1838 msgid "Science"
1839-msgstr ""
1840+msgstr "Hаука"
1841
1842 #: ../../debian/desktop-files/GnomeScience.directory.in.h:2
1843 msgid "Scientific applications"
1844
1845=== modified file 'debian/rules'
1846--- debian/rules 2014-02-12 10:07:36 +0000
1847+++ debian/rules 2015-07-29 19:52:19 +0000
1848@@ -3,7 +3,6 @@
1849 DEB_BUILDDIR = debian/build
1850
1851 DEB_BUILD_PARALLEL=1
1852-include /usr/share/cdbs/1/rules/autoreconf.mk
1853 include /usr/share/cdbs/1/rules/debhelper.mk
1854 include /usr/share/cdbs/1/class/gnome.mk
1855 include /usr/share/cdbs/1/rules/utils.mk

Subscribers

People subscribed via source and target branches

to all changes: