Merge lp:~mvo/pkgme/template-for-source-format into lp:pkgme

[Michael Vogt]

This adds the ability for backends to customize the source format. In v3 there is a relatively big "tar_ignore_default_pattern" that will e.g. strip out .so and so on. In v1 this is not the case so pkgme-binary will default to v1.

[James Westby (james-w)]

Hi,

Should we just default to v1 for everything?

Thanks,

James

[Michael Vogt (mvo)]

On Mon, Jul 16, 2012 at 02:58:17PM -0000, James Westby wrote:
> Hi,
>
> Should we just default to v1 for everything?

We can do that as well, I don't mind either way too much. My gut
feeling is that for source apps "3.0 (native)" is nice, even nicer
would be to have "3.0 (quilt)" and generate a orig.tar.gz
automatically when pkgme is run. The default ignore pattern is only a
problem for binary stuff and otherwise actually quite useful as it
filters out CVS dirs and similar by default.

Cheers,
 Michael

[James Westby (james-w)]

On Mon, 16 Jul 2012 15:49:22 -0000, Michael Vogt <email address hidden> wrote:
> We can do that as well, I don't mind either way too much. My gut
> feeling is that for source apps "3.0 (native)" is nice, even nicer
> would be to have "3.0 (quilt)" and generate a orig.tar.gz
> automatically when pkgme is run. The default ignore pattern is only a
> problem for binary stuff and otherwise actually quite useful as it
> filters out CVS dirs and similar by default.

I think we should aim for one format for everything for now, and if 1.0
is the format needed for binary games let's use that.

The reason we set 3.0 (native) in debian/source/format was to avoid the
prompt when there was no tarball that debuild gives you.

If setting 1.0 explicitly doesn't avoid that prompt then we'll have to
use something else I think.

Thanks,

James

[Michael Vogt (mvo)]

I reject this branch based on this feedback and create a new one that adds "debian/soruce/format" "1.0" instead

[James Westby (james-w)]

review: Approve

Unmerged revisions

118. By Michael Vogt on 2012-07-16

allow overwrite for the debian/source/format

=== modified file 'pkgme/info_elements.py'
--- pkgme/info_elements.py	2012-07-05 13:42:09 +0000
+++ pkgme/info_elements.py	2012-07-16 14:31:26 +0000
@@ -345,3 +345,12 @@
     a default copyright template that the user needs to fill in.
     """
 
+
+class SourceFormatString(InfoElement):
+    
+    name = 'source_format'
+    default = '3.0 (native)'
+    description = """The debian source format string.
+    
+    This can e.g. "1.0", "3.0 (quilt)" or "3.0 (native)".
+    """

=== modified file 'pkgme/package_files.py'
--- pkgme/package_files.py	2012-07-05 13:34:22 +0000
+++ pkgme/package_files.py	2012-07-16 14:31:26 +0000
@@ -25,6 +25,7 @@
     Maintainer,
     PackageName,
     Section,
+    SourceFormatString,
     TagLine,
     Version,
     )
@@ -239,14 +240,14 @@
 default_package_file_group.add_file_cls(Control)
 
 
-class SourceFormat(DebianPackageFile):
+class SourceFormat(DebianPackageFile, TemplatePackageFile):
 
-    elements = []
+    elements = [
+        SourceFormatString,
+        ]
 
     filename = "source/format"
-
-    def get_contents(self):
-        return "3.0 (native)\n"
+    template = "source/format"
 
 
 default_package_file_group.add_file_cls(SourceFormat)

=== added directory 'pkgme/templates/source'
=== added file 'pkgme/templates/source/format'
--- pkgme/templates/source/format	1970-01-01 00:00:00 +0000
+++ pkgme/templates/source/format	2012-07-16 14:31:26 +0000
@@ -0,0 +1,1 @@
+$source_format