Merge lp:~maxb/bzr-builddeb/fix-versioning into lp:bzr-builddeb

[Max Bowsher]

There was a bit of a versioning snafu - the debian changelog entry for 2.6 got changed to 2.5.1 and UNRELEASE _after_ it had actually been uploaded to Debian.

Therefore, after this conversation on #bzr yesterday:
<maxb> james_w: Hello, I was hoping to ask you a question about bzr-builddeb. The following revision seems bogus: http://bazaar.launchpad.net/~bzr-builddeb-hackers/bzr-builddeb/trunk/revision/482 - given that 2.6 is tagged and uploaded to Debian and Ubuntu.
<james_w> it does
<maxb> Are you fine with simply reverting that, then?
<james_w> maxb, sure
<vila> james_w, maxb: As long as the info.py get updated too :)

Here's a branch to do so.

[James Westby (james-w)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-10 15:32:53 +0000
+++ debian/changelog	2011-02-16 13:26:53 +0000
@@ -1,28 +1,11 @@
-bzr-builddeb (2.5.1) unstable; urgency=low
+bzr-builddeb (2.7) UNRELEASED; urgency=low
 
   [ James Westby ]
 
-  * Don't fail if asked to use a .bz2 tarball that is already in the desired
-    location. LP: #616786
-  * Don't crash if we are asked to merge-upstream with an unrelated branch.
-    LP: #619614.
-  * Don't strip -n from the version we get in merge-upstream, as some
-    upstreams have this in there, and trying to support both means supporting
-    both badly. If you are used to doing "bzr merge-upstream --version
-    <package version>" then it will no longer work for you, use the
-    upstream version instead.
-  * Don't crash when doing merge-upstream with a branch that does a rename
-    and then ships another file with the old path in the tarball that isn't
-    in the branch.
   * Accept None as a valid previous_version value in merge_upstream(). LP: #680945
 
   [ Jelmer Vernooij ]
 
-  * Fix the auto-detection of merge mode.
-  * Don't crash on merge mode packages where there is no export-upstream
-    if we can't find the tarball.
-  * Determine Bazaar home directory using bzrlib to prevent test
-    isolation issues. LP: #614125
   * Support 'bzr tags --sort=debversion'. Closes #701244.
   * When adding a changelog entry, support git and svn snapshots.
   * Automatically use debian/source/format if package is native. Closes:
@@ -55,6 +38,33 @@
 
  -- Jelmer Vernooij <[e-mail]>  Sun, 06 Feb 2011 14:25:32 +0100
 
+bzr-builddeb (2.6) unstable; urgency=low
+
+  [ James Westby ]
+
+  * Don't fail if asked to use a .bz2 tarball that is already in the desired
+    location. LP: #616786
+  * Don't crash if we are asked to merge-upstream with an unrelated branch.
+    LP: #619614.
+  * Don't strip -n from the version we get in merge-upstream, as some
+    upstreams have this in there, and trying to support both means supporting
+    both badly. If you are used to doing "bzr merge-upstream --version
+    <package version>" then it will no longer work for you, use the
+    upstream version instead.
+  * Don't crash when doing merge-upstream with a branch that does a rename
+    and then ships another file with the old path in the tarball that isn't
+    in the branch.
+
+  [ Jelmer Vernooij ]
+
+  * Fix the auto-detection of merge mode.
+  * Don't crash on merge mode packages where there is no export-upstream
+    if we can't find the tarball.
+  * Determine Bazaar home directory using bzrlib to prevent test
+    isolation issues. LP: #614125
+
+ -- James Westby <[e-mail]>  Wed, 18 Aug 2010 20:12:20 -0400
+
 bzr-builddeb (2.5) unstable; urgency=low
 
   [ Colin Watson ]

=== modified file 'info.py'
--- info.py	2011-02-07 16:36:02 +0000
+++ info.py	2011-02-16 13:26:53 +0000
@@ -18,7 +18,7 @@
 
 bzr_plugin_name = 'builddeb'
 
-bzr_plugin_version = (2, 5, 1, 'dev', 0)
+bzr_plugin_version = (2, 7, 0, 'dev', 0)
 
 bzr_commands = [
     "test_builddeb",