Merge lp:~mvo/pkgme/add_option_include_binaries into lp:pkgme

[Michael Vogt]

Pass --include-binaries to debuild so that it doesn't fail if there are binary files

If there are icons in the debian directory then debuild will fail the build by default.

This adds a new option to build_source_package() to run dpkg-source with "--include-binaries" so that all binary files in the debian directory (like icons) are automatically added. We could also make this the default I guess given that we control what is written into debian/* and it was effectively what was done before by using the native format.

Note that this is fallout from the move from native to non-native, dpkg-source is then more strict about what can be in debian/* and what can't.

[Michael Vogt (mvo)]

Reject in favour of lp:~mvo/pkgme/dpkg-source-include-binaries-by-default

[James Westby (james-w)]

review: Approve

=== modified file 'pkgme/debuild.py'
--- pkgme/debuild.py	2012-07-20 19:24:04 +0000
+++ pkgme/debuild.py	2012-07-26 14:37:19 +0000
@@ -15,12 +15,14 @@
     raise ValueError("Could not find changes filename")
 
 
-def build_source_package(directory, sign=True):
+def build_source_package(directory, sign=True, include_binaries=False):
     """Build a source package using debuild"""
     build_orig_tar_gz(directory)
     cmd = ['debuild', '--no-lintian', '-S']
     if not sign:
         cmd.extend(['-uc', '-us'])
+    if include_binaries:
+        cmd.append("--source-option=--include-binaries")
     output = run_subprocess(cmd, cwd=directory)
     changes_file = find_changes_file(output)
     return os.path.abspath(os.path.join(directory, changes_file))