Your message dated Fri, 12 Feb 2021 13:03:59 +0000
with message-id <[email protected]>
and subject line Bug#932520: fixed in dgit 9.13
has caused the Debian Bug report #932520,
regarding dgit-maint-*(7): Advice for git-debpush users
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
932520: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=932520
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dgit
Version: 9.3
Tags: patch
Hello,
Please find attached a docs patch to let dgit-maint-*(7) readers know
what quilt mode options they would need to patch to git-debpush.
--
Sean Whitton
From 1dee144c272a298314d0c4832186fda019ad9d8d Mon Sep 17 00:00:00 2001
From: Sean Whitton <[email protected]>
Date: Sat, 20 Jul 2019 11:56:43 +0100
Subject: [PATCH] dgit-maint-*(7): Advice for git-debpush users
dgit-maint-native(7) doesn't need updating because git-debpush(1) is
clear that quilt mode options are required only for non-native
packages.
This commit leaves `dgit push{,-source}` as the first choice, with
git-debpush(1) given as an alternative. We might want to change that
in the future, but for the time being this makes sense.
Signed-off-by: Sean Whitton <[email protected]>
---
dgit-maint-debrebase.7.pod | 4 ++++
dgit-maint-gbp.7.pod | 3 +++
dgit-maint-merge.7.pod | 16 ++++++++++------
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index 9c9598bb..e122c20c 100644
--- a/dgit-maint-debrebase.7.pod
+++ b/dgit-maint-debrebase.7.pod
@@ -484,6 +484,10 @@ fast-forwarding from the history on B<dgit-repos>. In such cases you
will have to pass I<--overwrite> to dgit. git-debrebase will normally
tell you if this will be needed.
+If you want to upload with git-debpush(1), for the first upload you
+should pass the B<--quilt=linear> quilt mode option (see
+git-debpush(1)).
+
Right before uploading, if you did not just already do so, you might
want to have git-debrebase(1) shuffle your branch such that the Debian
delta queue appears right at the tip of the branch you will push:
diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod
index b8abd66c..1988a317 100644
--- a/dgit-maint-gbp.7.pod
+++ b/dgit-maint-gbp.7.pod
@@ -127,6 +127,9 @@ history. (This origin commit would represent the most recent non-dgit
upload of the package, but this should already be represented in your
git history.)
+Alternatively, you can use git-debpush(1). For the first upload you
+should pass the B<--gbp> quilt mode option (see git-debpush(1)).
+
=head1 INCORPORATING NMUS
B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 0ccd8c7e..ea2c7765 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -343,12 +343,16 @@ dgit(1). If any command fails, dgit will provide a carefully-worded
error message explaining what you should do. If it's not clear, file
a bug against dgit. Remember to pass I<--new> for the first upload.
-As an alternative to B<dgit build> and friends, you can use a tool
-like gitpkg(1). This works because like dgit, gitpkg(1) enforces that
-HEAD has exactly the contents of the source package. gitpkg(1) is
-highly configurable, and one dgit user reports using it to produce and
-test multiple source packages, from different branches corresponding
-to each of the current Debian suites.
+If you want to upload with git-debpush(1), for the first upload you
+should pass the B<--quilt=smash> quilt mode option (see
+git-debpush(1)).
+
+As another alternative to B<dgit build> and friends, you can use a
+tool like gitpkg(1). This works because like dgit, gitpkg(1) enforces
+that HEAD has exactly the contents of the source package. gitpkg(1)
+is highly configurable, and one dgit user reports using it to produce
+and test multiple source packages, from different branches
+corresponding to each of the current Debian suites.
If you want to skip dgit's checks while iterating on a problem with
the package build (for example, you don't want to commit your changes
--
2.20.1
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
Source: dgit
Source-Version: 9.13
Done: Ian Jackson <[email protected]>
We believe that the bug you reported is fixed in the latest version of
dgit, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Ian Jackson <[email protected]> (supplier of updated dgit package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Fri, 12 Feb 2021 12:48:15 +0000
Source: dgit
Architecture: source
Version: 9.13
Distribution: unstable
Urgency: medium
Maintainer: Ian Jackson <[email protected]>
Changed-By: Ian Jackson <[email protected]>
Closes: 932520 952442 981344
Changes:
dgit (9.13) unstable; urgency=medium
.
* gitattributes defuse: work even if .git/info/attributes missing
(Closes: #981344)
* dgit-maint-*(7): Advice for git-debpush users.
Closes:#932520. [Sean Whitton]
* dgit.1: drop remark about sbuild not building arch-independent.
Closes:#952442. [Helmut Grohne]
Checksums-Sha1:
06aecba0b90928df651a2e4f3c8992eee7fb6130 1846 dgit_9.13.dsc
69af072bd1094bd7bbbcd29a4657f5144c0e2b51 695631 dgit_9.13.tar.gz
Checksums-Sha256:
64159e4bb1aaf74fb05b391cfe44e5108131d6c2cb3c028e51359b4933bbe87c 1846
dgit_9.13.dsc
323b12180e31e37d06125fbced99073f922356c7efc3a0052ad81b082a66f8d7 695631
dgit_9.13.tar.gz
Files:
a5d39a6eb3bea47aa02e8276764d9750 1846 devel optional dgit_9.13.dsc
83d8fa54857b3853ddc43e21cae43e7b 695631 devel optional dgit_9.13.tar.gz
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEEVZrkbC1rbTJl58uh4+M5I0i1DTkFAmAmeVAACgkQ4+M5I0i1
DTmSJAf8CrJvtXWpUfcOum9kTZvaHqsvcB5gR1CPxzTr9ZrPZWsOZOuTTz04o6xP
WqfGIT1n1e5FwS4LTTuSrlz0heMPbGSfcSYIhAvdKeBlbddttEwRQS2+FmIYaCXB
BOqcTE/gpkH99RA40jgxeZNO43KRXb6XHVpRe9XJmtw5gWz+8Z6qEEuEbxyanJyX
utwDTgTPQCUCQGRhuWpffs6mLtytIWjaQl9R3TRijVw1e/ThXgv1R4v9UKrv9iBq
FOlJq8Rzz8MbrfANG3L5XWoUcIoIzN2VE0nAT49gYuEd1URNVZIekOuCcWfkpoge
WIdS5oUrnzMzuU5qAFHaps2oHp4S8w==
=kBiz
-----END PGP SIGNATURE-----
--- End Message ---
