Merge lp:~mterry/unity-lens-applications/sync-packaging into lp:unity-lens-applications

[Michael Terry]

Sync packaging from Ubuntu

Whoops. When pulling the debian/ branch inline, I accidentally used an older version of the packaging. This syncs us up with Ubuntu again and should fix the PPA upload errors (due to trying to upload an older version).

[Didier Roche (didrocks)]

Ah, indeed, it was a way older version ;)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/7/console

review: Needs Fixing (continuous-integration)

[Didier Roche (didrocks)]

Let's wait for Francis, seems to be a builder issue.

[Francis Ginther (fginther)]

Build failed because the MP is specifying a newer package version than what is present in trunk. The script to construct the package version needs to take this into account (previously it only had to look at the version in the packaging branch).

[Francis Ginther (fginther)]

Script updated, re-approving.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/8/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

This latest failure appears to be a error in the debian packaging in the MP (from the console logs):
cp: cannot stat `debian/tmp/etc/': No such file or directory
dh_install: cp -a debian/tmp/etc/ debian/unity-lens-applications// returned exit code 1
make: *** [binary-install/unity-lens-applications] Error 2

I was able to reproduce with "bzr bd --builder=pdebuild" on a different host.

If you suspect that this may be jenkins/infrastructure related, please ping me.

[lp:~mterry/unity-lens-applications/sync-packaging]

318. By Michael Terry on 2012-11-13

delete unneeded .install file

[Michael Terry (mterry)]

It was a piece from the modern-build branch that needed to be here to make everything build. I'll mark as approved, since the modern-build branch is approved as well and this was just one bit from that pulled over.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-05 19:18:41 +0000
+++ debian/changelog	2012-11-13 19:57:21 +0000
@@ -1,11 +1,100 @@
-unity-lens-applications (5.12.0-0ubuntu2) UNRELEASED; urgency=low
+unity-lens-applications (6.10.0-0ubuntu2) UNRELEASED; urgency=low
 
   * debian/control:
     - Update Vcs-Bzr
     - Bump required valac to 0.18
     - Fix libgnome-menu-dev Build-Dep to be libgnome-menu-3-dev
 
- -- Michael Terry <[e-mail]>  Mon, 05 Nov 2012 13:56:56 -0500
+ -- Michael Terry <[e-mail]>  Wed, 07 Nov 2012 23:10:52 -0500
+
+unity-lens-applications (6.10.0-0ubuntu1) quantal-proposed; urgency=low
+
+  * New upstream release.
+    - Dash - 'More suggestions' icons in App Lens are too large (LP: #1052513)
+    - The look of price on 'Buy' button in the preview is inconsistent with 
+      other lenses (LP: #1061630)
+    - Lots of IO during startup (LP: #1066816)
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Tue, 16 Oct 2012 13:47:18 +0200
+
+unity-lens-applications (6.8.0-0ubuntu1) quantal-proposed; urgency=low
+
+  [ Timo Jyrinki ]
+  * New upstream release.
+    - Use icon_url when displaying preview of an installable app; use 
+      find_pkg_icon instead of find_app_install_icon_path, as it also uses 
+      icons from ~/.cache/software-center/icons (LP: #1054085)
+    - Remove unneeded gconf dep
+    - Use size-hint for items in "More suggestions" category (LP: #1052513)
+    - Disable collapsing by key (desktop file) when querying for specific 
+      packages (LP: #1057565)
+    - Improve Utils.preprocess_text (LP: #1056743)
+  * Bump libunity-dev dependency
+
+  [ Didier Roche ]
+  * Remove gconf build-dep as removed upstream.
+
+ -- Didier Roche <[e-mail]>  Thu, 04 Oct 2012 16:22:31 +0200
+
+unity-lens-applications (6.6.0-0ubuntu1) quantal-proposed; urgency=low
+
+  [ Timo Jyrinki ]
+  * New upstream release.
+    - Home Lens requires binary names to be provided with results
+      (LP: #1043775)
+    - Dash - App Lens ratings are not working (LP: #1039789)
+    - Dash - When an application is installed direct from a Dash Preview, the
+      Software Centre should not be launched and the Software Centre window
+      should not be opened (LP: #1045330)
+    - [FFE][UIFE]Dash - Finesse the placement, movement and behaviour of the
+      12.10 Dash (LP: #1049593)
+    - Icons are missing in the previews for apps available for download
+      (LP: #1050344)
+    - Don't show 'Uninstall' button for critical apps (i.e. the ones that
+      depend on ubuntu-desktop). (LP: #1047315)
+    - List 10 'What's new' apps and the 12 'Top Rated' apps from Software 
+      Center in 'Apps Available for Download' before user performs any search 
+      if no filters are active. List 100 top rated apps according to active 
+      filters if search string is empty. (LP: #1045762)
+    - Implemented price ribbons for Application Lens search results.
+      (LP: #1049593)
+
+  [ Didier Roche ]
+  * debian/control:
+    - build-dep on latest libunity
+
+ -- Didier Roche <[e-mail]>  Thu, 20 Sep 2012 16:17:10 +0200
+
+unity-lens-applications (6.4.0-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+    - added implementation for previews
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Wed, 22 Aug 2012 21:00:49 +0200
+
+unity-lens-applications (6.2.0-0ubuntu1) quantal-proposed; urgency=low
+
+  * debian/control:
+    - switch to vala version 0.16
+  * New upstream release.
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Fri, 10 Aug 2012 13:13:23 +0200
+
+unity-lens-applications (5.12.0-0ubuntu2) quantal-proposed; urgency=low
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Cherry-pick from upstream:
+    - change icon paths from 5 to 6
+  * debian/control:
+    - add Breaks unity - we won't work with older unity, as icon paths changed
+    - unity-place* does not exist anymore
+
+  [ Didier Roche ]
+  * debian/control, debian/unity-lens-applications.install:
+    - remove unity-place-applications transitional package
+    - locate Vcs-Bzr to canonical path
+
+ -- Didier Roche <[e-mail]>  Mon, 09 Jul 2012 17:44:42 +0200
 
 unity-lens-applications (5.12.0-0ubuntu1) precise-proposed; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-11-05 19:18:41 +0000
+++ debian/control	2012-11-13 19:57:21 +0000
@@ -8,40 +8,28 @@
                pkg-config,
                valac-0.18 (>= 0.18.0),
                libglib2.0-dev (>= 2.27),
-               libgconf2-dev,
                libgee-dev,
                libdee-dev (>= 0.5.16),
                libzeitgeist-dev (>= 0.3.8),
-               libunity-dev (>= 5.2),
+               libunity-dev (>= 6.8.0),
                libgnome-menu-3-dev,
                dh-autoreconf,
                libxapian-dev,
                libdb-dev,
                libapt-pkg-dev,
 Standards-Version: 3.9.3
+Homepage: https://launchpad.net/unity-lens-applications
 # If you aren't a member of ~unity-team but need to upload packaging changes,
 # just go ahead.  ~unity-team will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-applications/trunk
-Homepage: https://launchpad.net/unity-lens-applications
 
 Package: unity-lens-applications
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          unity-common (>= 4.4.0)
-Replaces: unity-place-applications (<< 0.4.0~)
-Breaks: unity-place-applications (<< 0.4.0~)
+Breaks: unity (<< 6.0.0),
 Description: Application lens for unity
  This package contains the "application" lens which can be used
  inside Unity to launch and install applications.
 
-Package: unity-place-applications
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: unity-lens-applications, ${misc:Depends}
-Description: transitional package
- Places are now lenses in unity. This package ensures a clean upgrade path,
- and can be safely removed after the upgrade.
-
-

=== removed file 'debian/unity-lens-applications.install'
--- debian/unity-lens-applications.install	2011-08-04 08:30:33 +0000
+++ debian/unity-lens-applications.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-etc/
-usr/