Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #8748

Re: using git-dpm or plain git-buildpackage in PAPT and DPMT

Show all headers | View raw

On Wed, 10 Aug 2016 at 16:41:40 -0400, Barry Warsaw wrote:
> * With git-dpm we *had* to enforce the tool choice because git-dpm's artifacts
>   had to be preserved. If we ditch git-dpm, is that still the case?  IOW, if
>   you choose to use gbp-pq, am I forced to do so when I modify the same repo?

You do not have to choose gbp-pq. You do have to use some tool that
copes with:

* a git repository with patches unapplied but present in debian/patches/
* no other special metadata present in git (you can optionally commit a
  debian/gbp.conf, and I would recommend it, but it isn't required)

In particular this rules out dgit (which wants a patches-applied tree)
and git-dpm (which wants a patches-applied tree with its own metadata).

In practice this means you can build with either gbp buildpackage, or plain
dpkg-buildpackage/debuild; and you can manage the patches either with gbp pq,
with quilt, or (in simple cases) by running git format-patch in an
upstream-tracking repository, dropping the results into debian/patches/
and modifying debian/patches/series with a text editor.

gbp pq works best if all repository users stick to the dialect of DEP-3
where all Debian-specific pseudo-headers appear at the end of the diff
(next to the Signed-off-by if any), so that it looks a lot like git
format-patch output (canonically with the leading From_ line and the
trailing signature omitted, although if they're present in input it
will of course cope). This is basically also what git-dpm generates,
so it should be familiar to DPMT people already. Good for gbp-pq:

    From: Donald Duck <donald@example.com>
    Date: Fri, 01 Apr 2016 12:34:00 +0100
    Subject: Reticulate splines correctly

    This regressed in 2.0.

    In particular, this broke embiggening.

    Origin: vendor, Debian
    Forwarded: http://bugs.example.org/123
    ---
    [diff goes here]

Not good for gbp-pq (it works OK, but an import/export round-trip will
mangle the metadata if you don't take steps to preserve it):

    Author: Donald Duck <donald@example.com>
    Description: Reticulate splines correctly
     This regressed in 2.0.
     .
     In particular, this broke embiggening.
    Last-update: Fri, 01 Apr 2016 12:34:00 +0100
    Origin: vendor, Debian
    Forwarded: http://bugs.example.org/123
    ---
    [diff goes here]

Regards,
    S

Back to linux.debian.maint.python | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

pypi2deb 1.20160809 and --profile dpmt Piotr Ożarowski <piotr@debian.org> - 2016-08-09 21:30 +0200
  Re: pypi2deb 1.20160809 and --profile dpmt Daniel Stender <stender@debian.org> - 2016-08-10 00:00 +0200
    Re: pypi2deb 1.20160809 and --profile dpmt Barry Warsaw <barry@debian.org> - 2016-08-10 00:10 +0200
    PAPT Git (was: pypi2deb 1.20160809 and --profile dpmt) "W. Martin Borgert" <debacle@debian.org> - 2016-08-10 01:00 +0200
      Re: PAPT Git (was: pypi2deb 1.20160809 and --profile dpmt) Sandro Tosi <morph@debian.org> - 2016-08-10 09:30 +0200
        Re: PAPT Git Piotr Ożarowski <piotr@debian.org> - 2016-08-10 09:40 +0200
        Re: using git-dpm or plain git-buildpackage in PAPT and DPMT (was:  PAPT Git) Thomas Goirand <zigo@debian.org> - 2016-08-10 10:20 +0200
          Re: using git-dpm or plain git-buildpackage in PAPT and DPMT (was:  PAPT Git) "W. Martin Borgert" <debacle@debian.org> - 2016-08-10 11:00 +0200
          Re: using git-dpm or plain git-buildpackage in PAPT and DPMT (was: PAPT Git) Brian May <bam@debian.org> - 2016-08-10 12:50 +0200
            Re: using git-dpm or plain git-buildpackage in PAPT and DPMT (was:  PAPT Git) Barry Warsaw <barry@debian.org> - 2016-08-10 16:20 +0200
          Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Nikolaus Rath <Nikolaus@rath.org> - 2016-08-10 21:00 +0200
            Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Barry Warsaw <barry@debian.org> - 2016-08-10 22:50 +0200
              Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Simon McVittie <smcv@debian.org> - 2016-08-11 01:20 +0200
                Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Barry Warsaw <barry@debian.org> - 2016-08-11 15:30 +0200
                Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Simon McVittie <smcv@debian.org> - 2016-08-11 18:10 +0200
              Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Thomas Goirand <zigo@debian.org> - 2016-08-15 23:50 +0200
                Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Barry Warsaw <barry@debian.org> - 2016-08-16 00:00 +0200
            Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Raphael Hertzog <hertzog@debian.org> - 2016-08-10 23:00 +0200
              Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Brian May <bam@debian.org> - 2016-08-12 12:40 +0200
            Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Sergio Durigan Junior <sergiodj@sergiodj.net> - 2016-08-13 00:00 +0200
              Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Barry Warsaw <barry@debian.org> - 2016-08-13 00:40 +0200
                Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Sergio Durigan Junior <sergiodj@sergiodj.net> - 2016-08-16 22:40 +0200
                Re: using git-dpm or plain git-buildpackage in PAPT and DPMT IOhannes m zmölnig (Debian/GNU)  <umlaeute@debian.org> - 2016-08-31 23:50 +0200
                Re: using git-dpm or plain git-buildpackage in PAPT and DPMT Barry Warsaw <barry@debian.org> - 2016-09-02 21:20 +0200
  Re: pypi2deb 1.20160809 and --profile dpmt IOhannes m zmölnig (Debian/GNU)  <umlaeute@debian.org> - 2016-08-31 23:50 +0200

csiph-web