Merge lp:~darkxst/ubuntu/utopic/gnome-control-center/lp1299912 into lp:~ubuntu-desktop/gnome-control-center/ubuntu

Proposed by Tim Lunn on 2014-05-05
Status: Merged
Merged at revision: 640
Proposed branch: lp:~darkxst/ubuntu/utopic/gnome-control-center/lp1299912
Merge into: lp:~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target: 186 lines (+117/-2)
7 files modified
debian/changelog (+10/-0)
debian/control.in (+3/-0)
debian/gnome-control-center-data.install (+0/-1)
debian/patches/series (+1/-0)
debian/patches/ubuntu-gnome-version.patch (+101/-0)
debian/rules (+1/-0)
debian/source/include-binaries (+1/-1)
To merge this branch: bzr merge lp:~darkxst/ubuntu/utopic/gnome-control-center/lp1299912
Reviewer Review Type Date Requested Status
Martin Pitt 2014-05-05 Approve on 2014-05-07
Review via email: mp+218227@code.launchpad.net
To post a comment you must log in.
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'debian/UbuntuLogo.png'
2Binary files debian/UbuntuLogo.png 2013-06-17 13:33:37 +0000 and debian/UbuntuLogo.png 1970-01-01 00:00:00 +0000 differ
3=== added file 'debian/UbuntuLogoBlank.png'
4Binary files debian/UbuntuLogoBlank.png 1970-01-01 00:00:00 +0000 and debian/UbuntuLogoBlank.png 2014-05-05 02:37:15 +0000 differ
5=== modified file 'debian/changelog'
6--- debian/changelog 2014-04-10 15:24:53 +0000
7+++ debian/changelog 2014-05-05 02:37:15 +0000
8@@ -1,3 +1,13 @@
9+gnome-control-center (1:3.6.3-0ubuntu57) utopic; urgency=medium
10+
11+ * debian/patches/ubuntu-gnome-version.patch: Merge build-time versioned
12+ logo from unity-control-center (LP: #1299912)
13+ * debian/rules: generate logo
14+ * debian/control.in: build-depend on ubuntu font and valac, also add
15+ build-dep on libkrb5-dev to fix FTBS on utopic
16+
17+ -- Tim Lunn <tim@feathertop.org> Mon, 05 May 2014 08:37:17 +1000
18+
19 gnome-control-center (1:3.6.3-0ubuntu56) trusty; urgency=medium
20
21 * debian/patches/git_keyboard_grp_xkb_option.patch:
22
23=== modified file 'debian/control.in'
24--- debian/control.in 2014-03-21 11:25:33 +0000
25+++ debian/control.in 2014-05-05 02:37:15 +0000
26@@ -34,6 +34,7 @@
27 libgtk-3-dev (>= 3.5.13),
28 libgtop2-dev,
29 libibus-1.0-dev (>= 1.5.0),
30+ libkrb5-dev,
31 libnm-glib-dev (>= 0.9) [linux-any],
32 libnm-gtk-dev (>= 0.9) [linux-any],
33 libnm-util-dev (>= 0.9) [linux-any],
34@@ -53,8 +54,10 @@
35 locales,
36 network-manager-dev (>= 0.9) [linux-any],
37 shared-mime-info,
38+ ttf-ubuntu-font-family,
39 libwebkitgtk-3.0-dev,
40 libgl1-mesa-dev,
41+ valac (>= 0.20.0),
42 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu
43
44 Package: gnome-control-center
45
46=== modified file 'debian/gnome-control-center-data.install'
47--- debian/gnome-control-center-data.install 2014-03-21 11:25:33 +0000
48+++ debian/gnome-control-center-data.install 2014-05-05 02:37:15 +0000
49@@ -9,4 +9,3 @@
50 usr/share/polkit-1
51 #debian/gnome-control-center.pkla /var/lib/polkit-1/localauthority/10-vendor.d/
52 debian/source_gnome-control-center.py /usr/share/apport/package-hooks
53-debian/UbuntuLogo.png /usr/share/gnome-control-center/ui
54
55=== modified file 'debian/patches/series'
56--- debian/patches/series 2014-04-07 13:17:20 +0000
57+++ debian/patches/series 2014-05-05 02:37:15 +0000
58@@ -57,3 +57,4 @@
59 sanitize_ssid_convert_utf8.patch
60 git_iconview_columns.patch
61 gcc_not_in_unity.patch
62+ubuntu-gnome-version.patch
63
64=== added file 'debian/patches/ubuntu-gnome-version.patch'
65--- debian/patches/ubuntu-gnome-version.patch 1970-01-01 00:00:00 +0000
66+++ debian/patches/ubuntu-gnome-version.patch 2014-05-05 02:37:15 +0000
67@@ -0,0 +1,101 @@
68+Description: Generate logo versioning at Build Time
69+ Changes Merged from Unity-control-center
70+ http://bazaar.launchpad.net/~unity-control-center-team/unity-control-center/trunk/revision/12726
71+ .
72+ gnome-control-center (1:3.6.3-0ubuntu57) utopic; urgency=medium
73+ .
74+ * debian/patches/ubuntu-gnome-version.patch: Merge build-time versioned
75+ logo from unity-control-center (LP: #1299912)
76+ * debian/rules: generate logo
77+ * debian/control.in: build-depend on ubuntu font and valac
78+Author: Tim Lunn <tim@feathertop.org>
79+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1299912
80+
81+---
82+--- gnome-control-center-3.6.3.orig/configure.ac
83++++ gnome-control-center-3.6.3/configure.ac
84+@@ -168,6 +168,8 @@ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $
85+ pwquality
86+ $SYSTEMD)
87+
88++AM_PROG_VALAC([0.20.0])
89++
90+ GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
91+ AC_SUBST(GDESKTOP_PREFIX)
92+
93+--- gnome-control-center-3.6.3.orig/panels/info/Makefile.am
94++++ gnome-control-center-3.6.3/panels/info/Makefile.am
95+@@ -10,11 +10,22 @@ INCLUDES = \
96+ -DLIBEXECDIR="\"$(libexecdir)\"" \
97+ $(NULL)
98+
99+-noinst_PROGRAMS = test-hostname
100++noinst_PROGRAMS = test-hostname logo-generator
101+ test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c
102+ test_hostname_LDADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS)
103+ test_hostname_CFLAGS = $(INCLUDES)
104+
105++logo_generator_SOURCES = logo-generator.vala
106++
107++logo_generator_VALAFLAGS = \
108++ --pkg cairo \
109++ --pkg pango \
110++ --pkg pangocairo \
111++ --target-glib 2.32
112++
113++logo_generator_CFLAGS = $(PANEL_CFLAGS) $(INFO_PANEL_CFLAGS)
114++logo_generator_LDADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS)
115++
116+ all-local: check-local
117+
118+ check-local: test-hostname
119+--- /dev/null
120++++ gnome-control-center-3.6.3/panels/info/logo-generator.vala
121+@@ -0,0 +1,47 @@
122++public class Main : Object
123++{
124++
125++ private static string? file = null;
126++ private static string? text = null;
127++ private static string? result = null;
128++ private const OptionEntry[] options = {
129++ {"logo", 0, 0, OptionArg.FILENAME, ref file, "Path to logo", "LOGO"},
130++ {"text", 0, 0, OptionArg.STRING, ref text, "Sublogo text", "TEXT"},
131++ {"output", 0, 0, OptionArg.FILENAME, ref result, "Path to rendered output", "OUTPUT"},
132++ {null}
133++ };
134++
135++ public static int main(string[] args) {
136++ try {
137++ var opt_context = new OptionContext ("- OptionContext example");
138++ opt_context.set_help_enabled (true);
139++ opt_context.add_main_entries (options, null);
140++ opt_context.parse (ref args);
141++ } catch (OptionError e) {
142++ stdout.printf ("error: %s\n", e.message);
143++ stdout.printf ("Run '%s --help' to see a full list of available command line options.\n", args[0]);
144++ return 0;
145++ }
146++ Cairo.ImageSurface surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, 190, 145);
147++ Cairo.Context context = new Cairo.Context (surface);
148++ Cairo.ImageSurface logo = new Cairo.ImageSurface.from_png (file);
149++ context.set_source_surface (logo, 0, 0);
150++ context.paint();
151++
152++ context.set_source_rgba (0, 0, 0, 1);
153++ context.translate (0, 117);
154++ var font_description = new Pango.FontDescription();
155++ font_description.set_family("Ubuntu");
156++ font_description.set_size((int)(17.5 * Pango.SCALE));
157++ var layout = Pango.cairo_create_layout (context);
158++ layout.set_alignment(Pango.Alignment.CENTER);
159++ layout.set_width(190*Pango.SCALE);
160++ layout.set_font_description (font_description);
161++ layout.set_text (text, -1);
162++
163++ Pango.cairo_show_layout(context, layout);
164++
165++ surface.write_to_png(result);
166++ return 0;
167++ }
168++}
169
170=== modified file 'debian/rules'
171--- debian/rules 2014-01-08 21:45:01 +0000
172+++ debian/rules 2014-05-05 02:37:15 +0000
173@@ -27,5 +27,6 @@
174 rm -rf debian/capplets-data/usr/share/applications/mimeinfo.cache
175 rm -rf debian/capplets-data/usr/share/pkgconfig
176 dh_installmime -p$(cdbs_curpkg)
177+ ./panels/info/logo-generator --logo debian/UbuntuLogoBlank.png --text "ubuntu 14.10" --output debian/gnome-control-center-data/usr/share/gnome-control-center/ui/UbuntuLogo.png
178
179 common-binary-post-install-arch:: list-missing
180
181=== modified file 'debian/source/include-binaries'
182--- debian/source/include-binaries 2011-09-28 08:35:28 +0000
183+++ debian/source/include-binaries 2014-05-05 02:37:15 +0000
184@@ -1,1 +1,1 @@
185-debian/UbuntuLogo.png
186+debian/UbuntuLogoBlank.png

Subscribers

People subscribed via source and target branches