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

[Alejandro J. Cura]

Merge trunk back in.

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-22 18:00:13 +0000
+++ debian/changelog	2014-07-25 14:17:24 +0000
@@ -1,3 +1,27 @@
+unity-scope-click (0.1+14.10.20140724-0ubuntu1) utopic; urgency=medium
+
+  [ Alejandro J. Cura (alecu) ]
+  * New upstream release.
+    - Get department from .desktop files of preinstalled apps.
+    - Remove fallback to old server API. (LP: #1343280)
+    - Only show apps category title when in the root of departments hierarchy.
+    - Change the order of screenshot and header widgets.
+    - Pass current department from Apps scope to Store scope.
+    - Always open existing departments db, no need to initialize.
+    - Move departments db concurrency tests to integration. (LP: #1346548)
+    - i18n pluralization fixes. (LP: #1346110)
+    - Updated translation template. (LP: #1342924)
+    - Updated translations.
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 24 Jul 2014 13:19:05 +0000
+
+unity-scope-click (0.1+14.10.20140723.1-0ubuntu1) utopic; urgency=low
+
+  [ thomas-voss ]
+  * Adjust build dependency on libpay*-dev
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 23 Jul 2014 12:08:54 +0000
+
 unity-scope-click (0.1+14.10.20140722-0ubuntu1) utopic; urgency=low
 
   [ Alejandro J. Cura ]

=== modified file 'debian/control'
--- debian/control	2014-07-22 18:00:00 +0000
+++ debian/control	2014-07-25 14:17:24 +0000
@@ -12,7 +12,7 @@
                libboost-locale-dev,
                libglib2.0-dev (>= 2.32),
                libjsoncpp-dev,
-               libpay1-dev,
+               libpay2-dev,
                libubuntu-download-manager-client-dev (>= 0.3+14.10.20140430-0ubuntu1),
                libubuntu-download-manager-common-dev (>= 0.3+14.10.20140430-0ubuntu1),
                libubuntuoneauth-2.0-dev,

=== modified file 'scope/clickstore/CMakeLists.txt'
--- scope/clickstore/CMakeLists.txt	2014-07-16 21:49:11 +0000
+++ scope/clickstore/CMakeLists.txt	2014-07-25 14:17:24 +0000
@@ -3,7 +3,7 @@
 find_package (Qt5Core REQUIRED)
 find_package (Qt5Sql REQUIRED)
 pkg_check_modules(JSON_CPP REQUIRED jsoncpp)
-pkg_check_modules(LIBPAY REQUIRED pay-1)
+pkg_check_modules(LIBPAY REQUIRED pay-2)
 
 add_definitions(
   -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"