Merge lp:~robru/unity-webapps-googlenews/packaging-fixups into lp:unity-webapps-googlenews

Proposed by Robert Bruce Park
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 23
Merged at revision: 22
Proposed branch: lp:~robru/unity-webapps-googlenews/packaging-fixups
Merge into: lp:unity-webapps-googlenews
Diff against target: 72 lines (+10/-10)
4 files modified
GoogleNews.user.js (+2/-2)
debian/control (+7/-3)
debian/copyright (+0/-5)
manifest.json (+1/-0)
To merge this branch: bzr merge lp:~robru/unity-webapps-googlenews/packaging-fixups
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
WebApps Pending
Review via email: mp+169883@code.launchpad.net

Commit message

Minor packaging fixes.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'GoogleNews.user.js'
--- GoogleNews.user.js 2013-05-16 05:15:08 +0000
+++ GoogleNews.user.js 2013-06-17 18:57:52 +0000
@@ -6,7 +6,7 @@
6// ==/UserScript==6// ==/UserScript==
77
8// This placeholder gets munged with real data at build time.8// This placeholder gets munged with real data at build time.
9const WebappsGettextDict = JSON.parse(unescape(9var WebappsGettextDict = JSON.parse(unescape(
10 "%7B%22GETTEXT%22%3A%22PLACEHOLDER%22%7D"10 "%7B%22GETTEXT%22%3A%22PLACEHOLDER%22%7D"
11));11));
1212
@@ -17,7 +17,7 @@
17 var i, elements = document.getElementsByClassName('titletext');17 var i, elements = document.getElementsByClassName('titletext');
18 for (i = 0; i < elements.length; i++) {18 for (i = 0; i < elements.length; i++) {
19 var title = elements[i].textContent;19 var title = elements[i].textContent;
20 res.push({ icon: null, author: _("Google News"), body: title })20 res.push({ icon: null, author: _("Google News"), body: title });
21 }21 }
22 return res;22 return res;
23}23}
2424
=== modified file 'debian/control'
--- debian/control 2013-05-15 07:18:26 +0000
+++ debian/control 2013-06-17 18:57:52 +0000
@@ -1,17 +1,21 @@
1Source: unity-webapps-googlenews1Source: unity-webapps-googlenews
2Section: web2Section: web
3Priority: extra3Priority: optional
4Standards-Version: 3.9.44Standards-Version: 3.9.4
5Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>5Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
6Build-Depends: debhelper (>=9),6Build-Depends: debhelper (>=9),
7 unity-webapps-dev (>=2.4.16),7 unity-webapps-dev (>=2.4.16),
8Homepage: https://news.google.com/8Homepage: https://news.google.com/
9# If you aren't a member of ~webapps but need to upload packaging changes,
10# just go ahead. ~webapps will notice and sync up the code again.
11Vcs-Bzr: https://code.launchpad.net/~webapps/unity-webapps-googlenews/trunk
912
10Package: unity-webapps-googlenews13Package: unity-webapps-googlenews
11Architecture: all14Architecture: all
12Section: web15Section: web
13Priority: extra16Depends: unity-webapps-common,
14Depends: unity-webapps-common, xdg-utils, ${misc:Depends}17 xdg-utils,
18 ${misc:Depends},
15XB-Ubuntu-Webapps-Includes: https://news.google.com/*19XB-Ubuntu-Webapps-Includes: https://news.google.com/*
16XB-Ubuntu-Webapps-Name: GoogleNews20XB-Ubuntu-Webapps-Name: GoogleNews
17XB-Ubuntu-Webapps-Domain: google.com21XB-Ubuntu-Webapps-Domain: google.com
1822
=== modified file 'debian/copyright'
--- debian/copyright 2013-04-30 18:20:17 +0000
+++ debian/copyright 2013-06-17 18:57:52 +0000
@@ -22,11 +22,6 @@
22 The full text of the can be found in the file22 The full text of the can be found in the file
23 '/usr/share/common-licenses/GPL-3'.23 '/usr/share/common-licenses/GPL-3'.
2424
25Files: debian/*
26Copyright: 2012 The friendly pkgme.net robot
27License: public-domain
28 This automatically generated code which is free from copyright restrictions.
29
3025
31Files: */*.png */*.svg26Files: */*.png */*.svg
32Copyright: various27Copyright: various
3328
=== added file 'manifest.json'
--- manifest.json 1970-01-01 00:00:00 +0000
+++ manifest.json 2013-06-17 18:57:52 +0000
@@ -0,0 +1,1 @@
1{"includes":["https://news.google.com/*","http://news.google.com/*"],"requires":["utils.js","google-common.js"],"name":"GoogleNews","scripts":["GoogleNews.user.js"],"maintainer":"Webapps Team <webapps@lists.launchpad.net>","manifest-version":"1.0","integration-version":"2.4","package-name":"GoogleNews","icons":{"128":"128/unity-webapps-google-news.png","48":"48/unity-webapps-google-news.png","52":"52/unity-webapps-google-news.png","64":"64/unity-webapps-google-news.png"},"domain":"google.com","homepage":"http://news.google.com","license":"GPL-3"}

Subscribers

People subscribed via source and target branches

to all changes: