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

[Raphael Isemann]

Building should now work while changes are applied.

[Cody Garver (codygarver)]

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)]

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)]

Ok, on launchpad it fails now:
https://launchpadlibrarian.net/132486184/buildlog.txt.gz

[lp:~teemperor/elementaryos/os-patch-gnome-control-center-precise-build-fixes]

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

[Sergey "Shnatsel" Davidoff (shnatsel)]

Congratz, you've hit Launchpad's bug 1089615

=== modified file 'debian/rules'
--- debian/rules	2012-10-27 13:29:36 +0000
+++ debian/rules	2013-02-27 10:54:22 +0000
@@ -29,9 +29,6 @@
 
 clean::
 	rm -f $(DEB_INSTALL_MANPAGES_gnome-control-center)
-	rm shell/cc-shell-marshal.c
-	rm shell/cc-shell-marshal.h
-
 
 
 binary-post-install/gnome-control-center-data::
 
=== added file 'debian/source/options'
--- debian/source/options	1970-01-01 00:00:00 +0000
+++ debian/source/options	2013-02-27 10:54:22 +0000
@@ -0,0 +1,1 @@
+tar-ignore = .pc
 
=== modified file 'panels/wacom/cc-wacom-panel.c'
--- panels/wacom/cc-wacom-panel.c	2012-10-07 09:58:52 +0000
+++ panels/wacom/cc-wacom-panel.c	2013-02-27 10:54:22 +0000
@@ -278,6 +278,15 @@
 	update_current_page (self);
 }
 
+//not used
+static gboolean
+link_activated (GtkLinkButton *button,
+		CcWacomPanel  *self)
+{
+	//cc_wacom_panel_switch_to_panel (self, "bluetooth");
+	return TRUE;
+}
+
 void
 cc_wacom_panel_switch_to_panel (CcWacomPanel *self,
 				const char   *panel)
 
=== modified file 'panels/wacom/gnome-wacom-properties.ui'
--- panels/wacom/gnome-wacom-properties.ui	2012-10-07 09:58:52 +0000
+++ panels/wacom/gnome-wacom-properties.ui	2013-02-27 10:54:22 +0000
@@ -127,6 +127,24 @@
                 <child>
                   <placeholder/>
                 </child>
+                <child>
+                  <object class="GtkLinkButton" id="linkbutton">
+                    <property name="label" translatable="yes">Bluetooth Settings</property>
+                    <property name="visible">False</property>
+                    <property name="can_focus">False</property>
+                    <property name="receives_default">True</property>
+                    <property name="has_tooltip">False</property>
+                    <property name="halign">end</property>
+                    <property name="valign">end</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="relief">none</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="tab_expand">True</property>