[git-buildpackage] A gbp workflow question re pq & patches

[Seamus de Mora]

> Hi,
> On Tue, May 10, 2022 at 12:54:45AM -0500, Seamus de Mora wrote:
> > Hello,
> >
> > I am working to convert the debian source package for 'dhcpcd5-8.1.2' to
> a
> > 'git' repository. The basis for this source package was obtained here (
> >
> https://archive.raspberrypi.org/debian/pool/main/d/dhcpcd5/dhcpcd5_8.1.2-1+rpt5.dsc
> > ). For purposes of this question, I'll refer to this as the
> > 'dhcpcd5_8.1.2-1+rpt5'
> > source package.
> >
> > My import was done as follows:
> >
> > 'gbp import-dsc --pristine-tar dhcpcd5_8.1.2-1+rpt5.dsc'
> >
> > Which has yielded a new folder: '~/dhcpcd5';
> >
> > $ git -C /home/pi/dhcpcd5 branch -a
> > > * master
> > >   pristine-tar
> > >   upstream
> > >
> >
> > It seems time to consider the patches that were included in
> > 'dhcpcd5_8.1.2-1+rpt5'.
> > There are currently 4 patches in 'dhcpcd5_8.1.2-1+rpt5', and in
> `dhcpcd5`.
> > Before starting this effort, I had assumed that the patch system used in
> > Debian packages would become useless when the package was cast as a 'git'
> > repo. However, having now read 'man gbp-pq', I understand patches may be
> > carried into git packages.
>
> If you have a "3.0 (quilt)" source package like dhcpcd5 then patches are
> maintained in  `debian/patches`. The `patch-queue/*` branches are just
> there to ease the maintenance of that folder.


I don't see a `patch-queue/*` branch. As noted above, 'branch -a' reports
only 3 branches.
Where are these branches kept - or have they not been created yet?

>From inspection of my 'dhcpcd5' repo:
1. 'debian/patches' does exist, and it contains 5 files (4 patches & a
'series' file)
2. 'quilt --version' reports '0.66'


> > That said, I don't know if patches are required - or if they are included
> > in gbp for convenience or legacy considerations. Can you explain this
> > situation for me, please? I'd like for this git package to be generally
> > useful for all, so if I can achieve this without patches, I think I'd
> > prefer that approach.
>
> I recommend to read up on the 3.0 (quilt) source format:
>
>    https://wiki.debian.org/Projects/DebSrc3.0
>
> to understand how patches are maintained in that source package
> format. Is then just a layer on top allow you to use git commands
> instead of quilt for your local repository work.


I have read the reference 'DebSrc3.0'. The problem for people like me is
that this wiki assumes background knowledge that I simply do not have.
Further confusing is the use of 'quilt' and '3.0(quilt)'; this implies that
the author is perhaps referring to "old" quilt vs "new" quilt, but
assumptions become uncomfortable when they must be stacked so high!

And I went on to read a bit of 'dpkg-source' which helped clarify the wiki
just a wee bit. I hope you can forgive my becoming a bit frustrated at this
point. I know it's not your job to hold my hand, and explain all of this,
but I don't why an answer to my question should require absorption of all
that Debian packages have been or ever will be. That said, let me try
re-phrasing my question re "patches":

Q: In my gbp-created 'dhcpcd5' git repo - as it stands now - must I carry
forward a "patching system", OR may I simply apply the current patches to
the sources, and carry on without a "patching system". In other words, is
it possible to have a Debian package in which all changes are handled via
the mechanisms of 'git' rather than the mechanisms of a "patching system"?

If this is not an answer you feel you can give, I understand. However, your
opinion on the question would still be very useful to me. I will pick some
of these things up as I go along, but I must keep going to learn.

Thank you for your patience,
~S
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sigxcpu.org/pipermail/git-buildpackage/attachments/20220510/3e59d2ab/attachment.html>