Merge lp:~seb128/ubuntu-system-settings/workaround-click-depends into lp:ubuntu-system-settings

[Sebastien Bacher]

* debian/control:
  - don't have an alternative depends on system-image-snappy-cli,
    it's deprecated
  - have ubuntu-snappy-cli as an alternative to click, that's not the
    right solution but a workaround to unblock snappy image build

* debian/control:
  - don't have an alternative depends on system-image-snappy-cli,
    it's deprecated
  - have ubuntu-snappy-cli as an alternative to click, that's not the
    right solution but a workaround to unblock snappy image build

[Sebastien Bacher (seb128)]

I've uploaded that manually to wily to unblock snappy image builds,
https://launchpad.net/ubuntu/+source/ubuntu-system-settings/0.3+15.10.20150622-0ubuntu2

unsure if we want to directly commit to trunk as well or include in the mps...

[Jonas G. Drange (jonas-drange)]

WFM

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-22 13:01:02 +0000
+++ debian/changelog	2015-07-02 09:01:27 +0000
@@ -1,3 +1,13 @@
+ubuntu-system-settings (0.3+15.10.20150622-0ubuntu2) wily; urgency=medium
+
+  * debian/control:
+    - don't have an alternative depends on system-image-snappy-cli,
+      it's deprecated
+    - have ubuntu-snappy-cli as an alternative to click, that's not the 
+      right solution but a workaround to unblock snappy image build
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 02 Jul 2015 10:30:10 +0200
+
 ubuntu-system-settings (0.3+15.10.20150622-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'debian/control'
--- debian/control	2015-06-04 14:52:57 +0000
+++ debian/control	2015-07-02 09:01:27 +0000
@@ -60,6 +60,7 @@
          accountsservice,
          accountsservice-ubuntu-schemas (>= 0.0.3+14.10.20140829~),
          bluez (>= 4.36),
+         click | ubuntu-snappy-cli,
          dbus-property-service [amd64 armhf i386],
          gsettings-desktop-schemas,
          gsettings-ubuntu-schemas (>= 0.0.4),
@@ -79,8 +80,7 @@
          suru-icon-theme,
          whoopsie-preferences (>= 0.9),
          libsystemsettings1 (= ${binary:Version}),
-         system-image-dbus (>= 2.5) | system-image-snappy-cli,
-         click,
+         system-image-dbus (>= 2.5),
          ubuntu-keyboard-data (>= 0.99.trunk.phablet2+15.04.20150421),
          urfkill,
 # for the session-migration script (python3 itself also for the push helper)