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

Proposed by Robert Bruce Park on 2013-06-17
Status: Merged
Approved by: Robert Bruce Park on 2013-06-17
Approved revision: 21
Merged at revision: 23
Proposed branch: lp:~robru/unity-webapps-amazon/packaging-fixups
Merge into: lp:unity-webapps-amazon
Diff against target: 54 lines (+8/-9)
3 files modified
Amazon.user.js (+1/-1)
debian/control (+7/-3)
debian/copyright (+0/-5)
To merge this branch: bzr merge lp:~robru/unity-webapps-amazon/packaging-fixups
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-06-17
WebApps 2013-06-17 Pending
Review via email: mp+169868@code.launchpad.net

Commit message

Minor packaging fixes.

To post a comment you must log in.
21. By Robert Bruce Park on 2013-06-17

Replace const with var.

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
1=== modified file 'Amazon.user.js'
2--- Amazon.user.js 2013-05-01 22:31:06 +0000
3+++ Amazon.user.js 2013-06-17 20:34:31 +0000
4@@ -4,7 +4,7 @@
5 // ==/UserScript==
6
7 // This placeholder gets munged with real data at build time.
8-const WebappsGettextDict = JSON.parse(unescape(
9+var WebappsGettextDict = JSON.parse(unescape(
10 "%7B%22GETTEXT%22%3A%22PLACEHOLDER%22%7D"
11 ));
12
13
14=== modified file 'debian/control'
15--- debian/control 2013-05-15 07:16:50 +0000
16+++ debian/control 2013-06-17 20:34:31 +0000
17@@ -1,17 +1,21 @@
18 Source: unity-webapps-amazon
19 Section: web
20-Priority: extra
21+Priority: optional
22 Standards-Version: 3.9.4
23 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24 Build-Depends: debhelper (>=9),
25 unity-webapps-dev (>=2.4.16),
26 Homepage: https://amazon.com/
27+# If you aren't a member of ~webapps but need to upload packaging changes,
28+# just go ahead. ~webapps will notice and sync up the code again.
29+Vcs-Bzr: https://code.launchpad.net/~webapps/unity-webapps-amazon/trunk
30
31 Package: unity-webapps-amazon
32 Architecture: all
33 Section: web
34-Priority: extra
35-Depends: unity-webapps-common, xdg-utils, ${misc:Depends}
36+Depends: unity-webapps-common,
37+ xdg-utils,
38+ ${misc:Depends},
39 XB-Ubuntu-Webapps-Includes: https://amazon.com/*
40 XB-Ubuntu-Webapps-Name: Amazon
41 XB-Ubuntu-Webapps-Domain: amazon.com
42
43=== modified file 'debian/copyright'
44--- debian/copyright 2013-05-15 21:05:34 +0000
45+++ debian/copyright 2013-06-17 20:34:31 +0000
46@@ -21,8 +21,3 @@
47 .
48 The full text of the can be found in the file
49 '/usr/share/common-licenses/GPL-3'.
50-
51-Files: debian/*
52-Copyright: 2012 The friendly pkgme.net robot
53-License: public-domain
54- This automatically generated code which is free from copyright restrictions.

Subscribers

People subscribed via source and target branches

to all changes: