Don't assume gzip compression of the orig tarball

diff --git a/docs/chapters/special.sgml b/docs/chapters/special.sgml
index 5c04b9e..cf34904 100644 (file)
--- a/docs/chapters/special.sgml
+++ b/docs/chapters/special.sgml
@@ -121,7 +121,7 @@ git-branch debian
 </programlisting>
     <para>
     This uses <command>apt-get</command> to download the source package,
-    puts the orig.tar.gz on the <option>upstream-branch</option> and the
+    puts the orig tarball on the <option>upstream-branch</option> and the
     Debian changes on the <option>debian-branch</option> (by default
     <emphasis>master</emphasis>). The second command
     creates a branch called <emphasis>debian</emphasis>. Now you can easily

diff --git a/gbp/config.py b/gbp/config.py
index 5c2a2d9..5e8a505 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -145,7 +145,7 @@ class GbpOptionParser(OptionParser):
              'import-msg':
                   "format string for commit message, default is '%(import-msg)s'",
              'pristine-tar':
-                  "use pristine-tar to create .orig.tar.gz, default is '%(pristine-tar)s'",
+                  "use pristine-tar to create orig tarball, default is '%(pristine-tar)s'",
              'filter-pristine-tar':
                   "Filter pristine-tar when filter option is used",
              'filter':

diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index 89ef414..db6f055 100755 (executable)
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -318,7 +318,7 @@ def prepare_output_dir(dir):
 def pristine_tar_build_orig(repo, cp, output_dir, options):
     """
     build orig using pristine-tar
-    @return: True: orig.tar.gz build, False: noop
+    @return: True: orig tarball build, False: noop
     """
     if options.pristine_tar:
         pt = PristineTar()
@@ -466,9 +466,9 @@ def parse_args(argv, prefix):
     orig_group.add_config_file_option(option_name="upstream-tree", dest="upstream_tree")
     orig_group.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar")
     orig_group.add_config_file_option(option_name="force-create", dest="force_create",
-                      help="force creation of orig.tar.gz", action="store_true")
+                      help="force creation of orig tarball", action="store_true")
     orig_group.add_config_file_option(option_name="no-create-orig", dest="no_create_orig",
-                      help="don't create orig.tar.gz", action="store_true")
+                      help="don't create orig tarball", action="store_true")
     orig_group.add_config_file_option(option_name="tarball-dir", dest="tarball_dir", type="path",
                       help="location to look for external tarballs")
     orig_group.add_config_file_option(option_name="compression", dest="comp_type",