Merge ~racb/git-ubuntu:source-builder-changelog-versions into git-ubuntu:master

[Robie Basak]

Make Jenkins happy

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:807840c436efc6719ac3aa5221c8bc3fdf612c10
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/290/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Style Check
    SUCCESS: Unit Tests
    SUCCESS: Integration Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/290/rebuild

review: Approve (continuous-integration)

[Nish Aravamudan (nacc)]

review: Approve

diff --git a/gitubuntu/source_builder.py b/gitubuntu/source_builder.py
index 2cc0bd2..fad1fdb 100644
--- a/gitubuntu/source_builder.py
+++ b/gitubuntu/source_builder.py
@@ -65,6 +65,7 @@ class SourceSpec:
     version = '1'
     native = True
     has_patches = False
+    changelog_versions = None
 
     def __init__(self, **kwargs):
         """Instantiate a new SourceSpec class instance
@@ -72,6 +73,10 @@ class SourceSpec:
         :param str version: the Debian package version string
         :param bool native: True for a native package, False for non-native
         :param bool has_patches: if this package should have quilt patches
+        :param list(str) changelog_versions: if specified, version is ignored,
+            and the changelog is generated with this list of versions instead.
+            changelog_versions[0] is taken to be the version string of the
+            package itself.
 
         Keyword arguments to the constructor map directly to class instances
         properties. Properties may be manipulated after construction.
@@ -120,7 +125,12 @@ class SourceFiles:
 
         :rtype: str
         """
-        return CHANGELOG_TEMPLATE.format(version=self.spec.version)
+        versions = self.spec.changelog_versions or [self.spec.version]
+
+        return "\n".join(
+            CHANGELOG_TEMPLATE.format(version=version)
+            for version in versions
+        )
 
     @property
     def source_format(self):
diff --git a/gitubuntu/source_builder_test.py b/gitubuntu/source_builder_test.py
index b5eb896..cfe1e33 100644
--- a/gitubuntu/source_builder_test.py
+++ b/gitubuntu/source_builder_test.py
@@ -32,6 +32,13 @@ def test_source_create_with_version(repo):
         assert changelog.version == '3'
 
 
+def test_source_create_with_versions(repo):
+    with target.Source(target.SourceSpec(changelog_versions=[3, 4])) as f:
+        tree_hash = importer.dsc_to_tree_hash(repo.raw_repo, f)
+        changelog = repo.get_changelog_from_treeish(tree_hash)
+        assert changelog.all_versions == ['3', '4']
+
+
 @pytest.mark.parametrize('native,expected', [
     (True, b"3.0 (native)\n"),
     (False, b"3.0 (quilt)\n"),