Ubuntu
gnome-control-center package

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

  1. Utopic (14.10)
  2. lp1299912
  3. Merge into ubuntu
Proposed by Tim Lunn
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 Approve
Review via email: mp+218227@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches