Merge lp:~teemperor/elementaryos/os-patch-gnome-control-center-precise-build-fixes into lp:~elementary-os/elementaryos/os-patch-gnome-control-center-precise

Proposed by Raphael Isemann on 2013-02-26
Status: Merged
Merged at revision: 9
Proposed branch: lp:~teemperor/elementaryos/os-patch-gnome-control-center-precise-build-fixes
Merge into: lp:~elementary-os/elementaryos/os-patch-gnome-control-center-precise
Diff against target: 68 lines (+28/-3)
4 files modified
debian/rules (+0/-3)
debian/source/options (+1/-0)
panels/wacom/cc-wacom-panel.c (+9/-0)
panels/wacom/gnome-wacom-properties.ui (+18/-0)
To merge this branch: bzr merge lp:~teemperor/elementaryos/os-patch-gnome-control-center-precise-build-fixes
Reviewer Review Type Date Requested Status
Cody Garver (community) 2013-02-26 Approve on 2013-02-27
Review via email: mp+150630@code.launchpad.net

Description of the change

Building should now work while changes are applied.

To post a comment you must log in.
Cody Garver (codygarver) wrote :

Run it using this recipe:

# bzr-builder format 0.3 deb-version {debversion}+elementary{revno:elementary-patch}
lp:~elementary-os/ubuntu-package-imports/gnome-control-center-precise
merge elementary-patch lp:~teemperor/elementaryos/os-patch-gnome-control-center-precise-build-fixes

And tell me if it succeeds for you.

review: Needs Information
Raphael Isemann (teemperor) wrote :

Yes, tested it a minute ago and it worked with the recipe and the pbuilder instructions from the evernote-share. At least i have no errors and some debs lying in my pbuilder-result folder.

Raphael Isemann (teemperor) wrote :
11. By Raphael Isemann on 2013-02-27

added ignore .pc to fix build errrs on lp due to missing permissions

Cody Garver (codygarver) :
review: Approve

Congratz, you've hit Launchpad's bug 1089615

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2012-10-27 13:29:36 +0000
3+++ debian/rules 2013-02-27 10:54:22 +0000
4@@ -29,9 +29,6 @@
5
6 clean::
7 rm -f $(DEB_INSTALL_MANPAGES_gnome-control-center)
8- rm shell/cc-shell-marshal.c
9- rm shell/cc-shell-marshal.h
10-
11
12
13 binary-post-install/gnome-control-center-data::
14
15=== added file 'debian/source/options'
16--- debian/source/options 1970-01-01 00:00:00 +0000
17+++ debian/source/options 2013-02-27 10:54:22 +0000
18@@ -0,0 +1,1 @@
19+tar-ignore = .pc
20
21=== modified file 'panels/wacom/cc-wacom-panel.c'
22--- panels/wacom/cc-wacom-panel.c 2012-10-07 09:58:52 +0000
23+++ panels/wacom/cc-wacom-panel.c 2013-02-27 10:54:22 +0000
24@@ -278,6 +278,15 @@
25 update_current_page (self);
26 }
27
28+//not used
29+static gboolean
30+link_activated (GtkLinkButton *button,
31+ CcWacomPanel *self)
32+{
33+ //cc_wacom_panel_switch_to_panel (self, "bluetooth");
34+ return TRUE;
35+}
36+
37 void
38 cc_wacom_panel_switch_to_panel (CcWacomPanel *self,
39 const char *panel)
40
41=== modified file 'panels/wacom/gnome-wacom-properties.ui'
42--- panels/wacom/gnome-wacom-properties.ui 2012-10-07 09:58:52 +0000
43+++ panels/wacom/gnome-wacom-properties.ui 2013-02-27 10:54:22 +0000
44@@ -127,6 +127,24 @@
45 <child>
46 <placeholder/>
47 </child>
48+ <child>
49+ <object class="GtkLinkButton" id="linkbutton">
50+ <property name="label" translatable="yes">Bluetooth Settings</property>
51+ <property name="visible">False</property>
52+ <property name="can_focus">False</property>
53+ <property name="receives_default">True</property>
54+ <property name="has_tooltip">False</property>
55+ <property name="halign">end</property>
56+ <property name="valign">end</property>
57+ <property name="use_action_appearance">False</property>
58+ <property name="relief">none</property>
59+ </object>
60+ <packing>
61+ <property name="expand">False</property>
62+ <property name="fill">True</property>
63+ <property name="position">5</property>
64+ </packing>
65+ </child>
66 </object>
67 <packing>
68 <property name="tab_expand">True</property>

Subscribers

People subscribed via source and target branches