xubuntu-artwork

Merge lp:~mcasadevall/xubuntu-artwork/convert-svgs-to-pngs into lp:~xubuntu-art/xubuntu-artwork/trunk

  1. convert-svgs-to-pngs
  2. Merge into trunk
Proposed by Michael Casadevall
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mcasadevall/xubuntu-artwork/convert-svgs-to-pngs
Merge into: lp:~xubuntu-art/xubuntu-artwork/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~mcasadevall/xubuntu-artwork/convert-svgs-to-pngs
Reviewer Review Type Date Requested Status
Cody A.W. Somerville Pending
Review via email: mp+5042@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Casadevall (mcasadevall) wrote :

This should resolve #351588 on ARM

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2007-10-29 18:18:08 +0000
3+++ Makefile 2009-03-30 18:00:53 +0000
4@@ -1,8 +1,11 @@
5 build:
6+ make -C gdm_svg
7 make -C usplash
8
9 clean:
10+ make -C gdm_svg clean
11 make -C usplash clean
12
13 install:
14+ make -C gdm_svg install
15 make -C usplash install
16
17=== modified file 'debian/changelog'
18--- debian/changelog 2009-03-22 22:43:12 +0000
19+++ debian/changelog 2009-03-30 18:00:53 +0000
20@@ -1,3 +1,18 @@
21+xubuntu-artwork (0.25) UNRELEASED; urgency=high
22+
23+ * Modified the theme to use PNGs vs. SVGs due to speed
24+ issues on slower architectures, especially ARM (LP: #351588)
25+ * Makefile:
26+ - Takes the source SVGs and converts to PNGs at build time
27+ * gdm_svg/Makefile:
28+ - New file to generate pngs, and install them into the DESTDIR
29+ * debian/control:
30+ - Added build-dep on librsvg2-bin
31+ * debian/xubuntu-artwork.install:
32+ - Install the new PNGs into their proper places
33+
34+ -- Michael Casadevall <mcasadevall@ubuntu.com> Mon, 30 Mar 2009 10:52:21 -0400
35+
36 xubuntu-artwork (0.24) jaunty; urgency=low
37
38 * usr/share/gdm: updated gdm theme to 0.6 (includes several bugfixes and an
39
40=== modified file 'debian/control'
41--- debian/control 2009-03-18 19:44:09 +0000
42+++ debian/control 2009-03-30 18:00:53 +0000
43@@ -3,7 +3,7 @@
44 Priority: optional
45 Maintainer: Xubuntu Developers <xubuntu-devel@lists.ubuntu.com>
46 XSBC-Original-Maintainer: Jani Monoses <jani@ubuntu.com>
47-Build-Depends: cdbs, debhelper (>= 5.0.0), libusplash-dev (>= 0.5.30)
48+Build-Depends: cdbs, debhelper (>= 5.0.0), libusplash-dev (>= 0.5.30), librsvg2-bin
49 Standards-Version: 3.8.0
50 Vcs-Bzr: lp:~xubuntu-team/xubuntu-artwork/trunk
51 Vcs-Browser: http://bazaar.launchpad.net/~xubuntu-team/xubuntu-artwork/trunk/files
52
53=== modified file 'debian/xubuntu-artwork.install'
54--- debian/xubuntu-artwork.install 2009-03-15 14:51:41 +0000
55+++ debian/xubuntu-artwork.install 2009-03-30 18:00:53 +0000
56@@ -1,1 +1,2 @@
57 usr/
58+debian/tmp/usr/share
59
60=== added directory 'gdm_svg'
61=== added file 'gdm_svg/Makefile'
62--- gdm_svg/Makefile 1970-01-01 00:00:00 +0000
63+++ gdm_svg/Makefile 2009-03-30 18:00:53 +0000
64@@ -0,0 +1,18 @@
65+INSTALL = /usr/bin/install -c
66+INSTALL_DATA = $(INSTALL) -m 644
67+
68+build: $(patsubst %.svg,%.png,$(wildcard *.svg))
69+
70+clean:
71+ -rm *.png
72+
73+install:
74+ $(INSTALL) -d $(DESTDIR)/usr/share/gdm/themes/xubuntu
75+ $(INSTALL_DATA) *.png $(DESTDIR)/usr/share/gdm/themes/xubuntu
76+
77+jaunty-gdm.png: jaunty-gdm.svg
78+ rsvg -f png -w 2000 -h 1800 jaunty-gdm.svg jaunty-gdm.png
79+
80+icon_%.png: icon_%.svg
81+ rsvg -f png -w 32 -h 32 $< $@
82+
83
84=== renamed file 'usr/share/gdm/themes/xubuntu/icon_halt.svg' => 'gdm_svg/icon_halt.svg'
85=== renamed file 'usr/share/gdm/themes/xubuntu/icon_language.svg' => 'gdm_svg/icon_language.svg'
86=== renamed file 'usr/share/gdm/themes/xubuntu/icon_reboot.svg' => 'gdm_svg/icon_reboot.svg'
87=== renamed file 'usr/share/gdm/themes/xubuntu/icon_session.svg' => 'gdm_svg/icon_session.svg'
88=== renamed file 'usr/share/gdm/themes/xubuntu/icon_xdmcp.svg' => 'gdm_svg/icon_xdmcp.svg'
89=== renamed file 'usr/share/gdm/themes/xubuntu/jaunty-gdm.svg' => 'gdm_svg/jaunty-gdm.svg'
90=== modified file 'usr/share/gdm/themes/xubuntu/Xubuntu.xml'
91--- usr/share/gdm/themes/xubuntu/Xubuntu.xml 2009-03-19 21:55:32 +0000
92+++ usr/share/gdm/themes/xubuntu/Xubuntu.xml 2009-03-30 18:00:53 +0000
93@@ -6,7 +6,7 @@
94 <item type="pixmap">
95 <pos y="50%" x="0" width="2000" height="1800" anchor="w"/>
96
97- <normal file="jaunty-gdm.svg"/>
98+ <normal file="jaunty-gdm.png"/>
99 </item>
100
101 <!-- hostname and clock -->
102@@ -71,9 +71,9 @@
103 <box xpadding="0" spacing="5" orientation="horizontal">
104 <item type="pixmap">
105 <pos height="24px" width="24px" />
106- <normal file="icon_reboot.svg" alpha="0.5" />
107- <prelight file="icon_reboot.svg" alpha="0.75" />
108- <active file="icon_reboot.svg" alpha="1" />
109+ <normal file="icon_reboot.png" alpha="0.5" />
110+ <prelight file="icon_reboot.png" alpha="0.75" />
111+ <active file="icon_reboot.png" alpha="1" />
112 </item>
113 <item type="label">
114 <normal font="Sans 9" color="#ffffff" />
115@@ -91,9 +91,9 @@
116 <box xpadding="0" spacing="5" orientation="horizontal">
117 <item type="pixmap">
118 <pos height="24px" width="24px" />
119- <normal file="icon_halt.svg" alpha="0.5" />
120- <prelight file="icon_halt.svg" alpha="0.75" />
121- <active file="icon_halt.svg" alpha="1" />
122+ <normal file="icon_halt.png" alpha="0.5" />
123+ <prelight file="icon_halt.png" alpha="0.75" />
124+ <active file="icon_halt.png" alpha="1" />
125 </item>
126 <item type="label">
127 <normal font="Sans 9" color="#ffffff" />
128@@ -112,9 +112,9 @@
129 <box xpadding="0" spacing="5" orientation="horizontal">
130 <item type="pixmap">
131 <pos height="24px" width="24px" />
132- <normal file="icon_halt.svg" alpha="0.5" />
133- <prelight file="icon_halt.svg" alpha="0.75" />
134- <active file="icon_halt.svg" alpha="1" />
135+ <normal file="icon_halt.png" alpha="0.5" />
136+ <prelight file="icon_halt.png" alpha="0.75" />
137+ <active file="icon_halt.png" alpha="1" />
138 </item>
139 <item type="label">
140 <normal font="Sans 9" color="#ffffff" />
141@@ -140,9 +140,9 @@
142 <box xpadding="0" spacing="5" orientation="horizontal">
143 <item type="pixmap">
144 <pos width="24" height="24"/>
145- <normal file="icon_language.svg" alpha="0.5" />
146- <prelight file="icon_language.svg" alpha="0.75" />
147- <active file="icon_language.svg" alpha="1" />
148+ <normal file="icon_language.png" alpha="0.5" />
149+ <prelight file="icon_language.png" alpha="0.75" />
150+ <active file="icon_language.png" alpha="1" />
151 </item>
152 <item type="label">
153 <normal font="Sans 9" color="#ffffff" />
154@@ -159,9 +159,9 @@
155 <box xpadding="0" spacing="5" orientation="horizontal">
156 <item type="pixmap">
157 <pos width="24" height="24"/>
158- <normal file="icon_session.svg" alpha="0.5" />
159- <prelight file="icon_session.svg" alpha="0.75" />
160- <active file="icon_session.svg" alpha="1" />
161+ <normal file="icon_session.png" alpha="0.5" />
162+ <prelight file="icon_session.png" alpha="0.75" />
163+ <active file="icon_session.png" alpha="1" />
164 </item>
165 <item type="label">
166 <normal font="Sans 9" color="#ffffff" />
167@@ -178,9 +178,9 @@
168 <box xpadding="0" spacing="5" orientation="horizontal">
169 <item type="pixmap">
170 <pos width="24" height="24"/>
171- <normal file="icon_xdmcp.svg" alpha="0.5" />
172- <prelight file="icon_xdmcp.svg" alpha="0.75" />
173- <active file="icon_xdmcp.svg" alpha="1" />
174+ <normal file="icon_xdmcp.png" alpha="0.5" />
175+ <prelight file="icon_xdmcp.png" alpha="0.75" />
176+ <active file="icon_xdmcp.png" alpha="1" />
177 </item>
178 <item type="label">
179 <normal font="Sans 9" color="#ffffff" />

Subscribers

People subscribed via source and target branches