Rev 20: merge watch file fix in file:///home/vila/src/bzr/packaging/maverick/mysru/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/packaging/maverick/mysru/

------------------------------------------------------------
revno: 20 [merge]
revision-id: v.ladeuil+lp at free.fr-20110316134643-10nyabp1lukag3vc
parent: james.westby at ubuntu.com-20100930095715-7kay2yyja6mo6rsz
parent: jelmer at samba.org-20110316105343-58eamz5hkvkm7pzu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mysru
timestamp: Wed 2011-03-16 14:46:43 +0100
message:
  merge watch file fix
modified:
  debian/changelog               changelog-20091205103605-6tjofjz4i5j16zuv-268
  debian/watch                   watch-20091205103605-6tjofjz4i5j16zuv-839
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-09-30 09:57:15 +0000
+++ b/debian/changelog	2011-03-16 10:53:43 +0000
@@ -1,3 +1,9 @@
+bzr (2.2.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * Update watch file to use 2.2 series.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Wed, 16 Mar 2011 11:50:47 +0100
+
 bzr (2.2.1-0ubuntu1) maverick-proposed; urgency=low
 
   * New upstream release.

=== modified file 'debian/watch'
--- a/debian/watch	2008-08-25 19:06:49 +0000
+++ b/debian/watch	2011-03-16 10:53:43 +0000
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/rc/~rc/;s/b/~b/" \
-https://launchpad.net/bzr/+download http://launchpad.net/bzr/.*/bzr-(.+).tar.gz
+opts="uversionmangle=s/rc/~rc/;s/b/~b/;s/^/2.2./" \
+https://launchpad.net/bzr/+download http://launchpad.net/bzr/.*/bzr-2.2.(.+).tar.gz