Package: dgit Version: 3.1 Severity: minor Tags: patch `git deborig` has made its way into a release of devscripts, which permits various simplifications to dgit-maint-merge(7).
Thanks. -- System Information: Debian Release: stretch/sid APT prefers testing APT policy: (900, 'testing') Architecture: i386 (i686) Kernel: Linux 4.8.0-1-686-pae (SMP w/2 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages dgit depends on: ii apt 1.4~beta2 ii ca-certificates 20161102 ii coreutils 8.25-2 ii curl 7.50.1-1 ii devscripts 2.17.0 ii dpkg-dev 1.18.10 ii dput-ng [dput] 1.11 ii git [git-core] 1:2.11.0-1 ii git-buildpackage 0.8.7 ii libdpkg-perl 1.18.10 ii libjson-perl 2.90-1 ii liblist-moreutils-perl 0.416-1+b1 ii libperl5.24 [libdigest-sha-perl] 5.24.1~rc4-1 ii libtext-glob-perl 0.10-1 ii libtext-iconv-perl 1.7-5+b4 ii libwww-perl 6.15-1 ii perl 5.24.1~rc4-1 Versions of packages dgit recommends: ii openssh-client [ssh-client] 1:7.3p1-5 Versions of packages dgit suggests: ii sbuild 0.72.0-2 -- no debconf information -- Sean Whitton
From 4270f64a2f2def463b1df431ae8333f0f4fef097 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhit...@spwhitton.name>
Date: Wed, 11 Jan 2017 08:31:54 -0700
Subject: [PATCH] dgit-maint-merge(7): Use git-deborig(1)
Signed-off-by: Sean Whitton <spwhit...@spwhitton.name>
---
dgit-maint-merge.7.pod | 28 +++++-----------------------
1 file changed, 5 insertions(+), 23 deletions(-)
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 245be4c..0d8b2da 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -34,20 +34,6 @@ that upstream makes available for download.
=back
-=head1 GIT CONFIGURATION
-
-Add the following to your ~/.gitconfig to teach git-archive(1) how to
-compress orig tarballs:
-
-=over 4
-
- [tar "tar.xz"]
- command = xz -c
- [tar "tar.gz"]
- command = gzip -c
-
-=back
-
=head1 INITIAL DEBIANISATION
This section explains how to start using this workflow with a new
@@ -94,16 +80,15 @@ unless you also happen to be involved in upstream development. We
work with upstream tags rather than any branches, except when
forwarding patches (see FORWARDING PATCHES UPSTREAM, below).
-Finally, you need an orig tarball. Generate one with git-archive(1):
+Finally, you need an orig tarball:
=over 4
- % git archive -o ../foo_1.2.2.orig.tar.xz 1.2.2
+ % git deborig
=back
-If you are using the version 1.0 source package format, replace 'xz'
-with 'gz'.
+See git-deborig(1) if this fails.
This tarball is ephemeral and easily regenerated, so we don't commit
it anywhere (e.g. with tools like pristine-tar(1)).
@@ -121,7 +106,7 @@ A convenient way to perform this check is to import the tarball as
described in the following section, using a different value for
'upstream-tag', and then use git-diff(1) to compare the imported
tarball to the release tag. If they are the same, you can use
-upstream's tarball instead of running git-archive(1).
+upstream's tarball instead of running git-deborig(1).
=back
@@ -313,18 +298,15 @@ Once you're satisfied with what will be merged, update your package:
=over 4
- % git archive -o ../foo_1.2.3.orig.tar.xz 1.2.3
% git merge 1.2.3
% dch -v1.2.3-1 New upstream release.
% git add debian/changelog && git commit -m changelog
+ % git deborig
=back
and you are ready to try a build.
-Again, if you are using the version 1.0 source package format, replace
-'xz' with 'gz'.
-
=head2 When upstream releases only tarballs
You will need the I<debian/gbp.conf> from "When upstream releases only
--
2.11.0
signature.asc
Description: PGP signature
