Attached: patch MR: https://salsa.debian.org/agx/git-buildpackage/-/merge_requests/9
Thanks, -- Julien Plissonneau Duquène
From b1c89c303def7942244b40339c7e4b5e22b88895 Mon Sep 17 00:00:00 2001 From: Julien Plissonneau Duquène <[email protected]> Date: Sat, 16 Nov 2024 17:45:50 +0000 Subject: [PATCH] Pass --download-version to uscan Pass --download-version to uscan instead of --download-debversion. Closes: #1087647 --- debian/changelog | 7 +++++++ docs/manpages/gbp-import-orig.xml | 2 +- docs/po/de.po | 2 +- docs/po/gbp.pot | 2 +- gbp/deb/uscan.py | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a208f812..1c960785 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +git-buildpackage (0.9.36) UNRELEASED; urgency=medium + + * Pass --download-version to uscan instead of --download-debversion. + (Closes: #1087647) + + -- Julien Plissonneau Duquène <[email protected]> Sat, 16 Nov 2024 17:43:50 +0000 + git-buildpackage (0.9.35) unstable; urgency=medium [ Guido Günther ] diff --git a/docs/manpages/gbp-import-orig.xml b/docs/manpages/gbp-import-orig.xml index dc2ce199..71859b2e 100644 --- a/docs/manpages/gbp-import-orig.xml +++ b/docs/manpages/gbp-import-orig.xml @@ -121,7 +121,7 @@ <listitem> <para> The upstream version number. With <option>--uscan</option>, passed to - uscan as <option>--download-debversion</option> + uscan as <option>--download-version</option> </para> </listitem> </varlistentry> diff --git a/docs/po/de.po b/docs/po/de.po index 18cc7082..f8240737 100644 --- a/docs/po/de.po +++ b/docs/po/de.po @@ -6830,7 +6830,7 @@ msgstr "" #: manpages/gbp-import-orig.xml:117 msgid "" "The upstream version number. With <option>--uscan</option>, passed to uscan " -"as <option>--download-debversion</option>" +"as <option>--download-version</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> diff --git a/docs/po/gbp.pot b/docs/po/gbp.pot index d5470186..f8d68033 100644 --- a/docs/po/gbp.pot +++ b/docs/po/gbp.pot @@ -6936,7 +6936,7 @@ msgstr "" #: manpages/gbp-import-orig.xml:117 msgid "" "The upstream version number. With <option>--uscan</option>, passed to uscan " -"as <option>--download-debversion</option>" +"as <option>--download-version</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> diff --git a/gbp/deb/uscan.py b/gbp/deb/uscan.py index cf5d545b..7e554a8f 100644 --- a/gbp/deb/uscan.py +++ b/gbp/deb/uscan.py @@ -145,7 +145,7 @@ class Uscan(object): """ cmd = ['uscan', '--symlink', '--destdir=%s' % destdir, '--dehs'] if download_version: - cmd += ['--download-debversion', download_version] + cmd += ['--download-version', download_version] p = subprocess.Popen(cmd, cwd=self._dir, stdout=subprocess.PIPE) out = p.communicate()[0].decode() # uscan exits with 1 in case of up-to-date and when an error occurred. -- GitLab
