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

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

Commit message

Minor packaging fixups.

To post a comment you must log in.
15. By Robert Bruce Park

Replace const with var.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
16. By Robert Bruce Park

Appease jslint.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
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
1=== modified file 'Twitter.user.js'
2--- Twitter.user.js 2013-05-02 23:53:10 +0000
3+++ Twitter.user.js 2013-06-17 23:19:24 +0000
4@@ -4,27 +4,12 @@
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 window.Unity = external.getUnityObject(1);
14
15-/**
16- * Validates the page for functional tests.
17- *
18- */
19-function selfTest() {
20- if (!getProfileLinkNode() || !getProfileLinkNode().href) {
21- return;
22- }
23- if (!checkMessagesCount().length) {
24- return;
25- }
26-
27- reportTestState('PASS SELF TEST');
28-};
29-
30 function getProfileLinkNode() {
31 return document.evaluate('//a[@data-nav="profile"]', document, null, XPathResult.ANY_UNORDERED_NODE_TYPE, null).singleNodeValue;
32 }
33@@ -68,6 +53,21 @@
34 return indicators;
35 }
36
37+/**
38+ * Validates the page for functional tests.
39+ *
40+ */
41+function selfTest() {
42+ if (!getProfileLinkNode() || !getProfileLinkNode().href) {
43+ return;
44+ }
45+ if (!checkMessagesCount().length) {
46+ return;
47+ }
48+
49+ reportTestState('PASS SELF TEST');
50+}
51+
52 function messagingIndicatorSetup() {
53 var indicatorsController = new Indicators(checkMessagesCount, true);
54 indicatorsController.visited(currentIndicator);
55
56=== modified file 'debian/control'
57--- debian/control 2013-05-15 07:21:10 +0000
58+++ debian/control 2013-06-17 23:19:24 +0000
59@@ -1,17 +1,21 @@
60 Source: unity-webapps-twitter
61 Section: web
62-Priority: extra
63+Priority: optional
64 Standards-Version: 3.9.4
65 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
66 Build-Depends: debhelper (>=9),
67 unity-webapps-dev (>=2.4.16),
68 Homepage: https://twitter.com/
69+# If you aren't a member of ~webapps but need to upload packaging changes,
70+# just go ahead. ~webapps will notice and sync up the code again.
71+Vcs-Bzr: https://code.launchpad.net/~webapps/unity-webapps-twitter/trunk
72
73 Package: unity-webapps-twitter
74 Architecture: all
75 Section: web
76-Priority: extra
77-Depends: unity-webapps-common, xdg-utils, ${misc:Depends}
78+Depends: unity-webapps-common,
79+ xdg-utils,
80+ ${misc:Depends},
81 XB-Ubuntu-Webapps-Includes: https://twitter.com/*
82 XB-Ubuntu-Webapps-Name: Twitter
83 XB-Ubuntu-Webapps-Domain: twitter.com
84
85=== modified file 'debian/copyright'
86--- debian/copyright 2013-05-02 23:53:10 +0000
87+++ debian/copyright 2013-06-17 23:19:24 +0000
88@@ -22,11 +22,6 @@
89 The full text of the can be found in the file
90 '/usr/share/common-licenses/GPL-3'.
91
92-Files: debian/*
93-Copyright: 2012 The friendly pkgme.net robot
94-License: public-domain
95- This automatically generated code which is free from copyright restrictions.
96-
97
98 Files: */*.png */*.svg
99 Copyright: various

Subscribers

People subscribed via source and target branches

to all changes: