Merge lp:~james-page/horizon/fix-watch-file into lp:~openstack-ubuntu-testing/horizon/grizzly

Proposed by James Page
Status: Merged
Approved by: Chuck Short
Approved revision: 143
Merged at revision: 143
Proposed branch: lp:~james-page/horizon/fix-watch-file
Merge into: lp:~openstack-ubuntu-testing/horizon/grizzly
Diff against target: 24 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
debian/watch (+2/-2)
To merge this branch: bzr merge lp:~james-page/horizon/fix-watch-file
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+151251@code.launchpad.net

This proposal supersedes a proposal from 2013-03-01.

Description of the change

Fixup watch file

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-02-26 07:36:25 +0000
3+++ debian/changelog 2013-03-01 14:24:30 +0000
4@@ -1,3 +1,10 @@
5+horizon (2013.1.g3-0ubuntu3) UNRELEASED; urgency=low
6+
7+ * d/watch: Update uversionmangle to deal with upstream versioning
8+ changes, remove tarballs.openstack.org.
9+
10+ -- James Page <james.page@ubuntu.com> Fri, 01 Mar 2013 14:11:51 +0000
11+
12 horizon (2013.1.g3-0ubuntu2) raring; urgency=low
13
14 * Recompress static JS and CSS and generate new manifest.json for offline
15
16=== modified file 'debian/watch'
17--- debian/watch 2012-08-29 14:13:07 +0000
18+++ debian/watch 2013-03-01 14:24:30 +0000
19@@ -1,3 +1,3 @@
20 version=3
21-opts="uversionmangle=s/%7E/~/" https://launchpad.net/horizon/+download https://launchpad.net/horizon/.*/.*/.*/horizon-(.*)\.tar\.gz
22-http://tarballs.openstack.org/horizon/ horizon-(\d.*).tar.gz
23+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
24+ https://launchpad.net/horizon/+download https://launchpad.net/horizon/.*/.*/.*/horizon-(.*)\.tar\.gz

Subscribers

People subscribed via source and target branches