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
=== modified file 'debian/control'
--- debian/control 2013-05-15 07:21:26 +0000
+++ debian/control 2013-06-17 20:48:31 +0000
@@ -1,17 +1,21 @@
1Source: unity-webapps-wordpress1Source: unity-webapps-wordpress
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://wordpress.com/wp-admin/8Homepage: https://wordpress.com/wp-admin/
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-wordpress/trunk
912
10Package: unity-webapps-wordpress13Package: unity-webapps-wordpress
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},
15Replaces: unity-webapps-wordpress-com (<< 2.4.15)19Replaces: unity-webapps-wordpress-com (<< 2.4.15)
16XB-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.php20XB-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
17XB-Ubuntu-Webapps-Name: wordpress21XB-Ubuntu-Webapps-Name: wordpress
1822
=== modified file 'debian/copyright'
--- debian/copyright 2013-05-03 01:06:30 +0000
+++ debian/copyright 2013-06-17 20:48:31 +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
=== modified file 'wordpress.user.js'
--- wordpress.user.js 2013-05-03 01:06:30 +0000
+++ wordpress.user.js 2013-06-17 20:48:31 +0000
@@ -7,7 +7,7 @@
7// ==/UserScript==7// ==/UserScript==
88
9// This placeholder gets munged with real data at build time.9// This placeholder gets munged with real data at build time.
10const WebappsGettextDict = JSON.parse(unescape(10var WebappsGettextDict = JSON.parse(unescape(
11 "%7B%22GETTEXT%22%3A%22PLACEHOLDER%22%7D"11 "%7B%22GETTEXT%22%3A%22PLACEHOLDER%22%7D"
12));12));
1313

Subscribers

People subscribed via source and target branches

to all changes: