Merge lp:~andrewsomething/gnome-themes/gnome-themes-ubuntu into lp:~ubuntu-desktop/gnome-themes/gnome-themes-ubuntu

Proposed by Andrew Starr-Bochicchio
Status: Merged
Merged at revision: not available
Proposed branch: lp:~andrewsomething/gnome-themes/gnome-themes-ubuntu
Merge into: lp:~ubuntu-desktop/gnome-themes/gnome-themes-ubuntu
Diff against target: 72 lines
5 files modified
Dust Sand/index.theme (+1/-1)
Dust/index.theme (+1/-1)
New Wave/index.theme (+1/-1)
debian/changelog (+9/-0)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~andrewsomething/gnome-themes/gnome-themes-ubuntu
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+12925@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Fix for Bug #440635. Use Humanity instead of Human. For dark panel themes (Dust, New Wave) use new Humanity-Dark. For light panel theme (Dust-Sand), use Humanity.

21. By Martin Pitt

* Use new Humanity icons. (LP: #440635)
* debian/control:
 - Explicitly depend on humanity-icon-theme.
 - Bump Standards-Version to 3.8.3, no changes needed.

22. By Martin Pitt

releasing version 0.5

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Dust Sand/index.theme'
--- Dust Sand/index.theme 2009-03-11 10:22:03 +0000
+++ Dust Sand/index.theme 2009-10-06 15:00:25 +0000
@@ -7,5 +7,5 @@
7[X-GNOME-Metatheme]7[X-GNOME-Metatheme]
8GtkTheme=Dust Sand8GtkTheme=Dust Sand
9MetacityTheme=Dust Sand9MetacityTheme=Dust Sand
10IconTheme=Human10IconTheme=Humanity
11CursorTheme=DMZ-White11CursorTheme=DMZ-White
1212
=== modified file 'Dust/index.theme'
--- Dust/index.theme 2009-03-11 10:22:03 +0000
+++ Dust/index.theme 2009-10-06 15:00:25 +0000
@@ -7,5 +7,5 @@
7[X-GNOME-Metatheme]7[X-GNOME-Metatheme]
8GtkTheme=Dust8GtkTheme=Dust
9MetacityTheme=Dust9MetacityTheme=Dust
10IconTheme=Human10IconTheme=Humanity-Dark
11CursorTheme=DMZ-White11CursorTheme=DMZ-White
1212
=== modified file 'New Wave/index.theme'
--- New Wave/index.theme 2009-08-08 02:13:58 +0000
+++ New Wave/index.theme 2009-10-06 15:00:25 +0000
@@ -35,7 +35,7 @@
35[X-GNOME-Metatheme]35[X-GNOME-Metatheme]
36GtkTheme=New Wave36GtkTheme=New Wave
37MetacityTheme=New Wave37MetacityTheme=New Wave
38IconTheme=Human38IconTheme=Humanity-Dark
39GtkColorScheme=fg_color:#101010101010,bg_color:#e5e5e5e5e5e5,text_color:#1a1a1a1a1a1a,base_color:#ffffffffffff,selected_fg_color:#1a1a1a1a1a1a,selected_bg_color:#ffff9697567a,tooltip_fg_color:#333306060606,tooltip_bg_color:#ffffe6e6c4c439GtkColorScheme=fg_color:#101010101010,bg_color:#e5e5e5e5e5e5,text_color:#1a1a1a1a1a1a,base_color:#ffffffffffff,selected_fg_color:#1a1a1a1a1a1a,selected_bg_color:#ffff9697567a,tooltip_fg_color:#333306060606,tooltip_bg_color:#ffffe6e6c4c4
40CursorTheme=default 40CursorTheme=default
41CursorSize=1841CursorSize=18
4242
=== modified file 'debian/changelog'
--- debian/changelog 2009-08-15 03:48:59 +0000
+++ debian/changelog 2009-10-06 15:00:25 +0000
@@ -1,3 +1,12 @@
1gnome-themes-ubuntu (0.5) karmic; urgency=low
2
3 * Use new Humanity icons. (LP: #440635)
4 * debian/control:
5 - Explicitly depend on humanity-icon-theme.
6 - Bump Standards-Version to 3.8.3, no changes needed.
7
8 -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Sun, 04 Oct 2009 17:39:37 -0400
9
1gnome-themes-ubuntu (0.4) karmic; urgency=low10gnome-themes-ubuntu (0.4) karmic; urgency=low
211
3 * Update Dust theme to version 0.4 (LP: #395911).12 * Update Dust theme to version 0.4 (LP: #395911).
413
=== modified file 'debian/control'
--- debian/control 2009-08-08 02:39:05 +0000
+++ debian/control 2009-10-06 15:00:25 +0000
@@ -3,7 +3,7 @@
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>4Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
5Build-Depends: debhelper (>= 5), cdbs5Build-Depends: debhelper (>= 5), cdbs
6Standards-Version: 3.8.26Standards-Version: 3.8.3
7Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-themes/gnome-themes-ubuntu7Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-themes/gnome-themes-ubuntu
88
9Package: gnome-themes-ubuntu9Package: gnome-themes-ubuntu
@@ -11,6 +11,7 @@
11Depends: gtk2-engines,11Depends: gtk2-engines,
12 gtk2-engines-pixbuf,12 gtk2-engines-pixbuf,
13 gtk2-engines-murrine,13 gtk2-engines-murrine,
14 humanity-icon-theme,
14 ${misc:Depends}15 ${misc:Depends}
15Conflicts: community-themes (<= 0.13)16Conflicts: community-themes (<= 0.13)
16Description: Ubuntu community themes17Description: Ubuntu community themes

Subscribers

People subscribed via source and target branches