Merge lp:~bregma/unity/lp-1121754 into lp:unity

Proposed by Stephen M. Webb
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3175
Proposed branch: lp:~bregma/unity/lp-1121754
Merge into: lp:unity
Diff against target: 8 lines (+2/-1)
1 file modified
debian/watch (+2/-1)
To merge this branch: bzr merge lp:~bregma/unity/lp-1121754
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+150890@code.launchpad.net

Commit message

debian/watch: extend match rule to work with 12.10 and 13.04 releases

Description of the change

= Problem description =

The debian/watch file stopped working after release 6.8 of Unity.

= The fix =

Changed the match rule to (a) match any of the valid tarball file extensions (gz, bz2, xz) so arbitrary uploaders won;t break the system, and (b) trim the Ubuntu packaging version from the upstream version string so the watchfile will continue to work in Raring and beyond.

= Test coverage =

This is a build infrastructure problem mostly affecting downstreams. The only valid test is a manual test of running 'uscan --report --verbose' in the source directory and getting expected results (eg. "Newest version on remote site is 6.12.0, local version is 6.12.0daily13.02.19.1").

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Awesome, confirmed fixes the problem here.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/watch'
2--- debian/watch 2010-11-18 16:51:08 +0000
3+++ debian/watch 2013-02-27 19:41:21 +0000
4@@ -1,2 +1,3 @@
5 version=3
6-https://launchpad.net/unity/+download .*/unity-([0-9.]+)\.tar\.bz2
7+opts=dversionmangle=s/daily.*// \
8+ https://launchpad.net/unity/+download .*/unity-([0-9.]+)\.tar\.(?:xz|bz2|gz)