← Back to branch summary

~matttbe/ubuntu/saucy/gnome-menus/lp1265489

« back to all changes in this revision

Viewing changes to debian/patches/git_OnlyUnallocated_only_for_other.patch

  • Committer: Matthieu Baerts
  • Date: 2014-01-05 12:08:11 UTC
  • Revision ID: matttbe@gmail.com-20140105120811-qn5o42ncaikejwfh
https://launchpad.net/bugs/1265489
debian/patches/git_OnlyUnallocated_only_for_other.patch: layout: don't
use 'OnlyUnallocated' for sections different than 'Other' to not break
this section which now contains all applications (LP: #1265489)
This bug is fixed in 3.8.1 version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/git_OnlyUnallocated_only_for_other.patch
 
1
From 6e7790b5451bbb8a44b736ed402964d1bb432247 Mon Sep 17 00:00:00 2001
 
2
From: Giovanni Campagna <gcampagn@redhat.com>
 
3
Date: Mon, 26 Aug 2013 13:59:18 +0000
 
4
Subject: layout: don't use OnlyUnallocated for sections different than Other
 
5
 
 
6
We used to have OnlyUnallocated on all non-folder sections, as
 
7
a quick way to enforce the whitelist, but that broke the Other
 
8
section.
 
9
Instead, we need a whitelist in the two folders, and a blacklist
 
10
in each category the application would normally be in (accessories
 
11
or system tools usually).
 
12
Ideally, apps in the Utilities category would expose the special
 
13
X-GNOME-Utilities desktop category, which we now recognize, but
 
14
the whitelist is kept to avoid patching all of them.
 
15
For the sundry category, ideally it should not be there at all.
 
16
 
 
17
In the process, a number of .desktop files were removed, as they're
 
18
not provided by any packages (checked jhbuild and Fedora 19). They
 
19
are:
 
20
* caribou
 
21
* fedora-im-chooser
 
22
* fedora-abrt
 
23
* gnome-orca
 
24
* gnome-user-share-properties
 
25
* ibus
 
26
* ibus-daemon
 
27
 
 
28
Distributions that are changing .desktop file names should take
 
29
care of patching gnome-menus appropriately.
 
30
 
 
31
https://bugzilla.gnome.org/show_bug.cgi?id=706763
 
32
---
 
33
Index: gnome-menus/layout/gnome-applications.menu
 
34
===================================================================
 
35
--- gnome-menus.orig/layout/gnome-applications.menu     2014-01-02 14:03:36.403171834 +0100
 
36
+++ gnome-menus/layout/gnome-applications.menu  2014-01-02 14:03:36.395171834 +0100
 
37
@@ -20,44 +20,49 @@
 
38
   <!-- Accessories submenu -->
 
39
   <Menu>
 
40
     <Name>Accessories</Name>
 
41
-    <OnlyUnallocated/>
 
42
     <Directory>Utility.directory</Directory>
 
43
     <Include>
 
44
       <And>
 
45
         <Category>Utility</Category>
 
46
-       <!-- Accessibility spec must have either the Utility or Settings
 
47
-            category, and we display an accessibility submenu already for
 
48
-            the ones that do not have Settings, so don't display accessibility
 
49
-            applications here -->
 
50
+       <!-- Accessibility spec must have either the Utility or Settings
 
51
+             category, and we display an accessibility submenu already for
 
52
+             the ones that do not have Settings, so don't display accessibility
 
53
+             applications here -->
 
54
         <Not><Category>Accessibility</Category></Not>
 
55
         <Not><Category>System</Category></Not>
 
56
-
 
57
-        <!-- Also exclude everything we put in the X-GNOME-Utilities
 
58
-             whitelist -->
 
59
-        <Not><Filename>file-roller.desktop</Filename></Not>
 
60
-        <Not><Filename>gnome-file-roller.desktop</Filename></Not>
 
61
-        <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
 
62
-        <Not><Filename>gcalctool.desktop</Filename></Not>
 
63
-        <Not><Filename>gucharmap.desktop</Filename></Not>
 
64
-        <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
 
65
-        <Not><Filename>gnome-font-viewer.desktop</Filename></Not>
 
66
-        <Not><Filename>seahorse.desktop</Filename></Not>
 
67
-        <Not><Filename>gnome-terminal.desktop</Filename></Not>
 
68
-        <Not><Filename>gnome-tweak-tool.desktop</Filename></Not>
 
69
-        <Not><Filename>gnome-disks.desktop</Filename></Not>
 
70
-        <Not><Filename>gnome-screenshot.desktop</Filename></Not>
 
71
-        <Not><Filename>gnome-yelp.desktop</Filename></Not>
 
72
-        <Not><Filename>yelp.desktop</Filename></Not>
 
73
-        <Not><Filename>gnome-control-center.desktop</Filename></Not>
 
74
+        <Not><Category>X-GNOME-Utilities</Category></Not>
 
75
       </And>
 
76
     </Include>
 
77
+    <Exclude>
 
78
+      <!-- Exclude everything we put in the X-GNOME-Utilities whitelist.
 
79
+
 
80
+           Please keep the list alphabetically sorted! -->
 
81
+      <Filename>deja-dup-preferences.desktop</Filename>
 
82
+      <Filename>eog.desktop</Filename>
 
83
+      <Filename>evince.desktop</Filename>
 
84
+      <Filename>file-roller.desktop</Filename>
 
85
+      <Filename>gcalctool.desktop</Filename>
 
86
+      <Filename>gnome-control-center.desktop</Filename>
 
87
+      <Filename>gnome-dictionary.desktop</Filename>
 
88
+      <Filename>gnome-disks.desktop</Filename>
 
89
+      <Filename>gnome-font-viewer.desktop</Filename>
 
90
+      <Filename>gnome-screenshot.desktop</Filename>
 
91
+      <Filename>gnome-terminal.desktop</Filename>
 
92
+      <Filename>gnome-tweak-tool.desktop</Filename>
 
93
+      <Filename>gucharmap.desktop</Filename>
 
94
+      <Filename>seahorse.desktop</Filename>
 
95
+      <Filename>vinagre.desktop</Filename>
 
96
+      <Filename>yelp.desktop</Filename>
 
97
+
 
98
+      <!-- Exclude Sundry items -->
 
99
+      <Filename>alacarte.desktop</Filename>
 
100
+    </Exclude>
 
101
   </Menu> <!-- End Accessories -->
 
102
 
 
103
 
 
104
   <!-- Accessibility submenu -->
 
105
   <Menu>
 
106
     <Name>Universal Access</Name>
 
107
-    <OnlyUnallocated/>
 
108
     <Directory>Utility-Accessibility.directory</Directory>
 
109
     <Include>
 
110
       <And>
 
111
@@ -65,12 +70,16 @@
 
112
         <Not><Category>Settings</Category></Not>
 
113
       </And>
 
114
     </Include>
 
115
+
 
116
+    <Exclude>
 
117
+      <!-- Sundry exclusions -->
 
118
+      <Filename>orca.desktop</Filename>
 
119
+    </Exclude>
 
120
   </Menu> <!-- End Accessibility -->
 
121
 
 
122
   <!-- Development Tools -->
 
123
   <Menu>
 
124
     <Name>Development</Name>
 
125
-    <OnlyUnallocated/>
 
126
     <Directory>Development.directory</Directory>
 
127
     <Include>
 
128
       <And>
 
129
@@ -78,6 +87,15 @@
 
130
       </And>
 
131
       <Filename>emacs.desktop</Filename>
 
132
     </Include>
 
133
+
 
134
+    <Exclude>
 
135
+      <!-- Sundry exclusions -->
 
136
+      <Filename>jhbuild.desktop</Filename>
 
137
+      <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
 
138
+      <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
 
139
+      <Filename>log4j-chainsaw.desktop</Filename>
 
140
+      <Filename>log4j-logfactor5.desktop</Filename>
 
141
+    </Exclude>
 
142
   </Menu> <!-- End Development Tools -->
 
143
 
 
144
   <!-- Education -->
 
145
@@ -217,7 +235,6 @@
 
146
   <!-- Graphics -->
 
147
   <Menu>
 
148
     <Name>Graphics</Name>
 
149
-    <OnlyUnallocated/>
 
150
     <Directory>Graphics.directory</Directory>
 
151
     <Include>
 
152
       <And>
 
153
@@ -232,15 +249,21 @@
 
154
   <!-- Internet -->
 
155
   <Menu>
 
156
     <Name>Internet</Name>
 
157
-    <OnlyUnallocated/>
 
158
     <Directory>Network.directory</Directory>
 
159
     <Include>
 
160
       <And>
 
161
         <Category>Network</Category>
 
162
        <Not><Category>X-GNOME-WebApplication</Category></Not>
 
163
-        <Not><Filename>vinagre.desktop</Filename></Not>
 
164
       </And>
 
165
     </Include>
 
166
+
 
167
+    <Exclude>
 
168
+      <!-- Utilities exclusions -->
 
169
+      <Filename>vinagre.desktop</Filename>
 
170
+
 
171
+      <!-- Sundry exclusions -->
 
172
+      <Filename>javaws.desktop</Filename>
 
173
+    </Exclude>
 
174
   </Menu>   <!-- End Internet -->
 
175
 
 
176
   <!-- Web Applications -->
 
177
@@ -258,7 +281,6 @@
 
178
   <!-- Multimedia -->
 
179
   <Menu>
 
180
     <Name>Multimedia</Name>
 
181
-    <OnlyUnallocated/>
 
182
     <Directory>AudioVideo.directory</Directory>
 
183
     <Include>
 
184
       <And>
 
185
@@ -270,7 +292,6 @@
 
186
   <!-- Office -->
 
187
   <Menu>
 
188
     <Name>Office</Name>
 
189
-    <OnlyUnallocated/>
 
190
     <Directory>Office.directory</Directory>
 
191
     <Include>
 
192
       <And>
 
193
@@ -287,20 +308,14 @@
 
194
     <Directory>X-GNOME-Sundry.directory</Directory>
 
195
     <Include>
 
196
       <Filename>alacarte.desktop</Filename>
 
197
-      <Filename>caribou.desktop</Filename>
 
198
+      <Filename>authconfig.desktop</Filename>
 
199
       <Filename>dconf-editor.desktop</Filename>
 
200
-      <Filename>fedora-im-chooser.desktop</Filename>
 
201
       <Filename>fedora-release-notes.desktop</Filename>
 
202
       <Filename>firewall-config.desktop</Filename>
 
203
       <Filename>flash-player-properties.desktop</Filename>
 
204
       <Filename>gconf-editor.desktop</Filename>
 
205
       <Filename>gnome-abrt.desktop</Filename>
 
206
-      <Filename>fedora-abrt.desktop</Filename>
 
207
-      <Filename>gnome-orca.desktop</Filename>
 
208
       <Filename>gnome-power-statistics.desktop</Filename>
 
209
-      <Filename>gnome-user-share-properties.desktop</Filename>
 
210
-      <Filename>ibus.desktop</Filename>
 
211
-      <Filename>ibus-daemon.desktop</Filename>
 
212
       <Filename>ibus-setup-anthy.desktop</Filename>
 
213
       <Filename>ibus-setup.desktop</Filename>
 
214
       <Filename>ibus-setup-hangul.desktop</Filename>
 
215
@@ -319,7 +334,6 @@
 
216
       <Filename>nm-connection-editor.desktop</Filename>
 
217
       <Filename>orca.desktop</Filename>
 
218
       <Filename>setroubleshoot.desktop</Filename>
 
219
-      <Filename>authconfig.desktop</Filename>
 
220
       <Filename>system-config-date.desktop</Filename>
 
221
       <Filename>system-config-firewall.desktop</Filename>
 
222
       <Filename>system-config-keyboard.desktop</Filename>
 
223
@@ -333,18 +347,31 @@
 
224
   <!-- System Tools-->
 
225
   <Menu>
 
226
     <Name>System</Name>
 
227
-    <OnlyUnallocated/>
 
228
     <Directory>System-Tools.directory</Directory>
 
229
     <Include>
 
230
       <And>
 
231
         <Category>System</Category>
 
232
         <Not><Category>Settings</Category></Not>
 
233
         <Not><Category>Game</Category></Not>
 
234
-        <Not><Filename>baobab.desktop</Filename></Not>
 
235
-        <Not><Filename>gnome-system-log.desktop</Filename></Not>
 
236
-        <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
 
237
+        <Not><Category>X-GNOME-Utilities</Category></Not>
 
238
       </And>
 
239
     </Include>
 
240
+
 
241
+    <Exclude>
 
242
+      <!-- Utilities exclusions -->
 
243
+      <Filename>baobab.desktop</Filename>
 
244
+      <Filename>gnome-system-log.desktop</Filename>
 
245
+      <Filename>gnome-system-monitor.desktop</Filename>
 
246
+
 
247
+      <!-- Sundry exclusions -->
 
248
+      <Filename>dconf-editor.desktop</Filename>
 
249
+      <Filename>fedora-release-notes.desktop</Filename>
 
250
+      <Filename>gconf-editor.desktop</Filename>
 
251
+      <Filename>gnome-abrt.desktop</Filename>
 
252
+      <Filename>gnome-power-statistics.desktop</Filename>
 
253
+      <Filename>dconf-editor.desktop</Filename>
 
254
+      <Filename>setroubleshoot.desktop</Filename>
 
255
+    </Exclude>
 
256
     <Menu>
 
257
       <Name>Preferences</Name>
 
258
       <Directory>Settings.directory</Directory>
 
259
@@ -473,26 +500,26 @@
 
260
     <Name>Utilities</Name>
 
261
     <Directory>X-GNOME-Utilities.directory</Directory>
 
262
     <Include>
 
263
+      <Category>X-GNOME-Utilities</Category>
 
264
+      <Filename>baobab.desktop</Filename>
 
265
+      <Filename>deja-dup-preferences.desktop</Filename>
 
266
+      <Filename>eog.desktop</Filename>
 
267
+      <Filename>evince.desktop</Filename>
 
268
       <Filename>file-roller.desktop</Filename>
 
269
       <Filename>gcalctool.desktop</Filename>
 
270
-      <Filename>gnome-font-viewer.desktop</Filename>
 
271
-      <Filename>gucharmap.desktop</Filename>
 
272
-      <Filename>seahorse.desktop</Filename>
 
273
-      <Filename>gnome-terminal.desktop</Filename>
 
274
-      <Filename>deja-dup-preferences.desktop</Filename>
 
275
+      <Filename>gnome-control-center.desktop</Filename>
 
276
       <Filename>gnome-dictionary.desktop</Filename>
 
277
-      <Filename>evince.desktop</Filename>
 
278
-      <Filename>eog.desktop</Filename>
 
279
-      <Filename>baobab.desktop</Filename>
 
280
+      <Filename>gnome-disks.desktop</Filename>
 
281
+      <Filename>gnome-font-viewer.desktop</Filename>
 
282
+      <Filename>gnome-screenshot.desktop</Filename>
 
283
       <Filename>gnome-system-log.desktop</Filename>
 
284
       <Filename>gnome-system-monitor.desktop</Filename>
 
285
-      <Filename>vinagre.desktop</Filename>
 
286
+      <Filename>gnome-terminal.desktop</Filename>
 
287
       <Filename>gnome-tweak-tool.desktop</Filename>
 
288
-      <Filename>gnome-disks.desktop</Filename>
 
289
-      <Filename>gnome-screenshot.desktop</Filename>
 
290
-      <Filename>gnome-yelp.desktop</Filename>
 
291
+      <Filename>gucharmap.desktop</Filename>
 
292
+      <Filename>seahorse.desktop</Filename>
 
293
+      <Filename>vinagre.desktop</Filename>
 
294
       <Filename>yelp.desktop</Filename>
 
295
-      <Filename>gnome-control-center.desktop</Filename>
 
296
     </Include>
 
297
   </Menu>
 
298