diff options
Diffstat (limited to 'development')
| -rw-r--r-- | development/debian_packages_in_git.mdwn | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/development/debian_packages_in_git.mdwn b/development/debian_packages_in_git.mdwn index fb24c62..f7c71cb 100644 --- a/development/debian_packages_in_git.mdwn +++ b/development/debian_packages_in_git.mdwn @@ -56,6 +56,9 @@ Assuming the Debian source package has it's patches in *debian/patches* and thes git add -a debian/patches/ git commit -m 'my first patch' +If you want to pick the changelog message from the patch see +*/usr/share/doc/git-buildpackage/examples/gbp-add-patch*. + ### Team maintenance The easiest way is to not push out any patch-queue/* branches at all. They can be recreated by any team member easily by using @@ -67,6 +70,12 @@ However you *can* push out patch-queue branches. Other team members must just be # Working with 3.0 (quilt) packges The 3.0 (quilt) format applies the patches in *debian/patches* automatically when building a source package. If you want your debian branch to contain the unpatched source there are several ways to handle this: + +## Using debian/source/local-options +You can use *unapply-patches* in *debian/source/local-options* to unapply the +patches after the build. +*/usr/share/doc/git-buildpackage/examples/gbp-configure-unpatched-source* will +this set up for you when run from inside a git repository of a Debian package. ## Using --git-export-dir If you're using option *--git-export-dir* option already there's no problem since the unpatched source tree gets exported before being built (and patch by dpkg-source). Since this implies an extra copy of the whole source tree (which might be slow for big projects) and it's not really necessary when using pbuilder the next method might be more appropriate. |