Merge lp:~seb128/ubuntu-system-settings/dont-install-example into lp:ubuntu-system-settings

[Sebastien Bacher]

don't install the example plugin, it's useful as source example,
not so much installed (especially since we have other working plugins)

don't install the example plugin, it's useful as source example,
not so much installed (especially since we have other working plugins)

[Iain Lane (laney)]

You probably want to remove it from plugins/plugins.pro too

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/46

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/46/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

good point, I dropped it frop the .pro and re-enable the install rules in the example

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:82
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/47

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/47/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

You should probably make it conflict with the newer version so it gets remove.

review: Needs Fixing

[lp:~seb128/ubuntu-system-settings/dont-install-example]

82. By Sebastien Bacher on 2013-06-28

uncomment install rules, drop example from the project instead

[Sebastien Bacher (seb128)]

there you go

[Ken VanDine (ken-vandine)]

Awesome!

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-06-28 10:55:23 +0000
+++ debian/control	2013-06-28 19:11:23 +0000
@@ -27,19 +27,10 @@
          libsystemsettings1 (= ${binary:Version}),
 Recommends: ubuntu-mobile-icons,
             ubuntu-system-settings-online-accounts,
+Conflicts: ubuntu-system-settings-example
 Description: System Settings application for Ubuntu Touch
  System Settings for Ubuntu Touch.
 
-Package: ubuntu-system-settings-example
-Section: libs
-Architecture: i386 amd64 armhf
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         ubuntu-system-settings (= ${binary:Version}),
-         libsystemsettings1 (= ${binary:Version}),
-Description: System Settings Example plugin for Ubuntu Touch
- Example plugin for Ubuntu System Settings 
-
 Package: libsystemsettings1
 Section: libs
 Architecture: i386 amd64 armhf

=== removed file 'debian/ubuntu-system-settings-example.install'
--- debian/ubuntu-system-settings-example.install	2013-05-21 14:23:21 +0000
+++ debian/ubuntu-system-settings-example.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/system-settings/libexample-plugin.so
-usr/share/settings/system/example.settings

=== modified file 'plugins/plugins.pro'
--- plugins/plugins.pro	2013-06-28 15:30:03 +0000
+++ plugins/plugins.pro	2013-06-28 19:11:23 +0000
@@ -2,7 +2,6 @@
 SUBDIRS = \
     about \
     background \
-    example \
     flight-mode \
     gps \
     orientation-lock \