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
1=== modified file 'Dust Sand/index.theme'
2--- Dust Sand/index.theme 2009-03-11 10:22:03 +0000
3+++ Dust Sand/index.theme 2009-10-06 15:00:25 +0000
4@@ -7,5 +7,5 @@
5 [X-GNOME-Metatheme]
6 GtkTheme=Dust Sand
7 MetacityTheme=Dust Sand
8-IconTheme=Human
9+IconTheme=Humanity
10 CursorTheme=DMZ-White
11
12=== modified file 'Dust/index.theme'
13--- Dust/index.theme 2009-03-11 10:22:03 +0000
14+++ Dust/index.theme 2009-10-06 15:00:25 +0000
15@@ -7,5 +7,5 @@
16 [X-GNOME-Metatheme]
17 GtkTheme=Dust
18 MetacityTheme=Dust
19-IconTheme=Human
20+IconTheme=Humanity-Dark
21 CursorTheme=DMZ-White
22
23=== modified file 'New Wave/index.theme'
24--- New Wave/index.theme 2009-08-08 02:13:58 +0000
25+++ New Wave/index.theme 2009-10-06 15:00:25 +0000
26@@ -35,7 +35,7 @@
27 [X-GNOME-Metatheme]
28 GtkTheme=New Wave
29 MetacityTheme=New Wave
30-IconTheme=Human
31+IconTheme=Humanity-Dark
32 GtkColorScheme=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
33 CursorTheme=default
34 CursorSize=18
35
36=== modified file 'debian/changelog'
37--- debian/changelog 2009-08-15 03:48:59 +0000
38+++ debian/changelog 2009-10-06 15:00:25 +0000
39@@ -1,3 +1,12 @@
40+gnome-themes-ubuntu (0.5) karmic; urgency=low
41+
42+ * Use new Humanity icons. (LP: #440635)
43+ * debian/control:
44+ - Explicitly depend on humanity-icon-theme.
45+ - Bump Standards-Version to 3.8.3, no changes needed.
46+
47+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Sun, 04 Oct 2009 17:39:37 -0400
48+
49 gnome-themes-ubuntu (0.4) karmic; urgency=low
50
51 * Update Dust theme to version 0.4 (LP: #395911).
52
53=== modified file 'debian/control'
54--- debian/control 2009-08-08 02:39:05 +0000
55+++ debian/control 2009-10-06 15:00:25 +0000
56@@ -3,7 +3,7 @@
57 Priority: optional
58 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
59 Build-Depends: debhelper (>= 5), cdbs
60-Standards-Version: 3.8.2
61+Standards-Version: 3.8.3
62 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-themes/gnome-themes-ubuntu
63
64 Package: gnome-themes-ubuntu
65@@ -11,6 +11,7 @@
66 Depends: gtk2-engines,
67 gtk2-engines-pixbuf,
68 gtk2-engines-murrine,
69+ humanity-icon-theme,
70 ${misc:Depends}
71 Conflicts: community-themes (<= 0.13)
72 Description: Ubuntu community themes

Subscribers

People subscribed via source and target branches