Package: git-buildpackage Version: 0.8.18 Severity: minor Tags: patch thanks
Hi, I was looking in the manual for information on starting from scratch with an upstream git and found it a little terse for newbies like me. Please would you consider applying the attached patches. The published version [1] was tagged 0.9.0~exp3 but the text is the same in the sid version. I was not quite sure what to say about the --no-checkout argument; something like this seems appropriate The <replaceable>debian/sid</replaceable> branch will start empty. Over time only debian packaging changes will be added here, usually just the <filename>debian/</filename> directory. but I may be misunderstanding. I also have a related question. The upstream repository has no tags; what should one tell gpb to do in this case? One can invent versions like 0~yymmdd [2] and apply such tags locally but that doesn't seem quite right. Kind regards Vince [1] http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.UPSTREAM-GIT [2] https://www.debian.org/doc/manuals/maint-guide/first.en.html#namever
>From 5fedfb4801933d80bbef804106971d288ea17169 Mon Sep 17 00:00:00 2001 From: mci156 <vincent.mcint...@csiro.au> Date: Fri, 18 Aug 2017 15:46:12 +1000 Subject: [PATCH 1/2] Add paragraph break --- docs/chapters/import.sgml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml index d45522d..f8432e3 100644 --- a/docs/chapters/import.sgml +++ b/docs/chapters/import.sgml @@ -338,7 +338,10 @@ upstream-tag = v%(version%.%_)s </programlisting> The above makes sure we have <replaceable>debian/sid</replaceable> for the &debian; packaging. We didn't create any <replaceable>upstream/*</replaceable> branches; they're not needed for the packaging and only need to be - kept up to date. After adding the &debian; packaging, we build the package. This assumes you're using &pristine-tar; + kept up to date. + </para> + + <para>After adding the &debian; packaging, we build the package. This assumes you're using &pristine-tar; and upstream uses a version number format as described above: <programlisting> <command>gbp buildpackage</command> --git-pristine-tar --git-pristine-tar-commit --git-upstream-tag='v%(version)s' --git-debian-branch=debian/sid -- 2.1.4
>From 7bc2c824164c6953956269822d6ee7c9b718bde2 Mon Sep 17 00:00:00 2001 From: mci156 <vincent.mcint...@csiro.au> Date: Fri, 18 Aug 2017 15:58:54 +1000 Subject: [PATCH 2/2] Explain the v1.0 <starting point> --- docs/chapters/import.sgml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml index f8432e3..2e9c97f 100644 --- a/docs/chapters/import.sgml +++ b/docs/chapters/import.sgml @@ -338,7 +338,7 @@ upstream-tag = v%(version%.%_)s </programlisting> The above makes sure we have <replaceable>debian/sid</replaceable> for the &debian; packaging. We didn't create any <replaceable>upstream/*</replaceable> branches; they're not needed for the packaging and only need to be - kept up to date. + kept up to date. We started the branch at the commit corresponding to the tag <replaceable>v1.0</replaceable>. </para> <para>After adding the &debian; packaging, we build the package. This assumes you're using &pristine-tar; -- 2.1.4