Hello Fabrice,
(I'm assuming you're not subscribed to d-printing@, so CC'ing you; don't
hesitate to contradict me; I'll stop further CCs)
Le jeudi, 1 avril 2021, 23.54:55 h CEST Fabrice Bauzac-Stehly a écrit :
> I would like to make a merge request to fix Bug#793675:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=793675
That's really awesome, thanks already!
> I'm acknowledgingly not yet very experienced in packaging. I'm hitting
> an issue when I try to apply all the patches in debian/patch/series of the
> hplip source package, and I need help. Here is what I do:
>
> <checkout git@salsa.debian.org:printing-team/hplip.git>
> noon@asus:~/git/deb/hplip$ git describe
> debian/3.21.2+dfsg1-2
> noon@asus:~/git/deb/hplip$ git status
> On branch debian/master
> Your branch is up to date with 'origin/debian/master'.
> nothing to commit, working tree clean
Nice. Up, and until this point, everything looks fine.
The canonical reference to check would be debian/README.source, but hplip's is
severely broken; I'll remove it from later uploads.
> noon@asus:~/git/deb/hplip$ gbp pq import
> (…)
> gbp:error: Couldn't apply patches
>
> When checking with dquilt:
>
> noon@asus:~/git/deb/hplip$ dquilt push
> (…)
> Hunk #1 succeeded at 61929 with fuzz 2 (offset 5 lines).
>
> So the patch applies if we allow fuzz; it does not apply cleanly.
That's correct in both cases, because the git repository has the quilt patches
_applied_. In fact, I'm using "git debrebase" to manage patches, in a fashion
quite similar to what's tought in `man 7 dgit-maint-debrebase` (from the dgit
package)
> Did I do a mistake? How do you (hplip Debian maintainers) apply the
> patchset?
So if you want to propose a patch, the easiest is to "juste create a new quilt
patch";
$ quilt new fixing-broken-things.patch # Creates a patch, give it a nice name
$ quilt edit ./COPYING # Edit some file to fix the broken things
$ quilt refresh # Save the patch and series to debian/patches/*
$ # At this point, we're done with quilt
$ git switch -c debian/fix-broken-things
$ git add -A ./debian/patches # Add all the new patches
$ git commit -m "Add a patch to fix things\n\nCloses: #-1"
$ git push ${remote} debian/fix-broken-things
$ # At this point we're done with git
Now head to Salsa and create the MR. That's it.
Out of completeness; the more complicated way to do the same is somewhere
along the lines of the following:
$ git switch -c debian/fix-broken-things
$ git debrebase
$ $EDITOR ./COPYING
$ git add ./COPYING
$ git commit -m "Fix things\n\nCloses: #-1"
$ git debrebase conclude
$ git debrebase make-patches
$ git push ${remote} debian/fix-broken-things
In any case, I'll look at the git history and the resulting patches, will
credit you for it, might commit with you as author, but am also likely to
amend the commit suites.
Also, please be made aware of the current Debian freeze; that is not likely to
make it into Debian bullseye, but for the longer future, it will!
Best regards, and thanks for your involvement!
Cheers,
OdyXAttachment:
signature.asc
Description: This is a digitally signed message part.