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

Subscribers

People subscribed via source and target branches