From 56fb67dacc852133359f442056841cf321d574e0 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 12 May 2015 07:50:31 +0200 Subject: [PATCH] debian/README.source: Update git-buildpackage commands for the renames in 0.6.24 git-buildpackage and gbp-pq are no more, it's all subcommands of "gbp" now. --- debian/README.source | 24 ++++++++++++------------ debian/changelog | 2 ++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/debian/README.source b/debian/README.source index 3b55a8885..a1de845e0 100644 --- a/debian/README.source +++ b/debian/README.source @@ -4,11 +4,11 @@ Install “git-buildpackage” and run the following steps: gbp-clone git+ssh://git.debian.org/git/pkg-systemd/systemd.git cd systemd - git-buildpackage + gbp buildpackage We recommend you use pbuilder to make sure you build in a clean environment: - git-buildpackage --git-pbuilder + gbp buildpackage --git-pbuilder Patch handling -------------- @@ -18,12 +18,12 @@ add or modify patches, but you might prefer using a git commit based approach. gbp-pq provides that by synthesizing a "patch-queue/" local branch which represents each quilt patch as git commit. You create this with - gbp-pq import --force + gbp pq import --force Then you are in the patch-queue branch and can git log, commit, cherry-pick upstream commits, rebase, etc. there. After you are done, run - gbp-pq export + gbp pq export which will put you back into master and update debian/patches/ (including series). You need to git add etc. new patches, add a changelog and other @@ -31,7 +31,7 @@ packaging changes, and then debcommit as usual. Rebasing patches to a new upstream version ------------------------------------------ -gbp-pq's "rebase" command does not work very conveniently as it fails on merge +gbp pq's "rebase" command does not work very conveniently as it fails on merge conflicts. First, ensure you are in the master branch: git checkout master # in case you aren't already @@ -41,10 +41,10 @@ Now, do one of (1) To import a new upstream release into the existing master branch for unstable, do: - gbp-pq import --force - gbp-pq switch # switch back to master from patch-queue/master - git-import-orig [...] - gbp-pq switch # switch to patch-queue/master + gbp pq import --force + gbp pq switch # switch back to master from patch-queue/master + gbp import-orig [...] + gbp pq switch # switch to patch-queue/master git rebase master (2) To import a new upstream release into a new branch for Debian experimental, do: @@ -52,14 +52,14 @@ do: git branch experimental git checkout experimental editor debian/gbp.conf # set "debian-branch=experimental" - git-import-orig [...] + gbp import-orig [...] git branch patch-queue/experimental patch-queue/master git checkout patch-queue/experimental git rebase experimental Now resolve all the conflicts, skip obsolete patches, etc. When you are done, run - gbp-pq export + gbp pq export Note that our debian/gbp.conf disables patch numbers. @@ -75,6 +75,6 @@ with the already existing "upstream" branch from git-buildpackage: Now you can look at the upstream log and cherry-pick patches into the patch-queue branch: - gbp-pq import --force + gbp pq import --force git log fdo/master git cherry-pick 123DEADBEEF diff --git a/debian/changelog b/debian/changelog index 4c2a85887..531937de4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ systemd (219-9) UNRELEASED; urgency=medium try and enable the nonexisting unit then. (LP: #1447807) * Drop Add-env-variable-for-machine-ID-path.patch. systemd should always be installed via the essential "init" in buildd schroots now. + * debian/README.source: Update git-buildpackage commands for the renames in + 0.6.24. -- Martin Pitt Tue, 05 May 2015 15:14:03 +0200 -- 2.39.5