Merge lp:~muktupavels/gnome-menus/fix-menus-in-gnome-flashback-session-real into lp:~ubuntu-desktop/gnome-menus/ubuntu

Proposed by Alberts Muktupāvels
Status: Merged
Merged at revision: 145
Proposed branch: lp:~muktupavels/gnome-menus/fix-menus-in-gnome-flashback-session-real
Merge into: lp:~ubuntu-desktop/gnome-menus/ubuntu
Diff against target: 380 lines (+360/-0)
3 files modified
debian/changelog (+8/-0)
debian/patches/fix-menus-in-gnome-flashback-session.patch (+351/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~muktupavels/gnome-menus/fix-menus-in-gnome-flashback-session-real
Reviewer Review Type Date Requested Status
Tim Lunn Approve
Ubuntu Desktop Pending
Review via email: mp+211246@code.launchpad.net

Commit message

Fix menus in gnome-flashback session.

Description of the change

Fix menus in gnome-flashback session.

To post a comment you must log in.
146. By Alberts Muktupāvels on 2014-03-17

update patch

Revision history for this message
Tim Lunn (darkxst) wrote :

Thanks, this looks fine now.

review: Approve
147. By Alberts Muktupāvels on 2014-03-17

add patch in debian/patches/series

Revision history for this message
Tim Lunn (darkxst) wrote :

Actually I revoke that, it seems gnome-flashback-applications.menu is not actually installed...

review: Needs Fixing
Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

> Actually I revoke that, it seems gnome-flashback-applications.menu is not
> actually installed...

I already fixed that :)

Revision history for this message
Tim Lunn (darkxst) wrote :

OK, tested and is good now.

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-02-12 10:15:41 +0000
3+++ debian/changelog 2014-03-17 06:12:33 +0000
4@@ -1,3 +1,11 @@
5+gnome-menus (3.10.1-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * debian/patches/fix-menus-in-gnome-flashback-session.patch: added
8+ menu file from quantal to restore old menu look for gnome-flashback
9+ session (lp: #1267787).
10+
11+ -- Alberts Muktupāvels <alberts.muktupavels@gmail.com> Mon, 17 Mar 2014 07:41:41 +0200
12+
13 gnome-menus (3.10.1-0ubuntu1) trusty; urgency=medium
14
15 * New upstream release
16
17=== added file 'debian/patches/fix-menus-in-gnome-flashback-session.patch'
18--- debian/patches/fix-menus-in-gnome-flashback-session.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/fix-menus-in-gnome-flashback-session.patch 2014-03-17 06:12:33 +0000
20@@ -0,0 +1,351 @@
21+## Description: Fix menus in gnome-flashback-session by adding older menu file.
22+## Bug: https://bugs.launchpad.net/gnome-panel/+bug/1267787
23+--- a/layout/Makefile.am
24++++ b/layout/Makefile.am
25+@@ -1,7 +1,8 @@
26+ menudir = $(sysconfdir)/xdg/menus
27+
28+ menu_DATA = \
29+- gnome-applications.menu
30++ gnome-applications.menu \
31++ gnome-flashback-applications.menu
32+
33+ EXTRA_DIST= $(menu_DATA)
34+
35+--- /dev/null
36++++ b/layout/gnome-flashback-applications.menu
37+@@ -0,0 +1,334 @@
38++<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
39++ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
40++
41++<Menu>
42++
43++ <Name>Applications</Name>
44++ <Directory>X-GNOME-Menu-Applications.directory</Directory>
45++
46++ <!-- Scan legacy dirs first, as later items take priority -->
47++ <LegacyDir>/etc/X11/applnk</LegacyDir>
48++ <LegacyDir>/usr/share/gnome/apps</LegacyDir>
49++
50++ <!-- Read standard .directory and .desktop file locations -->
51++ <DefaultAppDirs/>
52++ <DefaultDirectoryDirs/>
53++
54++ <!-- Read in overrides and child menus from applications-merged/ -->
55++ <DefaultMergeDirs/>
56++
57++ <!-- Accessories submenu -->
58++ <Menu>
59++ <Name>Accessories</Name>
60++ <Directory>Utility.directory</Directory>
61++ <Include>
62++ <And>
63++ <Category>Utility</Category>
64++ <!-- Accessibility spec must have either the Utility or Settings
65++ category, and we display an accessibility submenu already for
66++ the ones that do not have Settings, so don't display accessibility
67++ applications here -->
68++ <Not><Category>Accessibility</Category></Not>
69++ <Not><Category>System</Category></Not>
70++ </And>
71++ </Include>
72++ </Menu> <!-- End Accessories -->
73++
74++ <!-- Accessibility submenu -->
75++ <Menu>
76++ <Name>Universal Access</Name>
77++ <Directory>Utility-Accessibility.directory</Directory>
78++ <Include>
79++ <And>
80++ <Category>Accessibility</Category>
81++ <Not><Category>Settings</Category></Not>
82++ </And>
83++ </Include>
84++ </Menu> <!-- End Accessibility -->
85++
86++ <!-- Development Tools -->
87++ <Menu>
88++ <Name>Development</Name>
89++ <Directory>Development.directory</Directory>
90++ <Include>
91++ <And>
92++ <Category>Development</Category>
93++ </And>
94++ <Filename>emacs.desktop</Filename>
95++ </Include>
96++ </Menu> <!-- End Development Tools -->
97++
98++ <!-- Education -->
99++ <Menu>
100++ <Name>Education</Name>
101++ <Directory>Education.directory</Directory>
102++ <Include>
103++ <And>
104++ <Category>Education</Category>
105++ <Not><Category>Science</Category></Not>
106++ </And>
107++ </Include>
108++ </Menu> <!-- End Education -->
109++
110++ <!-- Science -->
111++ <Menu>
112++ <Name>Science</Name>
113++ <Directory>GnomeScience.directory</Directory>
114++ <Include>
115++ <And>
116++ <Category>Education</Category>
117++ <Category>Science</Category>
118++ </And>
119++ </Include>
120++ </Menu> <!-- End Science -->
121++
122++ <!-- Games -->
123++ <Menu>
124++ <Name>Games</Name>
125++ <Directory>Game.directory</Directory>
126++ <Include>
127++ <And>
128++ <Category>Game</Category>
129++ <Not><Category>ActionGame</Category></Not>
130++ <Not><Category>AdventureGame</Category></Not>
131++ <Not><Category>ArcadeGame</Category></Not>
132++ <Not><Category>BoardGame</Category></Not>
133++ <Not><Category>BlocksGame</Category></Not>
134++ <Not><Category>CardGame</Category></Not>
135++ <Not><Category>KidsGame</Category></Not>
136++ <Not><Category>LogicGame</Category></Not>
137++ <Not><Category>Simulation</Category></Not>
138++ <Not><Category>SportsGame</Category></Not>
139++ <Not><Category>StrategyGame</Category></Not>
140++ </And>
141++ </Include>
142++ <DefaultLayout inline="true" inline_limit="6" inline_header="false">
143++ <Merge type="menus"/>
144++ <Merge type="files"/>
145++ </DefaultLayout>
146++ <Menu>
147++ <Name>Action</Name>
148++ <Directory>ActionGames.directory</Directory>
149++ <Include>
150++ <Category>ActionGame</Category>
151++ </Include>
152++ </Menu>
153++ <Menu>
154++ <Name>Adventure</Name>
155++ <Directory>AdventureGames.directory</Directory>
156++ <Include>
157++ <Category>AdventureGame</Category>
158++ </Include>
159++ </Menu>
160++ <Menu>
161++ <Name>Arcade</Name>
162++ <Directory>ArcadeGames.directory</Directory>
163++ <Include>
164++ <Category>ArcadeGame</Category>
165++ </Include>
166++ </Menu>
167++ <Menu>
168++ <Name>Board</Name>
169++ <Directory>BoardGames.directory</Directory>
170++ <Include>
171++ <Category>BoardGame</Category>
172++ </Include>
173++ </Menu>
174++ <Menu>
175++ <Name>Blocks</Name>
176++ <Directory>BlocksGames.directory</Directory>
177++ <Include>
178++ <Category>BlocksGame</Category>
179++ </Include>
180++ </Menu>
181++ <Menu>
182++ <Name>Cards</Name>
183++ <Directory>CardGames.directory</Directory>
184++ <Include>
185++ <Category>CardGame</Category>
186++ </Include>
187++ </Menu>
188++ <Menu>
189++ <Name>Kids</Name>
190++ <Directory>KidsGames.directory</Directory>
191++ <Include>
192++ <Category>KidsGame</Category>
193++ </Include>
194++ </Menu>
195++ <Menu>
196++ <Name>Logic</Name>
197++ <Directory>LogicGames.directory</Directory>
198++ <Include>
199++ <Category>LogicGame</Category>
200++ </Include>
201++ </Menu>
202++ <Menu>
203++ <Name>Role Playing</Name>
204++ <Directory>RolePlayingGames.directory</Directory>
205++ <Include>
206++ <Category>RolePlaying</Category>
207++ </Include>
208++ </Menu>
209++ <Menu>
210++ <Name>Simulation</Name>
211++ <Directory>SimulationGames.directory</Directory>
212++ <Include>
213++ <Category>Simulation</Category>
214++ </Include>
215++ </Menu>
216++ <Menu>
217++ <Name>Sports</Name>
218++ <Directory>SportsGames.directory</Directory>
219++ <Include>
220++ <Category>SportsGame</Category>
221++ </Include>
222++ </Menu>
223++ <Menu>
224++ <Name>Strategy</Name>
225++ <Directory>StrategyGames.directory</Directory>
226++ <Include>
227++ <Category>StrategyGame</Category>
228++ </Include>
229++ </Menu>
230++ </Menu> <!-- End Games -->
231++
232++ <!-- Graphics -->
233++ <Menu>
234++ <Name>Graphics</Name>
235++ <Directory>Graphics.directory</Directory>
236++ <Include>
237++ <And>
238++ <Category>Graphics</Category>
239++ </And>
240++ </Include>
241++ </Menu> <!-- End Graphics -->
242++
243++ <!-- Internet -->
244++ <Menu>
245++ <Name>Internet</Name>
246++ <Directory>Network.directory</Directory>
247++ <Include>
248++ <And>
249++ <Category>Network</Category>
250++ <Not>
251++ <Category>X-GNOME-WebApplication</Category>
252++ </Not>
253++ </And>
254++ </Include>
255++ </Menu> <!-- End Internet -->
256++
257++ <!-- Web Applications -->
258++ <Menu>
259++ <Name>Web Applications</Name>
260++ <Directory>X-GNOME-WebApplications.directory</Directory>
261++ <Include>
262++ <And>
263++ <Category>Network</Category>
264++ <Category>X-GNOME-WebApplication</Category>
265++ </And>
266++ </Include>
267++ </Menu>
268++
269++ <!-- Multimedia -->
270++ <Menu>
271++ <Name>Multimedia</Name>
272++ <Directory>AudioVideo.directory</Directory>
273++ <Include>
274++ <And>
275++ <Category>AudioVideo</Category>
276++ </And>
277++ </Include>
278++ </Menu> <!-- End Multimedia -->
279++
280++ <!-- Office -->
281++ <Menu>
282++ <Name>Office</Name>
283++ <Directory>Office.directory</Directory>
284++ <Include>
285++ <And>
286++ <Category>Office</Category>
287++ </And>
288++ </Include>
289++ </Menu> <!-- End Office -->
290++
291++ <!-- System Tools-->
292++ <Menu>
293++ <Name>System</Name>
294++ <Directory>System-Tools.directory</Directory>
295++ <Include>
296++ <And>
297++ <Category>System</Category>
298++ <Not><Category>Settings</Category></Not>
299++ <Not><Category>Game</Category></Not>
300++ </And>
301++ </Include>
302++ <Menu>
303++ <Name>Preferences</Name>
304++ <Directory>Settings.directory</Directory>
305++ <Include>
306++ <And>
307++ <Category>Settings</Category>
308++ <Not>
309++ <Or>
310++ <Category>System</Category>
311++ <Category>X-GNOME-Settings-Panel</Category>
312++ </Or>
313++ </Not>
314++ </And>
315++ </Include>
316++ </Menu>
317++ <Menu>
318++ <Name>Administration</Name>
319++ <Directory>Settings-System.directory</Directory>
320++ <Include>
321++ <And>
322++ <Category>Settings</Category>
323++ <Category>System</Category>
324++ <Not>
325++ <Category>X-GNOME-Settings-Panel</Category>
326++ </Not>
327++ </And>
328++ </Include>
329++ </Menu>
330++ </Menu> <!-- End System Tools -->
331++
332++ <!-- Other -->
333++ <Menu>
334++ <Name>Other</Name>
335++ <Directory>X-GNOME-Other.directory</Directory>
336++ <OnlyUnallocated/>
337++ <Include>
338++ <And>
339++ <Not><Category>Core</Category></Not>
340++ <Not><Category>Screensaver</Category></Not>
341++ <Not><Category>X-GNOME-Settings-Panel</Category></Not>
342++ </And>
343++ </Include>
344++ </Menu> <!-- End Other -->
345++
346++ <Layout>
347++ <Merge type="menus" />
348++ <Menuname>Other</Menuname>
349++ <Merge type="files" />
350++ </Layout>
351++
352++ <!-- The Debian menu -->
353++ <Menu>
354++ <Name>Debian</Name>
355++ <MergeFile>debian-menu.menu</MergeFile>
356++ <Directory>Debian.directory</Directory>
357++ </Menu>
358++
359++<Include>
360++ <Filename>ubuntu-software-center.desktop</Filename>
361++</Include>
362++
363++<!-- Separator between menus and gnome-app-install -->
364++<Layout>
365++ <Merge type="menus"/>
366++ <Merge type="files"/>
367++ <Separator/>
368++ <Filename>ubuntu-software-center.desktop</Filename>
369++</Layout>
370++
371++</Menu> <!-- End Applications -->
372
373=== modified file 'debian/patches/series'
374--- debian/patches/series 2014-02-12 10:06:34 +0000
375+++ debian/patches/series 2014-03-17 06:12:33 +0000
376@@ -9,3 +9,4 @@
377 70_ubuntu-directories.patch
378 ubuntu_gcc_translations.patch
379 revert_leak_fix_from_git.patch
380+fix-menus-in-gnome-flashback-session.patch

Subscribers

People subscribed via source and target branches