Merge lp:~andrewsomething/bzr-builddeb/bts720003 into lp:bzr-builddeb

Proposed by Andrew Starr-Bochicchio
Status: Merged
Merged at revision: 739
Proposed branch: lp:~andrewsomething/bzr-builddeb/bts720003
Merge into: lp:bzr-builddeb
Diff against target: 28 lines (+6/-1)
2 files modified
debian/changelog (+5/-0)
tests/test_import_dsc.py (+1/-1)
To merge this branch: bzr merge lp:~andrewsomething/bzr-builddeb/bts720003
Reviewer Review Type Date Requested Status
Bzr-builddeb-hackers Pending
Review via email: mp+180699@code.launchpad.net

Description of the change

* tests/test_import_dsc.py:
   - As of dpkg 1.17.0, source format '3.0 (native)' strictly
     enforces that native packages do not have a Debian revision.
     Use "0.1" instead of "0.1-1" for the version number in
     test_extract_format3_native (Closes: #720003).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-06-09 18:41:10 +0000
+++ debian/changelog 2013-08-17 17:32:27 +0000
@@ -4,6 +4,11 @@
4 - Explicitly pass '--format=1.0' to dpkg-source inorder to4 - Explicitly pass '--format=1.0' to dpkg-source inorder to
5 silence "no source format specified" warnings printed to5 silence "no source format specified" warnings printed to
6 stderr (Closes: #711042).6 stderr (Closes: #711042).
7 * tests/test_import_dsc.py:
8 - As of dpkg 1.17.0, source format '3.0 (native)' strictly
9 enforces that native packages do not have a Debian revision.
10 Use "0.1" instead of "0.1-1" for the version number in
11 test_extract_format3_native (Closes: #720003).
712
8 -- Andrew Starr-Bochicchio <asb@debian.org> Sun, 09 Jun 2013 14:38:31 -040013 -- Andrew Starr-Bochicchio <asb@debian.org> Sun, 09 Jun 2013 14:38:31 -0400
914
1015
=== modified file 'tests/test_import_dsc.py'
--- tests/test_import_dsc.py 2012-03-02 14:19:19 +0000
+++ tests/test_import_dsc.py 2013-08-17 17:32:27 +0000
@@ -1963,7 +1963,7 @@
1963 extractor.cleanup()1963 extractor.cleanup()
19641964
1965 def test_extract_format3_native(self):1965 def test_extract_format3_native(self):
1966 version = Version("0.1-1")1966 version = Version("0.1")
1967 name = "package"1967 name = "package"
1968 builder = SourcePackageBuilder(name, version, native=True,1968 builder = SourcePackageBuilder(name, version, native=True,
1969 version3=True)1969 version3=True)

Subscribers

People subscribed via source and target branches