Merge lp:~mvo/pkgme/trivial-source-format-default-to-1.0 into lp:pkgme

Proposed by Michael Vogt
Status: Merged
Approved by: James Westby
Approved revision: 118
Merged at revision: 118
Proposed branch: lp:~mvo/pkgme/trivial-source-format-default-to-1.0
Merge into: lp:pkgme
Diff against target: 25 lines (+2/-2)
2 files modified
pkgme/package_files.py (+1/-1)
pkgme/tests/test_package_files.py (+1/-1)
To merge this branch: bzr merge lp:~mvo/pkgme/trivial-source-format-default-to-1.0
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+115195@code.launchpad.net

Commit message

Use source format 1.0 rather than 3.0 (native) to avoid the stripping of .so files.

Description of the change

This branch changes the default debian/source/format from "3.0 (native)" to "1.0" to make it more suitable for a wider range of packaging tasks including packaging binary apps that have (and need) e.g. .so files in their "source" tree.

This is based on the discussion here:
https://code.launchpad.net/~mvo/pkgme/template-for-source-format/+merge/115157

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pkgme/package_files.py'
2--- pkgme/package_files.py 2012-07-05 13:34:22 +0000
3+++ pkgme/package_files.py 2012-07-16 17:53:51 +0000
4@@ -246,7 +246,7 @@
5 filename = "source/format"
6
7 def get_contents(self):
8- return "3.0 (native)\n"
9+ return "1.0\n"
10
11
12 default_package_file_group.add_file_cls(SourceFormat)
13
14=== modified file 'pkgme/tests/test_package_files.py'
15--- pkgme/tests/test_package_files.py 2012-07-05 14:16:12 +0000
16+++ pkgme/tests/test_package_files.py 2012-07-16 17:53:51 +0000
17@@ -428,7 +428,7 @@
18
19 def test_contents(self):
20 package_file = self.get_object()
21- self.assertEqual("3.0 (native)\n", package_file.get_contents())
22+ self.assertEqual("1.0\n", package_file.get_contents())
23
24 def test_overwrite(self):
25 package_file = self.get_object()

Subscribers

People subscribed via source and target branches

to all changes: