unity-scope-click

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

  1. merge-trunk
  2. Merge into devel
Proposed by dobey
Status: Merged
Approved by: Paweł Stołowski
Approved revision: no longer in the source branch.
Merged at revision: 398
Proposed branch: lp:~dobey/unity-scope-click/merge-trunk
Merge into: lp:unity-scope-click/devel
Diff against target: 157 lines (+42/-10)
8 files modified
data/CMakeLists.txt (+2/-2)
data/clickscope.ini.in.in (+4/-1)
data/com.canonical.scopes.clickstore.ini.in.in (+4/-1)
debian/changelog (+22/-0)
debian/unity-scope-click.install (+4/-2)
po/am.po (+2/-1)
po/km.po (+2/-1)
po/sv.po (+2/-2)
To merge this branch: bzr merge lp:~dobey/unity-scope-click/merge-trunk
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+230738@code.launchpad.net

Commit message

Merge changes from trunk.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
lp:~dobey/unity-scope-click/merge-trunk updated
397. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

Revision history for this message
Paweł Stołowski (stolowski) wrote :

LGTM

review: Approve
lp:~dobey/unity-scope-click/merge-trunk updated
398. By Michal Hruby

Merge changes from trunk.

Approved by Pawel Stolowski, PS Jenkins bot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2014-08-05 10:00:46 +0000
3+++ data/CMakeLists.txt 2014-08-14 02:13:22 +0000
4@@ -30,12 +30,12 @@
5 )
6
7 install(
8- FILES clickscope-screenshot.jpg apps-scope.svg store-scope-icon.svg
9+ FILES clickscope-screenshot.jpg ubuntu-store-scope.png store-scope-icon.svg
10 DESTINATION "${STORE_DATA_DIR}"
11 )
12
13 install(
14- FILES clickscope-screenshot.jpg apps-scope.svg
15+ FILES clickscope-screenshot.jpg apps-scope.png
16 DESTINATION "${APPS_DATA_DIR}"
17 )
18
19
20=== added file 'data/apps-scope.png'
21Binary files data/apps-scope.png 1970-01-01 00:00:00 +0000 and data/apps-scope.png 2014-08-14 02:13:22 +0000 differ
22=== modified file 'data/clickscope.ini.in.in'
23--- data/clickscope.ini.in.in 2014-07-25 13:11:26 +0000
24+++ data/clickscope.ini.in.in 2014-08-14 02:13:22 +0000
25@@ -3,5 +3,8 @@
26 _Description=Scope for searching the installed click apps
27 Author=Canonical Ltd.
28 Art=@APPS_DATA_DIR@/clickscope-screenshot.jpg
29-Icon=@APPS_DATA_DIR@/apps-scope.svg
30+Icon=@APPS_DATA_DIR@/apps-scope.png
31 _SearchHint=Search apps
32+
33+[Appearance]
34+LogoOverlayColor=#ffffffff
35
36=== modified file 'data/com.canonical.scopes.clickstore.ini.in.in'
37--- data/com.canonical.scopes.clickstore.ini.in.in 2014-07-25 13:11:26 +0000
38+++ data/com.canonical.scopes.clickstore.ini.in.in 2014-08-14 02:13:22 +0000
39@@ -3,5 +3,8 @@
40 _Description=Scope for searching the click app store
41 Author=Canonical Ltd.
42 Art=@STORE_DATA_DIR@/clickscope-screenshot.jpg
43-Icon=@STORE_DATA_DIR@/apps-scope.svg
44+Icon=@STORE_DATA_DIR@/ubuntu-store-scope.png
45 _SearchHint=Search store
46+
47+[Appearance]
48+LogoOverlayColor=#26000000
49
50=== added file 'data/ubuntu-store-scope.png'
51Binary files data/ubuntu-store-scope.png 1970-01-01 00:00:00 +0000 and data/ubuntu-store-scope.png 2014-08-14 02:13:22 +0000 differ
52=== modified file 'debian/changelog'
53--- debian/changelog 2014-08-05 13:11:42 +0000
54+++ debian/changelog 2014-08-14 02:13:22 +0000
55@@ -1,3 +1,25 @@
56+unity-scope-click (0.1.1+14.10.20140811-0ubuntu1) utopic; urgency=medium
57+
58+ [ Michal Hruby ]
59+ * Updated scope icons
60+
61+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 11 Aug 2014 19:08:26 +0000
62+
63+unity-scope-click (0.1+14.10.20140807.1-0ubuntu1) utopic; urgency=medium
64+
65+ [ Alejandro J. Cura (alecu) ]
66+ * New upstream release.
67+ - After uninstall, show the dash instead of a canned query. (LP: #1352879)
68+ - A separate category for available scopes. (LP: #1350565)
69+ - Changes in department database to better match store departments.
70+ (LP: #1352451)
71+ - Updated translations.
72+
73+ [ Ubuntu daily release ]
74+ * New rebuild forced
75+
76+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 07 Aug 2014 02:48:46 +0000
77+
78 unity-scope-click (0.1+14.10.20140805-0ubuntu1) utopic; urgency=medium
79
80 [ Alejandro J. Cura (alecu) ]
81
82=== modified file 'debian/unity-scope-click.install'
83--- debian/unity-scope-click.install 2014-07-14 16:21:26 +0000
84+++ debian/unity-scope-click.install 2014-08-14 02:13:22 +0000
85@@ -1,7 +1,9 @@
86 usr/lib/*/unity-scopes/*
87 usr/lib/unity-scope-click/*
88-usr/share/unity/scopes/clickstore/*
89+usr/share/unity/scopes/clickstore/*jpg
90+usr/share/unity/scopes/clickstore/*png
91+usr/share/unity/scopes/clickstore/*svg
92 usr/share/unity/scopes/clickapps/*jpg
93-usr/share/unity/scopes/clickapps/*svg
94+usr/share/unity/scopes/clickapps/*png
95 usr/share/glib-2.0/schemas/*
96 usr/share/locale/*/LC_MESSAGES/unity-scope-click.mo
97
98=== modified file 'po/am.po'
99--- po/am.po 2014-08-05 06:48:02 +0000
100+++ po/am.po 2014-08-14 02:13:22 +0000
101@@ -6,11 +6,12 @@
102 msgid ""
103 msgstr ""
104 "Project-Id-Version: unity-scope-click\n"
105-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
106+"Report-Msgid-Bugs-To: \n"
107 "POT-Creation-Date: 2014-07-28 17:25-0400\n"
108 "PO-Revision-Date: 2014-08-04 20:24+0000\n"
109 "Last-Translator: samson <Unknown>\n"
110 "Language-Team: Amharic <am@li.org>\n"
111+"Language: am\n"
112 "MIME-Version: 1.0\n"
113 "Content-Type: text/plain; charset=UTF-8\n"
114 "Content-Transfer-Encoding: 8bit\n"
115
116=== modified file 'po/km.po'
117--- po/km.po 2014-08-05 06:48:02 +0000
118+++ po/km.po 2014-08-14 02:13:22 +0000
119@@ -6,11 +6,12 @@
120 msgid ""
121 msgstr ""
122 "Project-Id-Version: unity-scope-click\n"
123-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
124+"Report-Msgid-Bugs-To: \n"
125 "POT-Creation-Date: 2014-07-28 17:25-0400\n"
126 "PO-Revision-Date: 2014-08-04 10:43+0000\n"
127 "Last-Translator: Sok Sophea <sksophea@gmail.com>\n"
128 "Language-Team: Khmer <km@li.org>\n"
129+"Language: \n"
130 "MIME-Version: 1.0\n"
131 "Content-Type: text/plain; charset=UTF-8\n"
132 "Content-Transfer-Encoding: 8bit\n"
133
134=== modified file 'po/sv.po'
135--- po/sv.po 2014-08-05 06:48:02 +0000
136+++ po/sv.po 2014-08-14 02:13:22 +0000
137@@ -6,18 +6,18 @@
138 msgid ""
139 msgstr ""
140 "Project-Id-Version: unity-scope-click\n"
141-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
142+"Report-Msgid-Bugs-To: \n"
143 "POT-Creation-Date: 2014-07-28 17:25-0400\n"
144 "PO-Revision-Date: 2014-08-04 17:41+0000\n"
145 "Last-Translator: Josef Andersson <Unknown>\n"
146 "Language-Team: Swedish <ubuntu-l10n-sv@lists.launchpad.net>\n"
147+"Language: sv\n"
148 "MIME-Version: 1.0\n"
149 "Content-Type: text/plain; charset=UTF-8\n"
150 "Content-Transfer-Encoding: 8bit\n"
151 "Plural-Forms: nplurals=2; plural=n != 1;\n"
152 "X-Launchpad-Export-Date: 2014-08-05 06:48+0000\n"
153 "X-Generator: Launchpad (build 17147)\n"
154-"Language: sv\n"
155
156 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
157 #: ../scope/clickapps/apps-query.cpp:259

Subscribers

People subscribed via source and target branches

to all changes: