Codebase list cinnamon-menus / fd6ae83
Remove all patches, they are not necessary Margarita Manterola 10 years ago
13 changed file(s) with 0 addition(s) and 780 deletion(s). Raw diff Collapse all Expand all
+0
-45
debian/patches/01_default_prefix.patch less more
0 --- a/libmenu/gmenu-tree.c
1 +++ b/libmenu/gmenu-tree.c
2 @@ -391,6 +391,16 @@
3 }
4 }
5
6 +static char *
7 +prefix_menu_name (const char *orig_name)
8 +{
9 + char *prefix;
10 + prefix = g_getenv ("XDG_MENU_PREFIX");
11 + if (prefix == NULL)
12 + prefix = "gnome-";
13 + return g_strconcat (prefix, orig_name, NULL);
14 +}
15 +
16 static gboolean
17 gmenu_tree_canonicalize_path (GMenuTree *tree,
18 GError **error)
19 @@ -416,6 +426,9 @@
20 menu_file = tree->basename;
21 xdg_menu_prefix = g_getenv ("XDG_MENU_PREFIX");
22
23 + if (xdg_menu_prefix == NULL)
24 + xdg_menu_prefix = "gnome-";
25 +
26 if (xdg_menu_prefix != NULL)
27 {
28 gchar *prefixed_basename;
29 @@ -2077,13 +2090,10 @@
30 found = FALSE;
31 menu_file = g_strconcat (menu_name, ".menu", NULL);
32
33 - if (strcmp (menu_file, "applications.menu") == 0 &&
34 - g_getenv ("XDG_MENU_PREFIX"))
35 + if (strcmp (menu_file, "applications.menu") == 0)
36 {
37 char *prefixed_basename;
38 - prefixed_basename = g_strdup_printf ("%s%s",
39 - g_getenv ("XDG_MENU_PREFIX"),
40 - menu_file);
41 + prefixed_basename = prefix_menu_name (menu_file);
42 found = load_parent_merge_file_from_basename (tree, loaded_menu_files,
43 layout, prefixed_basename,
44 canonical_basedir);
+0
-13
debian/patches/02_kill_debian_menu.patch less more
0 Index: gnome-menus-3.4.2/libmenu/desktop-entries.c
1 ===================================================================
2 --- gnome-menus-3.4.2.orig/libmenu/desktop-entries.c 2011-10-24 13:48:12.000000000 +0200
3 +++ gnome-menus-3.4.2/libmenu/desktop-entries.c 2013-01-02 21:11:23.617525227 +0100
4 @@ -250,6 +250,8 @@ desktop_entry_load_directory (DesktopEnt
5 static gboolean
6 desktop_entry_load (DesktopEntry *entry)
7 {
8 + if (strstr (entry->path, "/menu-xdg/"))
9 + return FALSE;
10 if (entry->type == DESKTOP_ENTRY_DESKTOP)
11 {
12 DesktopEntryDesktop *entry_desktop = (DesktopEntryDesktop*)entry;
+0
-10
debian/patches/03_kde-legacydirs.patch less more
0 --- a/layout/gnome-applications.menu
1 +++ b/layout/gnome-applications.menu
2 @@ -7,7 +7,6 @@
3 <Directory>X-GNOME-Menu-Applications.directory</Directory>
4
5 <!-- Scan legacy dirs first, as later items take priority -->
6 - <KDELegacyDirs/>
7 <LegacyDir>/etc/X11/applnk</LegacyDir>
8 <LegacyDir>/usr/share/gnome/apps</LegacyDir>
9
+0
-123
debian/patches/08_settings-menus.patch less more
0 Index: gnome-menus-3.8.0/layout/gnome-applications.menu
1 ===================================================================
2 --- gnome-menus-3.8.0.orig/layout/gnome-applications.menu 2013-06-14 15:48:17.509604188 -0400
3 +++ gnome-menus-3.8.0/layout/gnome-applications.menu 2013-06-14 15:57:09.689581931 -0400
4 @@ -233,6 +233,118 @@
5 <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
6 </And>
7 </Include>
8 + <Menu>
9 + <Name>Preferences</Name>
10 + <Directory>Settings.directory</Directory>
11 + <Include>
12 + <And>
13 + <Category>Settings</Category>
14 + <Not>
15 + <Or>
16 + <Category>System</Category>
17 + <Category>X-GNOME-Settings-Panel</Category>
18 + <Filename>alacarte.desktop</Filename>
19 + <Filename>caribou.desktop</Filename>
20 + <Filename>dconf-editor.desktop</Filename>
21 + <Filename>fedora-im-chooser.desktop</Filename>
22 + <Filename>fedora-release-notes.desktop</Filename>
23 + <Filename>firewall-config.desktop</Filename>
24 + <Filename>flash-player-properties.desktop</Filename>
25 + <Filename>gconf-editor.desktop</Filename>
26 + <Filename>gnome-abrt.desktop</Filename>
27 + <Filename>fedora-abrt.desktop</Filename>
28 + <Filename>gnome-orca.desktop</Filename>
29 + <Filename>gnome-power-statistics.desktop</Filename>
30 + <Filename>gnome-user-share-properties.desktop</Filename>
31 + <Filename>ibus.desktop</Filename>
32 + <Filename>ibus-daemon.desktop</Filename>
33 + <Filename>ibus-setup-anthy.desktop</Filename>
34 + <Filename>ibus-setup.desktop</Filename>
35 + <Filename>ibus-setup-hangul.desktop</Filename>
36 + <Filename>ibus-setup-libbopomofo.desktop</Filename>
37 + <Filename>ibus-setup-libpinyin.desktop</Filename>
38 + <Filename>ibus-setup-m17n.desktop</Filename>
39 + <Filename>ibus-setup-typing-booster.desktop</Filename>
40 + <Filename>im-chooser.desktop</Filename>
41 + <Filename>itweb-settings.desktop</Filename>
42 + <Filename>jhbuild.desktop</Filename>
43 + <Filename>javaws.desktop</Filename>
44 + <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
45 + <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
46 + <Filename>log4j-chainsaw.desktop</Filename>
47 + <Filename>log4j-logfactor5.desktop</Filename>
48 + <Filename>nm-connection-editor.desktop</Filename>
49 + <Filename>orca.desktop</Filename>
50 + <Filename>setroubleshoot.desktop</Filename>
51 + <Filename>authconfig.desktop</Filename>
52 + <Filename>system-config-date.desktop</Filename>
53 + <Filename>system-config-firewall.desktop</Filename>
54 + <Filename>system-config-keyboard.desktop</Filename>
55 + <Filename>system-config-language.desktop</Filename>
56 + <Filename>system-config-printer.desktop</Filename>
57 + <Filename>system-config-users.desktop</Filename>
58 + <Filename>vino-preferences.desktop</Filename>
59 + </Or>
60 + </Not>
61 + </And>
62 + </Include>
63 + </Menu>
64 + <Menu>
65 + <Name>Administration</Name>
66 + <Directory>Settings-System.directory</Directory>
67 + <Include>
68 + <And>
69 + <Category>Settings</Category>
70 + <Category>System</Category>
71 + <Not>
72 + <Or>
73 + <Category>X-GNOME-Settings-Panel</Category>
74 + <Filename>alacarte.desktop</Filename>
75 + <Filename>caribou.desktop</Filename>
76 + <Filename>dconf-editor.desktop</Filename>
77 + <Filename>fedora-im-chooser.desktop</Filename>
78 + <Filename>fedora-release-notes.desktop</Filename>
79 + <Filename>firewall-config.desktop</Filename>
80 + <Filename>flash-player-properties.desktop</Filename>
81 + <Filename>gconf-editor.desktop</Filename>
82 + <Filename>gnome-abrt.desktop</Filename>
83 + <Filename>fedora-abrt.desktop</Filename>
84 + <Filename>gnome-orca.desktop</Filename>
85 + <Filename>gnome-power-statistics.desktop</Filename>
86 + <Filename>gnome-user-share-properties.desktop</Filename>
87 + <Filename>ibus.desktop</Filename>
88 + <Filename>ibus-daemon.desktop</Filename>
89 + <Filename>ibus-setup-anthy.desktop</Filename>
90 + <Filename>ibus-setup.desktop</Filename>
91 + <Filename>ibus-setup-hangul.desktop</Filename>
92 + <Filename>ibus-setup-libbopomofo.desktop</Filename>
93 + <Filename>ibus-setup-libpinyin.desktop</Filename>
94 + <Filename>ibus-setup-m17n.desktop</Filename>
95 + <Filename>ibus-setup-typing-booster.desktop</Filename>
96 + <Filename>im-chooser.desktop</Filename>
97 + <Filename>itweb-settings.desktop</Filename>
98 + <Filename>jhbuild.desktop</Filename>
99 + <Filename>javaws.desktop</Filename>
100 + <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
101 + <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
102 + <Filename>log4j-chainsaw.desktop</Filename>
103 + <Filename>log4j-logfactor5.desktop</Filename>
104 + <Filename>nm-connection-editor.desktop</Filename>
105 + <Filename>orca.desktop</Filename>
106 + <Filename>setroubleshoot.desktop</Filename>
107 + <Filename>authconfig.desktop</Filename>
108 + <Filename>system-config-date.desktop</Filename>
109 + <Filename>system-config-firewall.desktop</Filename>
110 + <Filename>system-config-keyboard.desktop</Filename>
111 + <Filename>system-config-language.desktop</Filename>
112 + <Filename>system-config-printer.desktop</Filename>
113 + <Filename>system-config-users.desktop</Filename>
114 + <Filename>vino-preferences.desktop</Filename>
115 + </Or>
116 + </Not>
117 + </And>
118 + </Include>
119 + </Menu>
120 </Menu> <!-- End System Tools -->
121
122 <!-- System Settings -->
+0
-23
debian/patches/09_app_install_entry.patch less more
0 Description: Include Software Center in menus
1
2 Index: gnome-menus-3.8.0/layout/gnome-applications.menu
3 ===================================================================
4 --- gnome-menus-3.8.0.orig/layout/gnome-applications.menu 2013-06-04 18:22:04.293014377 -0400
5 +++ gnome-menus-3.8.0/layout/gnome-applications.menu 2013-06-04 18:22:04.293014377 -0400
6 @@ -325,4 +325,16 @@
7 <Merge type="files" />
8 </Layout>
9
10 +<Include>
11 + <Filename>ubuntu-software-center.desktop</Filename>
12 +</Include>
13 +
14 +<!-- Separator between menus and gnome-app-install -->
15 +<Layout>
16 + <Merge type="menus"/>
17 + <Merge type="files"/>
18 + <Separator/>
19 + <Filename>ubuntu-software-center.desktop</Filename>
20 +</Layout>
21 +
22 </Menu> <!-- End Applications -->
+0
-120
debian/patches/09_games-menu.patch less more
0 --- a/layout/gnome-applications.menu
1 +++ b/layout/gnome-applications.menu
2 @@ -99,8 +99,107 @@
3 <Include>
4 <And>
5 <Category>Game</Category>
6 - </And>
7 - </Include>
8 + <Not><Category>ActionGame</Category></Not>
9 + <Not><Category>AdventureGame</Category></Not>
10 + <Not><Category>ArcadeGame</Category></Not>
11 + <Not><Category>BoardGame</Category></Not>
12 + <Not><Category>BlocksGame</Category></Not>
13 + <Not><Category>CardGame</Category></Not>
14 + <Not><Category>KidsGame</Category></Not>
15 + <Not><Category>LogicGame</Category></Not>
16 + <Not><Category>Simulation</Category></Not>
17 + <Not><Category>SportsGame</Category></Not>
18 + <Not><Category>StrategyGame</Category></Not>
19 + </And>
20 + </Include>
21 + <DefaultLayout inline="true" inline_limit="6" inline_header="false">
22 + <Merge type="menus"/>
23 + <Merge type="files"/>
24 + </DefaultLayout>
25 + <Menu>
26 + <Name>Action</Name>
27 + <Directory>ActionGames.directory</Directory>
28 + <Include>
29 + <Category>ActionGame</Category>
30 + </Include>
31 + </Menu>
32 + <Menu>
33 + <Name>Adventure</Name>
34 + <Directory>AdventureGames.directory</Directory>
35 + <Include>
36 + <Category>AdventureGame</Category>
37 + </Include>
38 + </Menu>
39 + <Menu>
40 + <Name>Arcade</Name>
41 + <Directory>ArcadeGames.directory</Directory>
42 + <Include>
43 + <Category>ArcadeGame</Category>
44 + </Include>
45 + </Menu>
46 + <Menu>
47 + <Name>Board</Name>
48 + <Directory>BoardGames.directory</Directory>
49 + <Include>
50 + <Category>BoardGame</Category>
51 + </Include>
52 + </Menu>
53 + <Menu>
54 + <Name>Blocks</Name>
55 + <Directory>BlocksGames.directory</Directory>
56 + <Include>
57 + <Category>BlocksGame</Category>
58 + </Include>
59 + </Menu>
60 + <Menu>
61 + <Name>Cards</Name>
62 + <Directory>CardGames.directory</Directory>
63 + <Include>
64 + <Category>CardGame</Category>
65 + </Include>
66 + </Menu>
67 + <Menu>
68 + <Name>Kids</Name>
69 + <Directory>KidsGames.directory</Directory>
70 + <Include>
71 + <Category>KidsGame</Category>
72 + </Include>
73 + </Menu>
74 + <Menu>
75 + <Name>Logic</Name>
76 + <Directory>LogicGames.directory</Directory>
77 + <Include>
78 + <Category>LogicGame</Category>
79 + </Include>
80 + </Menu>
81 + <Menu>
82 + <Name>Role Playing</Name>
83 + <Directory>RolePlayingGames.directory</Directory>
84 + <Include>
85 + <Category>RolePlaying</Category>
86 + </Include>
87 + </Menu>
88 + <Menu>
89 + <Name>Simulation</Name>
90 + <Directory>SimulationGames.directory</Directory>
91 + <Include>
92 + <Category>Simulation</Category>
93 + </Include>
94 + </Menu>
95 + <Menu>
96 + <Name>Sports</Name>
97 + <Directory>SportsGames.directory</Directory>
98 + <Include>
99 + <Category>SportsGame</Category>
100 + </Include>
101 + </Menu>
102 + <Menu>
103 + <Name>Strategy</Name>
104 + <Directory>StrategyGames.directory</Directory>
105 + <Include>
106 + <Category>StrategyGame</Category>
107 + </Include>
108 + </Menu>
109 </Menu> <!-- End Games -->
110
111 <!-- Graphics -->
112 @@ -223,6 +322,7 @@
113 <And>
114 <Category>System</Category>
115 <Not><Category>Settings</Category></Not>
116 + <Not><Category>Game</Category></Not>
117 <Not><Filename>baobab.desktop</Filename></Not>
118 <Not><Filename>gnome-system-log.desktop</Filename></Not>
119 <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
+0
-43
debian/patches/11_science-menu.patch less more
0 --- a/layout/gnome-applications.menu
1 +++ b/layout/gnome-applications.menu
2 @@ -88,10 +88,23 @@
3 <Include>
4 <And>
5 <Category>Education</Category>
6 + <Not><Category>Science</Category></Not>
7 </And>
8 </Include>
9 </Menu> <!-- End Education -->
10
11 + <!-- Science -->
12 + <Menu>
13 + <Name>Science</Name>
14 + <Directory>GnomeScience.directory</Directory>
15 + <Include>
16 + <And>
17 + <Category>Education</Category>
18 + <Category>Science</Category>
19 + </And>
20 + </Include>
21 + </Menu> <!-- End Science -->
22 +
23 <!-- Games -->
24 <Menu>
25 <Name>Games</Name>
26 --- a/desktop-directories/Education.directory.in
27 +++ b/desktop-directories/Education.directory.in
28 @@ -1,4 +1,4 @@
29 [Desktop Entry]
30 _Name=Education
31 -Icon=applications-science
32 +Icon=applications-accessories
33 Type=Directory
34 --- a/desktop-directories/Utility.directory.in
35 +++ b/desktop-directories/Utility.directory.in
36 @@ -1,5 +1,5 @@
37 [Desktop Entry]
38 _Name=Accessories
39 _Comment=Desktop accessories
40 -Icon=applications-accessories
41 +Icon=applications-utilities
42 Type=Directory
+0
-218
debian/patches/20_show-admin-tools-for-admin-group.patch less more
0 --- gnome-menus-2.19.6.orig/libmenu/desktop-entries.c 2007-07-30 22:06:51.000000000 +0200
1 +++ gnome-menus-2.19.6/libmenu/desktop-entries.c 2007-08-03 11:38:29.000000000 +0200
2 @@ -24,6 +24,7 @@
3 #include <string.h>
4
5 #include "menu-util.h"
6 +#include "user-is-sudoer.h"
7
8 #define DESKTOP_ENTRY_GROUP "Desktop Entry"
9 #define KDE_DESKTOP_ENTRY_GROUP "KDE Desktop Entry"
10 @@ -33,7 +34,8 @@
11 DESKTOP_ENTRY_NO_DISPLAY = 1 << 0,
12 DESKTOP_ENTRY_HIDDEN = 1 << 1,
13 DESKTOP_ENTRY_SHOW_IN_GNOME = 1 << 2,
14 - DESKTOP_ENTRY_TRYEXEC_FAILED = 1 << 3
15 + DESKTOP_ENTRY_TRYEXEC_FAILED = 1 << 3,
16 + DESKTOP_ENTRY_ROOT_REQUIRED = 1 << 4
17 };
18
19 struct DesktopEntry
20 @@ -50,7 +52,7 @@
21 gboolean terminal;
22
23 guint type : 2;
24 - guint flags : 4;
25 + guint flags : 5;
26 guint refcount : 24;
27 };
28
29 @@ -75,9 +77,20 @@
30 gboolean hidden;
31 gboolean show_in_gnome;
32 gboolean tryexec_failed;
33 + gboolean root_required_flag;
34 char *tryexec;
35 guint flags;
36 int i;
37 +
38 + static gboolean sudoer_flag_set = FALSE;
39 + static gboolean sudoer_flag = TRUE;
40 +
41 + /* If we don't know yet whether the user is sudoer or not, let's see */
42 + if (!sudoer_flag_set)
43 + {
44 + sudoer_flag = user_is_sudoer ();
45 + sudoer_flag_set = TRUE;
46 + }
47
48 error = NULL;
49 no_display = g_key_file_get_boolean (key_file,
50 @@ -157,6 +170,47 @@
51 g_free (tryexec);
52 }
53
54 + error = NULL;
55 + root_required_flag = g_key_file_get_boolean (key_file,
56 + desktop_entry_group,
57 + "X-KDE-SubstituteUID",
58 + &error);
59 +
60 + if (error)
61 + {
62 + root_required_flag = FALSE;
63 + g_error_free (error);
64 + }
65 + else {
66 + if (root_required_flag) {
67 + char *username = NULL;
68 + username = g_key_file_get_value (key_file,
69 + desktop_entry_group,
70 + "X-KDE-Username",
71 + NULL);
72 +
73 + if (!username || (username && !strcmp (username, "root")))
74 + root_required_flag = TRUE;
75 + else
76 + root_required_flag = FALSE;
77 + g_free (username);
78 + }
79 + else
80 + root_required_flag = FALSE;
81 + }
82 +
83 + /*
84 + * If the desktop entry has the field and indeed requires root
85 + * privilege and the user isn't sudoer, then the entry needs to be
86 + * hidden.
87 + */
88 +
89 + if (root_required_flag
90 + && (!sudoer_flag))
91 + {
92 + no_display = TRUE;
93 + }
94 +
95 flags = 0;
96 if (no_display)
97 flags |= DESKTOP_ENTRY_NO_DISPLAY;
98 @@ -166,6 +220,8 @@
99 flags |= DESKTOP_ENTRY_SHOW_IN_GNOME;
100 if (tryexec_failed)
101 flags |= DESKTOP_ENTRY_TRYEXEC_FAILED;
102 + if (root_required_flag)
103 + flags |= DESKTOP_ENTRY_ROOT_REQUIRED;
104
105 return flags;
106 }
107 @@ -297,13 +353,14 @@
108
109 #undef GET_LOCALE_STRING
110
111 - menu_verbose ("Desktop entry \"%s\" (%s, %s, %s) flags: NoDisplay=%s, Hidden=%s, ShowInGNOME=%s, TryExecFailed=%s\n",
112 + menu_verbose ("Desktop entry \"%s\" (%s, %s, %s) flags: NoDisplay=%s, Hidden=%s, RootRequired: %s, ShowInGNOME=%s, TryExecFailed=%s\n",
113 retval->basename,
114 retval->name,
115 retval->comment ? retval->comment : "(null)",
116 retval->icon ? retval->icon : "(null)",
117 retval->flags & DESKTOP_ENTRY_NO_DISPLAY ? "(true)" : "(false)",
118 retval->flags & DESKTOP_ENTRY_HIDDEN ? "(true)" : "(false)",
119 + retval->flags & DESKTOP_ENTRY_ROOT_REQUIRED ? "(true)" : "(false)",
120 retval->flags & DESKTOP_ENTRY_SHOW_IN_GNOME ? "(true)" : "(false)",
121 retval->flags & DESKTOP_ENTRY_TRYEXEC_FAILED ? "(true)" : "(false)");
122
123 --- gnome-menus-2.19.6.orig/libmenu/Makefile.am 2007-08-03 11:38:07.000000000 +0200
124 +++ gnome-menus-2.19.6/libmenu/Makefile.am 2007-08-03 11:38:29.000000000 +0200
125 @@ -35,6 +35,8 @@
126 menu-monitor-backend.h \
127 menu-util.c \
128 menu-util.h \
129 + user-is-sudoer.c \
130 + user-is-sudoer.h \
131 $(MONITOR_BACKEND_SOURCES) \
132 $(NULL)
133
134 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
135 +++ gnome-menus-2.19.6/libmenu/user-is-sudoer.c 2007-08-03 11:38:29.000000000 +0200
136 @@ -0,0 +1,58 @@
137 +/*
138 + * user-is-sudoer.c:
139 + *
140 + * Copyright (C) 2005 Manu Cornet
141 + *
142 + * This program is free software; you can redistribute it and/or
143 + * modify it under the terms of the GNU General Public License as
144 + * published by the Free Software Foundation; either version 2 of the
145 + * License, or (at your option) any later version.
146 + *
147 + * This program is distributed in the hope that it will be useful, but
148 + * WITHOUT ANY WARRANTY; without even the implied warranty of
149 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
150 + * General Public License for more details.
151 + *
152 + * You should have received a copy of the GNU General Public License
153 + * along with this program; if not, write to the Free Software
154 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
155 + * 02111-1307, USA.
156 + *
157 + * Authors:
158 + * Manu Cornet <manu@manucornet.net>
159 + */
160 +
161 +#include <glib.h>
162 +#include <string.h>
163 +#include <unistd.h>
164 +#include <sys/types.h>
165 +#include <grp.h>
166 +#include "user-is-sudoer.h"
167 +
168 +#define ADMIN_GROUP_NAME "admin"
169 +
170 +gboolean
171 +user_is_sudoer (void)
172 +{
173 + const gchar *user_name;
174 + int i = 0;
175 + struct group *group;
176 +
177 + if (getuid() == 0 || g_getenv ("USER_IS_ADMIN"))
178 + return TRUE;
179 +
180 + group = getgrnam (ADMIN_GROUP_NAME);
181 +
182 + if (!group)
183 + return TRUE;
184 + else {
185 + user_name = g_get_user_name ();
186 +
187 + while (group->gr_mem[i]) {
188 + if (!strcmp (user_name, group->gr_mem[i++]))
189 + return TRUE;
190 + }
191 + }
192 +
193 + return FALSE;
194 +}
195 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
196 +++ gnome-menus-2.19.6/libmenu/user-is-sudoer.h 2007-08-03 11:38:29.000000000 +0200
197 @@ -0,0 +1,20 @@
198 +/*
199 + * This library is free software; you can redistribute it and/or
200 + * modify it under the terms of the GNU Lesser General Public
201 + * License as published by the Free Software Foundation; either
202 + * version 2 of the License, or (at your option) any later version.
203 + *
204 + * This library is distributed in the hope that it will be useful,
205 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
206 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
207 + * Lesser General Public License for more details.
208 + *
209 + * You should have received a copy of the GNU Lesser General Public
210 + * License along with this library; if not, write to the
211 + * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
212 + * Boston, MA 02111-1307, USA.
213 + */
214 +
215 +#include <glib.h>
216 +
217 +gboolean user_is_sudoer (void);
+0
-9
debian/patches/50_add-gcc-apps.patch less more
0 Index: gnome-menus-3.7.90/desktop-directories/X-GNOME-SystemSettings.directory.in
1 ===================================================================
2 --- gnome-menus-3.7.90.orig/desktop-directories/X-GNOME-SystemSettings.directory.in 2013-02-15 20:48:56.000000000 -0500
3 +++ gnome-menus-3.7.90/desktop-directories/X-GNOME-SystemSettings.directory.in 2013-03-03 01:12:40.241503804 -0500
4 @@ -2,4 +2,3 @@
5 Name=System Settings
6 Icon=gnome-settings
7 Type=Directory
8 -NoDisplay=true
+0
-24
debian/patches/70_ubuntu-directories.patch less more
0 Index: gnome-menus-3.7.90/po/POTFILES.in
1 ===================================================================
2 --- gnome-menus-3.7.90.orig/po/POTFILES.in 2013-02-19 18:39:14.000000000 -0500
3 +++ gnome-menus-3.7.90/po/POTFILES.in 2013-03-03 00:59:16.629486723 -0500
4 @@ -15,3 +15,19 @@
5 desktop-directories/X-GNOME-Sundry.directory.in
6 desktop-directories/X-GNOME-Utilities.directory.in
7 desktop-directories/X-GNOME-WebApplications.directory.in
8 +debian/desktop-files/ActionGames.directory.in
9 +debian/desktop-files/AdventureGames.directory.in
10 +debian/desktop-files/ArcadeGames.directory.in
11 +debian/desktop-files/BlocksGames.directory.in
12 +debian/desktop-files/BoardGames.directory.in
13 +debian/desktop-files/CardGames.directory.in
14 +debian/desktop-files/Debian.directory.in
15 +debian/desktop-files/GnomeScience.directory.in
16 +debian/desktop-files/KidsGames.directory.in
17 +debian/desktop-files/LogicGames.directory.in
18 +debian/desktop-files/RolePlayingGames.directory.in
19 +debian/desktop-files/Settings-System.directory.in
20 +debian/desktop-files/Settings.directory.in
21 +debian/desktop-files/SimulationGames.directory.in
22 +debian/desktop-files/SportsGames.directory.in
23 +debian/desktop-files/StrategyGames.directory.in
+0
-40
debian/patches/git_restore_calculator.patch less more
0 From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
1 From: Kalev Lember <kalevlember@gmail.com>
2 Date: Thu, 28 Mar 2013 21:54:34 +0000
3 Subject: Adapt for gnome-calculator -> gcalctool desktop file rename
4
5 gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
6 very last minute before the 3.8.0 release.
7
8 https://bugzilla.gnome.org/show_bug.cgi?id=696816
9 ---
10 diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
11 index 84d13ed..503f9ca 100644
12 --- a/layout/gnome-applications.menu
13 +++ b/layout/gnome-applications.menu
14 @@ -38,7 +38,6 @@
15 <Not><Filename>file-roller.desktop</Filename></Not>
16 <Not><Filename>gnome-file-roller.desktop</Filename></Not>
17 <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
18 - <Not><Filename>gnome-calculator.desktop</Filename></Not>
19 <Not><Filename>gcalctool.desktop</Filename></Not>
20 <Not><Filename>gucharmap.desktop</Filename></Not>
21 <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
22 @@ -251,7 +250,7 @@
23 <Directory>X-GNOME-Utilities.directory</Directory>
24 <Include>
25 <Filename>file-roller.desktop</Filename>
26 - <Filename>gnome-calculator.desktop</Filename>
27 + <Filename>gcalctool.desktop</Filename>
28 <Filename>gnome-font-viewer.desktop</Filename>
29 <Filename>gucharmap.desktop</Filename>
30 <Filename>seahorse.desktop</Filename>
31 @@ -287,7 +286,6 @@
32 <Not><Filename>gnome-eog.desktop</Filename></Not>
33 <Not><Filename>gnome-file-roller.desktop</Filename></Not>
34 <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
35 - <Not><Filename>gcalctool.desktop</Filename></Not>
36 </And>
37 </Include>
38 </Menu> <!-- End Other -->
39
+0
-11
debian/patches/series less more
0 #01_default_prefix.patch
1 #02_kill_debian_menu.patch
2 #03_kde-legacydirs.patch
3 #08_settings-menus.patch
4 #09_app_install_entry.patch
5 #09_games-menu.patch
6 #11_science-menu.patch
7 #50_add-gcc-apps.patch
8 #70_ubuntu-directories.patch
9 #git_restore_calculator.patch
10 #ubuntu_gcc_translations.patch
+0
-101
debian/patches/ubuntu_gcc_translations.patch less more
0 # Description: revert dropping of gnome-control-center categories, they got
1 # deprecated in g-c-c 3.8 but we are still using 3.6. We can drop those
2 # changes once we do the update.
3 # Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-menus/+bug/1232534
4 Index: gnome-menus-3.8.0/desktop-directories/Hardware.directory.in
5 ===================================================================
6 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
7 +++ gnome-menus-3.8.0/desktop-directories/Hardware.directory.in 2013-10-09 15:21:15.269679845 +0200
8 @@ -0,0 +1,5 @@
9 +[Desktop Entry]
10 +_Name=Hardware
11 +_Comment=Settings for several hardware devices
12 +Icon=preferences-desktop-peripherals
13 +Type=Directory
14 Index: gnome-menus-3.8.0/desktop-directories/Makefile.am
15 ===================================================================
16 --- gnome-menus-3.8.0.orig/desktop-directories/Makefile.am 2013-10-09 15:21:15.277679844 +0200
17 +++ gnome-menus-3.8.0/desktop-directories/Makefile.am 2013-10-09 15:21:15.269679845 +0200
18 @@ -1,5 +1,11 @@
19 directorydir = $(datadir)/desktop-directories
20
21 +# Should be moved to gnome-control-center:
22 +directory_in_controlcenterfiles = \
23 + Hardware.directory.in \
24 + Personal.directory.in \
25 + System.directory.in
26 +
27 directory_in_files = \
28 AudioVideo.directory.in \
29 Development.directory.in \
30 @@ -16,7 +22,8 @@
31 X-GNOME-Sundry.directory.in \
32 X-GNOME-Utilities.directory.in \
33 X-GNOME-WebApplications.directory.in \
34 - X-GNOME-SystemSettings.directory.in
35 + X-GNOME-SystemSettings.directory.in \
36 + $(directory_in_controlcenterfiles)
37
38 directory_DATA = $(directory_in_files:.directory.in=.directory)
39
40 Index: gnome-menus-3.8.0/desktop-directories/Makefile.in
41 ===================================================================
42 --- gnome-menus-3.8.0.orig/desktop-directories/Makefile.in 2013-10-09 15:21:15.277679844 +0200
43 +++ gnome-menus-3.8.0/desktop-directories/Makefile.in 2013-10-09 15:21:15.273679844 +0200
44 @@ -277,6 +277,13 @@
45 top_builddir = @top_builddir@
46 top_srcdir = @top_srcdir@
47 directorydir = $(datadir)/desktop-directories
48 +
49 +# Should be moved to gnome-control-center:
50 +directory_in_controlcenterfiles = \
51 + Hardware.directory.in \
52 + Personal.directory.in \
53 + System.directory.in
54 +
55 directory_in_files = \
56 AudioVideo.directory.in \
57 Development.directory.in \
58 @@ -293,7 +300,8 @@
59 X-GNOME-Sundry.directory.in \
60 X-GNOME-Utilities.directory.in \
61 X-GNOME-WebApplications.directory.in \
62 - X-GNOME-SystemSettings.directory.in
63 + X-GNOME-SystemSettings.directory.in \
64 + $(directory_in_controlcenterfiles)
65
66 directory_DATA = $(directory_in_files:.directory.in=.directory)
67 EXTRA_DIST = $(directory_in_files)
68 Index: gnome-menus-3.8.0/desktop-directories/Personal.directory.in
69 ===================================================================
70 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
71 +++ gnome-menus-3.8.0/desktop-directories/Personal.directory.in 2013-10-09 15:21:15.273679844 +0200
72 @@ -0,0 +1,6 @@
73 +[Desktop Entry]
74 +# Translators: this is Personal as in "Personal settings"
75 +_Name=Personal
76 +_Comment=Personal settings
77 +Icon=preferences-desktop-personal
78 +Type=Directory
79 Index: gnome-menus-3.8.0/desktop-directories/System.directory.in
80 ===================================================================
81 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
82 +++ gnome-menus-3.8.0/desktop-directories/System.directory.in 2013-10-09 15:21:15.273679844 +0200
83 @@ -0,0 +1,5 @@
84 +[Desktop Entry]
85 +_Name=System
86 +_Comment=System settings
87 +Icon=preferences-system
88 +Type=Directory
89 Index: gnome-menus-3.8.0/po/POTFILES.in
90 ===================================================================
91 --- gnome-menus-3.8.0.orig/po/POTFILES.in 2013-10-09 15:21:15.277679844 +0200
92 +++ gnome-menus-3.8.0/po/POTFILES.in 2013-10-09 15:21:15.273679844 +0200
93 @@ -31,3 +31,7 @@
94 debian/desktop-files/SimulationGames.directory.in
95 debian/desktop-files/SportsGames.directory.in
96 debian/desktop-files/StrategyGames.directory.in
97 +desktop-directories/Hardware.directory.in
98 +desktop-directories/Personal.directory.in
99 +desktop-directories/System.directory.in
100 +