Merge lp:~agateau/gnome-menus/directory-suffix into lp:~ubuntu-desktop/gnome-menus/ubuntu

Proposed by Aurélien Gâteau on 2012-02-06
Status: Merged
Merged at revision: 110
Proposed branch: lp:~agateau/gnome-menus/directory-suffix
Merge into: lp:~ubuntu-desktop/gnome-menus/ubuntu
Diff against target: 63 lines (+43/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/22_directory-suffix-for-icons.patch (+35/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~agateau/gnome-menus/directory-suffix
Reviewer Review Type Date Requested Status
Didier Roche Approve on 2012-02-08
Sebastien Bacher 2012-02-06 Pending
Review via email: mp+91663@code.launchpad.net

Description of the change

This branch appends "-directory" suffixes to the *.directory files which are
used by gnome-control-center. It needs r127 of
lp:~agateau/ubuntu-mono/gnome-cc-categories/ to work.

To post a comment you must log in.
Didier Roche (didrocks) wrote :

sponsoring

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 2011-12-23 20:30:50 +0000
3+++ debian/changelog 2012-02-06 14:55:22 +0000
4@@ -1,3 +1,10 @@
5+gnome-menus (3.2.0.1-2ubuntu2) precise; urgency=low
6+
7+ * debian/patches/22_directory-suffix-for-icons.patch: append "-directory"
8+ suffix to icon names for categories which appear in gnome-control-center
9+
10+ -- Aurélien Gâteau <aurelien.gateau@ubuntu.com> Mon, 06 Feb 2012 15:35:07 +0100
11+
12 gnome-menus (3.2.0.1-2ubuntu1) precise; urgency=low
13
14 [ Michael Terry ]
15
16=== added file 'debian/patches/22_directory-suffix-for-icons.patch'
17--- debian/patches/22_directory-suffix-for-icons.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/22_directory-suffix-for-icons.patch 2012-02-06 14:55:22 +0000
19@@ -0,0 +1,35 @@
20+Description: Add "-directory" suffix to Hardware, Personal and System icons
21+ This makes it possible to provide specific icons for gnome-control-center
22+ categories without overriding generic icons like "preferences-system" which are
23+ the icon of some applications (gnome-control-center, gnome-tweak-tool...)
24+Author: Aurélien Gâteau <aurelien.gateau@canonical.com>
25+diff a/desktop-directories/Personal.directory.in b/desktop-directories/Personal.directory.in
26+--- a/desktop-directories/Personal.directory.in
27++++ b/desktop-directories/Personal.directory.in
28+@@ -2,5 +2,5 @@
29+ # Translators: this is Personal as in "Personal settings"
30+ _Name=Personal
31+ _Comment=Personal settings
32+-Icon=preferences-desktop-personal
33++Icon=preferences-desktop-personal-directory
34+ Type=Directory
35+diff a/desktop-directories/Hardware.directory.in b/desktop-directories/Hardware.directory.in
36+--- a/desktop-directories/Hardware.directory.in
37++++ b/desktop-directories/Hardware.directory.in
38+@@ -1,5 +1,5 @@
39+ [Desktop Entry]
40+ _Name=Hardware
41+ _Comment=Settings for several hardware devices
42+-Icon=preferences-desktop-peripherals
43++Icon=preferences-desktop-peripherals-directory
44+ Type=Directory
45+diff a/desktop-directories/System.directory.in b/desktop-directories/System.directory.in
46+--- a/desktop-directories/System.directory.in
47++++ b/desktop-directories/System.directory.in
48+@@ -1,5 +1,5 @@
49+ [Desktop Entry]
50+ _Name=System
51+ _Comment=System settings
52+-Icon=preferences-system
53++Icon=preferences-system-directory
54+ Type=Directory
55
56=== modified file 'debian/patches/series'
57--- debian/patches/series 2011-12-23 20:30:50 +0000
58+++ debian/patches/series 2012-02-06 14:55:22 +0000
59@@ -8,3 +8,4 @@
60 #20_show-admin-tools-for-admin-group.patch
61 11_science-menu.patch
62 21_default-python-in-shebang.patch
63+22_directory-suffix-for-icons.patch

Subscribers

People subscribed via source and target branches