Your message dated Mon, 22 Jul 2019 21:08:27 +0000
with message-id <[email protected]>
and subject line Bug#857490: fixed in dgit 9.5
has caused the Debian Bug report #857490,
regarding dgit: conventions for uploading to suites with semantics like 
*-backports
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.)


-- 
857490: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=857490
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dgit
Version: 4.4
Severity: wishlist
X-debbugs-cc: [email protected], [email protected]

Hello,

Here are two ways of managing uploads to -backports with dgit:

1. maintain a stretch-bpo branch, merge the debian/ tags for uploads
   that have migrated to testing, `dch --bpo` and `dgit push-source` to
   backports

2. start a new, temporary branch for each backport, based on the debian/
   tags for uploads that have migrated to testing, `git cherry-pick` any
   needed changes for the backport from dgit/dgit/stretch-backports,
   `dch --bpo`, and then either `git merge -s ours
   dgit/dgit/stretch-backports`, or equivalently, `dgit push-source
   --overwrite`

I have been using (1) because it seems wrong to have a workflow based
around --overwrite, and the cherry-picking stage of (2) is a little
cumbersome.  However, I think that maybe (2) fits better with the
semantics of our -backports suites -- in a sense, backports are
continually rebased on the contents of testing.

In particular, the changelog entry for the upload to backports is meant
to contain a description of all the changes from the version in testing
that were needed in order to backport.  If you use (1), this means that
you have multiple entries in d/changelog with the same text, which
doesn't really make sense in a changelog.[1]

Is this strange debian/changelog reason enough to recommend (2) over
(1), are there other reasons to so recommend, or is the choice between
(2) and (1) just personal preference?  Maybe we need
dgit-maint-backports(7), or maybe we can just leave it to users.

I thought I'd file a bug CCed to relevant people, to see whether this
needs documenting or can just be left as it is.

[1]  Example, from one of my packages:

    ocrmypdf (6.2.0-1~bpo9+1) stretch-backports; urgency=medium

      * Rebuild for stretch-backports.
      * Tighten dependency on qpdf to ensure the backport gets installed.
        With qpdf 7.0.0 or newer, OCRmyPDF produces better output.  So what we
        want to achieve is the semantic meaning of:
            Depends: qpdf
            Recommends: qpdf (>= 7.0.0)
        However, these lines won't cause apt to install qpdf from
        stretch-backports.  So we add a hard dependency on qpdf (>= 7.0.0) to
        ensure that happens, which is most useful to users.

     -- Sean Whitton <[email protected]>  Fri, 11 May 2018 20:01:12 -0700

    ocrmypdf (6.2.0-1) unstable; urgency=medium

      * New upstream release.
      * [elided]

     -- Sean Whitton <[email protected]>  Sat, 05 May 2018 12:12:22 -0700

    ocrmypdf (6.1.2-1~bpo9+1) stretch-backports; urgency=medium

      * Rebuild for stretch-backports.
      * Tighten dependency on qpdf to ensure the backport gets installed.
        With qpdf 7.0.0 or newer, OCRmyPDF produces better output.  So what we
        want to achieve is the semantic meaning of:
            Depends: qpdf
            Recommends: qpdf (>= 7.0.0)
        However, these lines won't cause apt to install qpdf from
        stretch-backports.  So we add a hard dependency on qpdf (>= 7.0.0) to
        ensure that happens, which is most useful to users.

     -- Sean Whitton <[email protected]>  Wed, 11 Apr 2018 14:40:26 -0700

    ocrmypdf (6.1.2-1) unstable; urgency=low

      * New upstream release (Closes: #888917).
      * [elided]

     -- Sean Whitton <[email protected]>  Sat, 31 Mar 2018 11:30:50 -0700

-- 
Sean Whitton

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message ---
Source: dgit
Source-Version: 9.5

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.
Sean Whitton <[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: SHA512

Format: 1.8
Date: Mon, 22 Jul 2019 21:38:19 +0100
Source: dgit
Architecture: source
Version: 9.5
Distribution: unstable
Urgency: medium
Maintainer: Ian Jackson <[email protected]>
Changed-By: Sean Whitton <[email protected]>
Closes: 857490 926656 932459 932477 932536 932612 932630 932694
Changes:
 dgit (9.5) unstable; urgency=medium
 .
   git-debpush [Sean Whitton]:
   * Support ignoring individual checks with --force=check.  Closes:#932459.
   * Check upstream source is identical in the upstream tag.
   * Check that patches are (un)applicable.  Closes:#932477.
   * Check for an unstitched git-debrebase branch.  Closes:#932612.
   * Check for explicitly pushing detached HEAD.
 .
   dgit clone [Ian Jackson]:
   * No longer create an "origin" remote.  Closes:#932694.
 .
   Documentation:
   * dgit-maint-bpo(7): new manpage for maintainers of official Debian
     backports.  Closes:#857490.  [Sean Whitton]
   * git-debrebase(1): make this manpage a less intimidating entry point.
     Closes:#926656.
     [Sean Whitton & Ian Jackson; prompted by feedback from Sam Hartman]
 .
   Miscellaneous:
   * Correct the description of --force in git-debpush(1) [Sean Whitton].
   * git-debrebase(*): fix some crossreferences [Sean Whitton].
     Closes:#932536.
   * Break out git-playtree-setup and rewrite in shell. [Ian Jackson]
   * Fix organisation copyright attribution for Matthew Vernon's
     contributions.  Closes:#932630.
   * HACKING: new document for helping people work on the code. [Ian Jackson]
   * Update Vcs-Git etc. to point to salsa.
Checksums-Sha1:
 ca180efe4ebb7647f9641e41585e5e8fb805fbfc 2131 dgit_9.5.dsc
 8d76f681bd3f1f9d606d32ae445e20c19f4a38b7 688952 dgit_9.5.tar.gz
Checksums-Sha256:
 4c0eb3302e6d0529b8601c2a8ce448cc7e9557de53816bee64589047cbc51e7a 2131 
dgit_9.5.dsc
 d7824911126f7c1a3488d90a05b0bbd257ae7ea5c66c2ab0761dc67e355c11a8 688952 
dgit_9.5.tar.gz
Files:
 62e98c4739b46a16c1becbb63f5d66c2 2131 devel optional dgit_9.5.dsc
 af998cb37cc3c54c1b165a5b39ef1a63 688952 devel optional dgit_9.5.tar.gz

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEm5FwB64DDjbk/CSLaVt65L8GYkAFAl02H1cACgkQaVt65L8G
YkAeDw//WCFSJDhusp7JUVpnGKAwwfb1BmqOYYqJy6kH/nmAOvkdCeNGFFuncIAb
Ohr9dPiZdaOSFwvxvV7peoET9EYlryHgWu+bJ5GC60g5O4OYF9urJl3Q7p2/qxxu
kXBsIz2bj4DjvGuU8FsVx7TN7ca/394X5oPXr0PKNp+DMEcHzHgrGBcHYj94x2NU
xhVfd71jX6nBSVX6vBtBqrbFP4ZKHj8SthKdfVxfWHWYTBUUjiDX6Kmlibju40h5
pOEyCbw1QLZPV4NEd0ItwnblYa/PMZbUtWphbAovJVGoiCsUsJQyaDnCEQt3JfrZ
L7JTRRXPuj08xVmYeKyLYC4iw0G5HYRybEvxrTFrl26iBITr9hsb46tNDGO/RMKA
TdHcwg/uD11R7HmXUIfmMDVeZ0uhYuWAcGBeMmKY9Op3nKTNXN3nFyIueecE8Lhg
QqsfQAA/k8EX24ohJcZEMVxeInNusVcS6UF5yPqesfN5VgN4iHNbWFoZzuF1eHdo
q0uaZHmquyBamZ2z+sIlEjl4JLRoob1/t2il77/FvRrGCjoVlyQM3hbmhgFY+G+v
+zxdJCliBU8fsgjyFecoUvv2KFoF4DJzmy/B0NYQUCesM8DTQFT74kPnziiWjDH6
pk2DCQ1y0bKm8e/bZMObEBpGg+dwkVf8+st1lPzYsKNjjG9jM8s=
=ih71
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to