Merge lp:~sil2100/autopilot/get_manual_version_to_trunk into lp:autopilot

[Łukasz Zemczak]

Include the manually published autopilot version 1.3daily13.06.05-0ubuntu2 into trunk, since it was missing. We drop the actual change in debian/control, as it's no longer needed.

- Problem:

Due to python-ubuntu-platform-api not being in distro yet, the dependency could not be satisfied. This forced Didier to push a new version manually that switches dep to suggests for now. This version needs to be present in lp:autopilot.

- Fix:

Include the manually published autopilot version 1.3daily13.06.05-0ubuntu2 into trunk, which changes the depends of python-ubuntu-platform-api to a Suggests instead.
We drop the debian/control change though, as it should not be needed anymore.

- Tests:

N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:240
http://jenkins.qa.ubuntu.com/job/autopilot-ci/120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/48

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/120/rebuild

review: Approve (continuous-integration)

[lp:~sil2100/autopilot/get_manual_version_to_trunk]

241. By Łukasz Zemczak on 2013-06-10

Let's actually revert Didier's change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:241
http://jenkins.qa.ubuntu.com/job/autopilot-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-saucy-armhf-ci/49

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-ci/121/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Ok!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-07 10:07:20 +0000
+++ debian/changelog	2013-06-10 10:18:29 +0000
@@ -4,6 +4,14 @@
 
  -- Thomi Richards <[e-mail]>  Fri, 07 Jun 2013 08:31:45 +1200
 
+autopilot (1.3daily13.06.05-0ubuntu2) saucy; urgency=low
+
+  * autopilot-touch only suggests python-ubuntu-platform-api for now.
+    It's not in distro and we need that requirement to be fulfilled to
+    have unity 7, 100 scopes and the touch stack to distro.
+
+ -- Didier Roche <[e-mail]>  Fri, 07 Jun 2013 13:33:46 +0200
+
 autopilot (1.3daily13.06.05-0ubuntu1) saucy; urgency=low
 
   [ Barry Warsaw ]