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

[Alejandro J. Cura]

Merge debian changelog and control back from trunk

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-15 14:24:40 +0000
+++ debian/changelog	2014-08-22 13:07:21 +0000
@@ -1,3 +1,34 @@
+unity-scope-click (0.1.1+14.10.20140821.1-0ubuntu1) utopic; urgency=medium
+
+  [ Alejandro J. Cura (alecu) ]
+  * New upstream release.
+    - Display Ubuntu logo in the header of apps scope. (LP: #1350610)
+    - Pass the sha512 hash from the details webservice to download manager.
+      (LP: #1330770)
+    - Sort departments alphabetically. (LP: #1354044)
+    - Exclude empty departments from the departments tree in Apps.
+      (LP: #1350609)
+    - Provide updated departments to match latest server changes. Bumped
+      schema to 3.
+    - New script to enable purchases in the scope during beta. (LP: #1356419)
+    - Add dependency on libglib2.0-bin and upstart-bin for script above.
+    - Enable QNetworkDiskCache for http GET requests. (LP: #1351212)
+    - Query download manager for in-progress downloads. (LP: #1234965)
+    - Only show extended info for apps from the store. (LP: #1350571)
+    - Don't expand categories by default in the store. (LP: #1355221)
+    - Do not use static const strings for translations. (LP: #1354501)
+    - Change "All departments" to just "All". (LP: #1351536)
+    - Localize the extra department title in the store. (LP: #1358790)
+    - Updated translations.
+
+  [ Martin Pitt ]
+  * Mark for using language packs.
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 21 Aug 2014 20:40:59 +0000
+
 unity-scope-click (0.1.1+14.10.20140815-0ubuntu1) utopic; urgency=low
 
   [ Rodney Dawes ]

=== modified file 'debian/control'
--- debian/control	2014-08-14 17:07:34 +0000
+++ debian/control	2014-08-22 13:07:21 +0000
@@ -26,6 +26,7 @@
 Homepage: https://launchpad.net/unity-scope-click
 Vcs-Bzr: lp:unity-scope-click
 Xs-Testsuite: autopkgtest
+X-Ubuntu-Use-Langpack: yes
 
 Package: unity-scope-click
 Architecture: armhf i386 amd64