Merge lp:~xnox/ubuntu-app-launch/sync-archive into lp:ubuntu-app-launch/14.04

[Dimitri John Ledkov]

Sync trunk with archive.

Sync trunk with archive.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:137
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/248/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/108

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/upstart-app-launch-ci/248/rebuild

review: Approve (continuous-integration)

[Colin Watson (cjwatson)]

This all looks sensible to me; and the click dependency will be going away soon once I finish my libclick work anyway.

review: Approve

[Dimitri John Ledkov (xnox)]

review: Approve (indicator-developer team)

[Dimitri John Ledkov (xnox)]

this change is in the archive already.

review: Approve (core-dev)

[Robert Bruce Park (robru)]

Sincerest apologies, I was not aware of this MP, but I was doing an unrelated CI Train landing and found conflicts between trunk and distro, so I pushed commits directly to trunk to resolve the issue.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-20 12:04:30 +0000
+++ debian/changelog	2014-03-07 12:36:49 +0000
@@ -1,3 +1,19 @@
+upstart-app-launch (0.3+14.04.20140220-0ubuntu3) trusty; urgency=medium
+
+  * Change dependency on "zeitgeist" to "zeitgeist-core". The former is a
+    metapackage which pulls in python2 and useless gtk/X data providers,
+    whereas zeitgeist-core provides the service necessary for
+    zg-report-app to operate.
+
+ -- Dimitri John Ledkov <[e-mail]>  Sat, 22 Feb 2014 23:00:37 +0000
+
+upstart-app-launch (0.3+14.04.20140220-0ubuntu2) trusty; urgency=medium
+
+  * Drop depends:click from a Multi-Arch:same library package, as click is
+    neither M-A:allowed nor M-A:foreign. This unbreaks cross-compilation.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 20 Feb 2014 23:51:29 +0000
+
 upstart-app-launch (0.3+14.04.20140220-0ubuntu1) trusty; urgency=low
 
   [ Ted Gould ]

=== modified file 'debian/control'
--- debian/control	2014-02-11 03:14:30 +0000
+++ debian/control	2014-03-07 12:36:49 +0000
@@ -35,7 +35,7 @@
          click (>= 0.4.9),
          click-apparmor,
          upstart (>= 1.11),
-         zeitgeist,
+         zeitgeist-core,
 Description: Upstart Job for Launching Applications
  Upstart Job file and associated utilities that is used to launch
  applications in a standard and confined way.
@@ -56,7 +56,6 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         click (>= 0.4.9),
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Description: library for sending requests to the upstart app launch