Merge lp:~alecu/unity-scope-click/merge-trunk6 into lp:unity-scope-click/devel

[Alejandro J. Cura]

Merge tip of trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:358
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/233/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/207
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/207/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/207

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/233/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-14 18:38:55 +0000
+++ debian/changelog	2014-07-23 04:11:49 +0000
@@ -1,3 +1,36 @@
+unity-scope-click (0.1+14.10.20140722-0ubuntu1) utopic; urgency=low
+
+  [ Alejandro J. Cura ]
+  * Explicitly select g++ version 4.9 for ABI stability
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 22 Jul 2014 18:00:13 +0000
+
+unity-scope-click (0.1+14.10.20140718.1-0ubuntu1) utopic; urgency=medium
+
+  [ Alejandro J. Cura (alecu) ]
+  * New upstream release.
+    - Use departments db to provide departments for installed apps.
+    - Populate departments database from the store scope.
+    - A tool for initialization or update of the departments db.
+    - New binary package unity-scope-click-init-departments and data package
+    - Provide default departments db and an upstart job that copies it to
+      user's home directory.
+    - Check for already purchased apps in search results in the store scope.
+      (LP: #1340430)
+    - Fix search button on previews for scopes. (LP: #1333831)
+    - Show the price in search results for apps that have prices.
+    - Updated the translation template. (LP: #1342924)
+    - Use package_appid name format in dconf keys for the 6 core apps.
+    - Added build dependency on libpay1-dev.
+    - Added dependency on pay-service, libsqlite3-0 and
+      unity-scope-click-departmentsdb.
+    - Dropped dependency on sqlite3.
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 18 Jul 2014 19:06:30 +0000
+
 unity-scope-click (0.1+14.10.20140714-0ubuntu1) utopic; urgency=medium
 
   [ Alejandro J. Cura (alecu) ]
 
=== modified file 'debian/control'
--- debian/control	2014-07-17 23:15:30 +0000
+++ debian/control	2014-07-23 04:11:49 +0000
@@ -1,9 +1,12 @@
 Source: unity-scope-click
 Section: x11
 Priority: optional
+# g++-4.9: since we use c++11 features, explicitly select a g++ version
+#          to protect from ABI breaks in libstdc++
 Build-Depends: cmake (>= 2.8.10),
                debhelper (>= 9),
                dh-translations,
+               g++-4.9,
                google-mock,
                intltool,
                libboost-locale-dev,
 
=== modified file 'debian/rules'
--- debian/rules	2014-04-04 16:40:49 +0000
+++ debian/rules	2014-07-23 04:11:49 +0000
@@ -1,4 +1,10 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/default.mk
+
+# Explicitly selecting a G{CC,++}-version here to avoid accidental
+# ABI breaks introduced by toolchain updates.
+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
 
 DH_CMAKE_BUILD_DIR=obj-${DEB_BUILD_GNU_TYPE}
 
 
=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2014-07-21 12:41:31 +0000
+++ libclickscope/click/interface.cpp	2014-07-23 04:11:49 +0000
@@ -494,11 +494,11 @@
                 callback(package_names, InterfaceError::NoError);
             } catch (...) {
                 qWarning() << "Can't parse 'click list' output: " << QString::fromStdString(stdout_data);
-                callback({}, InterfaceError::ParseError);
+                callback(PackageSet(), InterfaceError::ParseError);
             }
         } else {
             qWarning() << "Error" << code << "running 'click list': " << QString::fromStdString(stderr_data);
-            callback({}, InterfaceError::CallError);
+            callback(PackageSet(), InterfaceError::CallError);
         }
     });
 }