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

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

Commit message

Minor packaging fixups.

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

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes: