[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-menus/files: gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch - gentoo-commits

From:	"Joachim Bartosik (jbartosik)" <jbartosik@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-menus/files: gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch
Date:	Wed, 28 Aug 2013 18:44:55
Message-Id:	`20130828184448.EA9C42004C@flycatcher.gentoo.org`

1

jbartosik    13/08/28 18:44:48

2

3

  Added:               

4

                        gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch

5

  Log:

6

  Reduce number of entries in 'Other' menu for Gnome classic mode, close bug #481280 by Pacho Ramos

7

8

  (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key F35C79B9)

9

10

Revision  Changes    Path

11

1.1                  gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch

12

13

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch?rev=1.1&view=markup

14

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch?rev=1.1&content-type=text/plain

15

16

Index: gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch

17

===================================================================

18

From 6e7790b5451bbb8a44b736ed402964d1bb432247 Mon Sep 17 00:00:00 2001

19

From: Giovanni Campagna <gcampagn@××××××.com>

20

Date: Mon, 26 Aug 2013 15:59:18 +0200

21

Subject: [PATCH] layout: don't use OnlyUnallocated for sections different than

22

 Other

23

24

We used to have OnlyUnallocated on all non-folder sections, as

25

a quick way to enforce the whitelist, but that broke the Other

26

section.

27

Instead, we need a whitelist in the two folders, and a blacklist

28

in each category the application would normally be in (accessories

29

or system tools usually).

30

Ideally, apps in the Utilities category would expose the special

31

X-GNOME-Utilities desktop category, which we now recognize, but

32

the whitelist is kept to avoid patching all of them.

33

For the sundry category, ideally it should not be there at all.

34

35

In the process, a number of .desktop files were removed, as they're

36

not provided by any packages (checked jhbuild and Fedora 19). They

37

are:

38

* caribou

39

* fedora-im-chooser

40

* fedora-abrt

41

* gnome-orca

42

* gnome-user-share-properties

43

* ibus

44

* ibus-daemon

45

46

Distributions that are changing .desktop file names should take

47

care of patching gnome-menus appropriately.

48

49

https://bugzilla.gnome.org/show_bug.cgi?id=706763

50

---

51

 layout/gnome-applications.menu | 137 ++++++++++++++++++++++++-----------------

52

 1 file changed, 82 insertions(+), 55 deletions(-)

53

54

diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu

55

index 503f9ca..db56f71 100644

56

--- a/layout/gnome-applications.menu

57

+++ b/layout/gnome-applications.menu

58

@@ -21,44 +21,49 @@

59

   <!-- Accessories submenu -->

60

   <Menu>

61

     <Name>Accessories</Name>

62

-    <OnlyUnallocated/>

63

     <Directory>Utility.directory</Directory>

64

     <Include>

65

       <And>

66

         <Category>Utility</Category>

67

-       <!-- Accessibility spec must have either the Utility or Settings

68

-            category, and we display an accessibility submenu already for

69

-            the ones that do not have Settings, so don't display accessibility

70

-            applications here -->

71

+	<!-- Accessibility spec must have either the Utility or Settings

72

+             category, and we display an accessibility submenu already for

73

+             the ones that do not have Settings, so don't display accessibility

74

+             applications here -->

75

         <Not><Category>Accessibility</Category></Not>

76

         <Not><Category>System</Category></Not>

77

-

78

-        <!-- Also exclude everything we put in the X-GNOME-Utilities

79

-             whitelist -->

80

-        <Not><Filename>file-roller.desktop</Filename></Not>

81

-        <Not><Filename>gnome-file-roller.desktop</Filename></Not>

82

-        <Not><Filename>deja-dup-preferences.desktop</Filename></Not>

83

-        <Not><Filename>gcalctool.desktop</Filename></Not>

84

-        <Not><Filename>gucharmap.desktop</Filename></Not>

85

-        <Not><Filename>gnome-gucharmap.desktop</Filename></Not>

86

-        <Not><Filename>gnome-font-viewer.desktop</Filename></Not>

87

-        <Not><Filename>seahorse.desktop</Filename></Not>

88

-        <Not><Filename>gnome-terminal.desktop</Filename></Not>

89

-        <Not><Filename>gnome-tweak-tool.desktop</Filename></Not>

90

-        <Not><Filename>gnome-disks.desktop</Filename></Not>

91

-        <Not><Filename>gnome-screenshot.desktop</Filename></Not>

92

-        <Not><Filename>gnome-yelp.desktop</Filename></Not>

93

-        <Not><Filename>yelp.desktop</Filename></Not>

94

-        <Not><Filename>gnome-control-center.desktop</Filename></Not>

95

+        <Not><Category>X-GNOME-Utilities</Category></Not>

96

       </And>

97

     </Include>

98

+    <Exclude>

99

+      <!-- Exclude everything we put in the X-GNOME-Utilities whitelist.

100

+

101

+           Please keep the list alphabetically sorted! -->

102

+      <Filename>deja-dup-preferences.desktop</Filename>

103

+      <Filename>eog.desktop</Filename>

104

+      <Filename>evince.desktop</Filename>

105

+      <Filename>file-roller.desktop</Filename>

106

+      <Filename>gcalctool.desktop</Filename>

107

+      <Filename>gnome-control-center.desktop</Filename>

108

+      <Filename>gnome-dictionary.desktop</Filename>

109

+      <Filename>gnome-disks.desktop</Filename>

110

+      <Filename>gnome-font-viewer.desktop</Filename>

111

+      <Filename>gnome-screenshot.desktop</Filename>

112

+      <Filename>gnome-terminal.desktop</Filename>

113

+      <Filename>gnome-tweak-tool.desktop</Filename>

114

+      <Filename>gucharmap.desktop</Filename>

115

+      <Filename>seahorse.desktop</Filename>

116

+      <Filename>vinagre.desktop</Filename>

117

+      <Filename>yelp.desktop</Filename>

118

+

119

+      <!-- Exclude Sundry items -->

120

+      <Filename>alacarte.desktop</Filename>

121

+    </Exclude>

122

   </Menu> <!-- End Accessories -->

123

124

125

   <!-- Accessibility submenu -->

126

   <Menu>

127

     <Name>Universal Access</Name>

128

-    <OnlyUnallocated/>

129

     <Directory>Utility-Accessibility.directory</Directory>

130

     <Include>

131

       <And>

132

@@ -66,12 +71,16 @@

133

         <Not><Category>Settings</Category></Not>

134

       </And>

135

     </Include>

136

+

137

+    <Exclude>

138

+      <!-- Sundry exclusions -->

139

+      <Filename>orca.desktop</Filename>

140

+    </Exclude>

141

   </Menu> <!-- End Accessibility -->

142

143

   <!-- Development Tools -->

144

   <Menu>

145

     <Name>Development</Name>

146

-    <OnlyUnallocated/>

147

     <Directory>Development.directory</Directory>

148

     <Include>

149

       <And>

150

@@ -79,6 +88,15 @@

151

       </And>

152

       <Filename>emacs.desktop</Filename>

153

     </Include>

154

+

155

+    <Exclude>

156

+      <!-- Sundry exclusions -->

157

+      <Filename>jhbuild.desktop</Filename>

158

+      <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>

159

+      <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>

160

+      <Filename>log4j-chainsaw.desktop</Filename>

161

+      <Filename>log4j-logfactor5.desktop</Filename>

162

+    </Exclude>

163

   </Menu> <!-- End Development Tools -->

164

165

   <!-- Education -->

166

@@ -106,7 +124,6 @@

167

   <!-- Graphics -->

168

   <Menu>

169

     <Name>Graphics</Name>

170

-    <OnlyUnallocated/>

171

     <Directory>Graphics.directory</Directory>

172

     <Include>

173

       <And>

174

@@ -121,15 +138,21 @@

175

   <!-- Internet -->

176

   <Menu>

177

     <Name>Internet</Name>

178

-    <OnlyUnallocated/>

179

     <Directory>Network.directory</Directory>

180

     <Include>

181

       <And>

182

         <Category>Network</Category>

183

 	<Not><Category>X-GNOME-WebApplication</Category></Not>

184

-        <Not><Filename>vinagre.desktop</Filename></Not>

185

       </And>

186

     </Include>

187

+

188

+    <Exclude>

189

+      <!-- Utilities exclusions -->

190

+      <Filename>vinagre.desktop</Filename>

191

+

192

+      <!-- Sundry exclusions -->

193

+      <Filename>javaws.desktop</Filename>

194

+    </Exclude>

195

   </Menu>   <!-- End Internet -->

196

197

   <!-- Web Applications -->

198

@@ -147,7 +170,6 @@

199

   <!-- Multimedia -->

200

   <Menu>

201

     <Name>Multimedia</Name>

202

-    <OnlyUnallocated/>

203

     <Directory>AudioVideo.directory</Directory>

204

     <Include>

205

       <And>

206

@@ -159,7 +181,6 @@

207

   <!-- Office -->

208

   <Menu>

209

     <Name>Office</Name>

210

-    <OnlyUnallocated/>

211

     <Directory>Office.directory</Directory>

212

     <Include>

213

       <And>

214

@@ -176,20 +197,14 @@

215

     <Directory>X-GNOME-Sundry.directory</Directory>

216

     <Include>

217

       <Filename>alacarte.desktop</Filename>

218

-      <Filename>caribou.desktop</Filename>

219

+      <Filename>authconfig.desktop</Filename>

220

       <Filename>dconf-editor.desktop</Filename>

221

-      <Filename>fedora-im-chooser.desktop</Filename>

222

       <Filename>fedora-release-notes.desktop</Filename>

223

       <Filename>firewall-config.desktop</Filename>

224

       <Filename>flash-player-properties.desktop</Filename>

225

       <Filename>gconf-editor.desktop</Filename>

226

       <Filename>gnome-abrt.desktop</Filename>

227

-      <Filename>fedora-abrt.desktop</Filename>

228

-      <Filename>gnome-orca.desktop</Filename>

229

       <Filename>gnome-power-statistics.desktop</Filename>

230

-      <Filename>gnome-user-share-properties.desktop</Filename>

231

-      <Filename>ibus.desktop</Filename>

232

-      <Filename>ibus-daemon.desktop</Filename>

233

       <Filename>ibus-setup-anthy.desktop</Filename>

234

       <Filename>ibus-setup.desktop</Filename>

235

       <Filename>ibus-setup-hangul.desktop</Filename>

236

@@ -208,7 +223,6 @@

237

       <Filename>nm-connection-editor.desktop</Filename>

238

       <Filename>orca.desktop</Filename>

239

       <Filename>setroubleshoot.desktop</Filename>

240

-      <Filename>authconfig.desktop</Filename>

241

       <Filename>system-config-date.desktop</Filename>

242

       <Filename>system-config-firewall.desktop</Filename>

243

       <Filename>system-config-keyboard.desktop</Filename>

244

@@ -222,17 +236,30 @@

245

   <!-- System Tools-->

246

   <Menu>

247

     <Name>System</Name>

248

-    <OnlyUnallocated/>

249

     <Directory>System-Tools.directory</Directory>

250

     <Include>

251

       <And>

252

         <Category>System</Category>

253

         <Not><Category>Settings</Category></Not>

254

-        <Not><Filename>baobab.desktop</Filename></Not>

255

-        <Not><Filename>gnome-system-log.desktop</Filename></Not>

256

-        <Not><Filename>gnome-system-monitor.desktop</Filename></Not>

257

+        <Not><Category>X-GNOME-Utilities</Category></Not>

258

       </And>

259

     </Include>

260

+

261

+    <Exclude>

262

+      <!-- Utilities exclusions -->

263

+      <Filename>baobab.desktop</Filename>

264

+      <Filename>gnome-system-log.desktop</Filename>

265

+      <Filename>gnome-system-monitor.desktop</Filename>

266

+

267

+      <!-- Sundry exclusions -->

268

+      <Filename>dconf-editor.desktop</Filename>

269

+      <Filename>fedora-release-notes.desktop</Filename>

270

+      <Filename>gconf-editor.desktop</Filename>

271

+      <Filename>gnome-abrt.desktop</Filename>

272

+      <Filename>gnome-power-statistics.desktop</Filename>

273

+      <Filename>dconf-editor.desktop</Filename>

274

+      <Filename>setroubleshoot.desktop</Filename>

275

+    </Exclude>

276

   </Menu>   <!-- End System Tools -->

277

278

   <!-- System Settings -->

279

@@ -249,26 +276,26 @@

280

     <Name>Utilities</Name>

281

     <Directory>X-GNOME-Utilities.directory</Directory>

282

     <Include>

283

+      <Category>X-GNOME-Utilities</Category>

284

+      <Filename>baobab.desktop</Filename>

285

+      <Filename>deja-dup-preferences.desktop</Filename>

286

+      <Filename>eog.desktop</Filename>

287

+      <Filename>evince.desktop</Filename>

288

       <Filename>file-roller.desktop</Filename>

289

       <Filename>gcalctool.desktop</Filename>

290

-      <Filename>gnome-font-viewer.desktop</Filename>

291

-      <Filename>gucharmap.desktop</Filename>

292

-      <Filename>seahorse.desktop</Filename>

293

-      <Filename>gnome-terminal.desktop</Filename>

294

-      <Filename>deja-dup-preferences.desktop</Filename>

295

+      <Filename>gnome-control-center.desktop</Filename>

296

       <Filename>gnome-dictionary.desktop</Filename>

297

-      <Filename>evince.desktop</Filename>

298

-      <Filename>eog.desktop</Filename>

299

-      <Filename>baobab.desktop</Filename>

300

+      <Filename>gnome-disks.desktop</Filename>

301

+      <Filename>gnome-font-viewer.desktop</Filename>

302

+      <Filename>gnome-screenshot.desktop</Filename>

303

       <Filename>gnome-system-log.desktop</Filename>

304

       <Filename>gnome-system-monitor.desktop</Filename>

305

-      <Filename>vinagre.desktop</Filename>

306

+      <Filename>gnome-terminal.desktop</Filename>

307

       <Filename>gnome-tweak-tool.desktop</Filename>

308

-      <Filename>gnome-disks.desktop</Filename>

309

-      <Filename>gnome-screenshot.desktop</Filename>

310

-      <Filename>gnome-yelp.desktop</Filename>

311

+      <Filename>gucharmap.desktop</Filename>

312

+      <Filename>seahorse.desktop</Filename>

313

+      <Filename>vinagre.desktop</Filename>

314

       <Filename>yelp.desktop</Filename>

315

-      <Filename>gnome-control-center.desktop</Filename>

316

     </Include>

317

   </Menu>

318

319

--

320

1.8.3.1

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

Gentoo Archives: gentoo-commits