Hi there Till,
Le lundi, 11 septembre 2017, 22.49:29 h CEST Till Kamppeter a écrit :
> I would like to have the Debian/Ubuntu package of CUPS have the
> following bugs fixed:
>
> https://github.com/apple/cups/issues/5090
> https://github.com/apple/cups/issues/5100
>
> I want to do this by cherry-picking or in any form backporting the
> appropriate upstream changes on CUPS, but do not know how to do it
> correctly with GIT/git-dpm.
I have indeed failed at documenting this properly, sorry for that. Let's see
if we can fix this hereby.
Let's assume you're preparing a Ubuntu upload on top of the latest Debian
version 2.2.4-6:
* Make sure you have upstream's repository available
git remote add upstream https://github.com/apple/cups.git
git remote update
* Get to a Ubuntu-specific branch
git checkout -b ubuntu/artful debian/2.2.4-6
* Make sure you have the git-dpm branches ready
git dpm prepare
* Checkout the git-dpm "patched" branch, aka patched-ubuntu/master
That branch has all patches as of debian/2.2.4-6; you can use all git
commands to massage it to look like you want. For example, I usually don't
cherry-pick at the HEAD but keep the "manpages-translations.patch" patch
last using interactive rebase.
git dpm checkout-patched
* Cherry-pick your changes
(The -Xours is there because otherwise you usually have to fix cherry-pick
conflicts in CHANGES.md at least)
For each of these commits, you can amend the commit message, and eventually
add a Patch-Name: pseudo-footer to tell git-dpm your desired patch name.
git cherry-pick -Xours 40cc612
git cherry-pick -Xours d2123ae
git cherry-pick -Xours 123cfe0
* Merge back the patched branch and update the quilt patches
(Note that you can add --amend to that command if you're working on the
patch queue without other changes; you can also specify the merge message
if you want to explain what the cherry-picked patches do in a single
merge commit message)
git dpm update-patches
* At this point you have a patched tree with quilt patches on top of the orig
source tarball; write your changelog entry and commit it.
* Don't forget to push your branch to the git repository:
git push git+ssh://git.debian.org/git/printing/cups.git ubuntu/artful
I propose you try the above, and I'll check the result and merge back to the
Debian branch (debian/master). Looking forward to more git dpm magic!
Cheers,
OdyXAttachment:
signature.asc
Description: This is a digitally signed message part.