Merge lp:~jelmer/bzr-builddeb/622678-epoch into lp:bzr-builddeb

[Jelmer Vernooij]

Keep the epoch around when generating a new upstream version string.

[James Westby (james-w)]

Great, thanks.

James

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-29 02:11:01 +0000
+++ debian/changelog	2011-01-29 03:32:53 +0000
@@ -34,8 +34,9 @@
   * Add --snapshot option to merge-upstream.
   * 'bzr merge-upstream' now also works in merge mode, and will simply
     add a new entry for new upstream versions.
+  * merge-upstream will now keep epochs around. LP: #622678
 
- -- Jelmer Vernooij <[e-mail]>  Fri, 28 Jan 2011 15:13:22 +0100
+ -- Jelmer Vernooij <[e-mail]>  Sat, 29 Jan 2011 04:29:41 +0100
 
 bzr-builddeb (2.5) unstable; urgency=low
 

=== modified file 'merge_upstream.py'
--- merge_upstream.py	2011-01-24 02:16:17 +0000
+++ merge_upstream.py	2011-01-29 03:32:53 +0000
@@ -180,11 +180,12 @@
     return None
 
 
-def package_version(upstream_version, distribution_name):
+def package_version(upstream_version, distribution_name, epoch=None):
     """Determine the package version for a new upstream.
 
     :param upstream_version: Upstream version string
     :param distribution_name: Distribution the package is for
+    :param epoch: Optional epoch
     """
     assert isinstance(upstream_version, str), \
         "upstream_version should be a str, not %s" % str(
@@ -193,6 +194,7 @@
         ret = Version("%s-0ubuntu1" % upstream_version)
     else:
         ret = Version("%s-1" % upstream_version)
+    ret.epoch = epoch
     return ret
 
 
@@ -231,7 +233,8 @@
                  type(upstream_version))
     entry_description = upstream_merge_changelog_line(upstream_version)
     proc = subprocess.Popen(["dch", "-v",
-            str(package_version(upstream_version, distribution_name)),
+            str(package_version(upstream_version, distribution_name,
+                                changelog.epoch)),
             "-D", "UNRELEASED", "--release-heuristic", "changelog", entry_description],
             cwd=tree.basedir)
     proc.wait()

=== modified file 'tests/test_merge_upstream.py'
--- tests/test_merge_upstream.py	2011-01-17 22:18:44 +0000
+++ tests/test_merge_upstream.py	2011-01-29 03:32:53 +0000
@@ -159,6 +159,10 @@
     self.assertEquals(Version("1.2-1-0ubuntu1"),
         package_version("1.2-1", "ubuntu"))
 
+  def test_ubuntu_with_epoch(self):
+    self.assertEquals(Version("3:1.2-1-0ubuntu1"),
+        package_version("1.2-1", "ubuntu", "3"))
+
 
 class UpstreamMergeChangelogLineTests(TestCase):