diff options
| author | agx <agx@web> | 2010-09-12 18:11:36 +0200 |
|---|---|---|
| committer | Wiki User <wikwik@wiki.sigxcpu.org> | 2010-09-12 18:11:36 +0200 |
| commit | fce450bc9e813aa3a08e9931b72c81eb9d1979b1 (patch) | |
| tree | 9597a2b22301306d1db2a49cd34ff0b0095aef4b /development/debian_packages_in_git.mdwn | |
| parent | c1bd21c53ee4baa38aaed73429ee8e0902ff3103 (diff) | |
Backports are simpler nowadays
Diffstat (limited to 'development/debian_packages_in_git.mdwn')
| -rw-r--r-- | development/debian_packages_in_git.mdwn | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/development/debian_packages_in_git.mdwn b/development/debian_packages_in_git.mdwn index 78b469f..fb24c62 100644 --- a/development/debian_packages_in_git.mdwn +++ b/development/debian_packages_in_git.mdwn @@ -116,15 +116,11 @@ I keep backports on a separate *bpo-<release>* branch like *bpo-lenny*: git merge debian/<version-currently-in-testing> <resolve conflict in debian/changelog> <fix up stuff needed for backport> - gbp-lenny -sa -v <last-backported-version> --git-debian-branch=bpo-lenny + git-buildpackage --git-pbuilder --git-dist=lenny -sa -v <last-backported-version> --git-debian-branch=bpo-lenny -*gbp-lenny* is a shell alias: - - alias gbp-lenny='nice -19 git-buildpackage --git-builder=gbp-cowbuilder-lenny' - -and *gbp-cowbuilder-lenny* uses */usr/share/doc/git-buildpackage/examples/gbp-cowbuilder-sid*: - - ln -s /usr/share/doc/git-buildpackage/examples/gbp-cowbuilder-sid ~/bin/gbp-cowbuilder-lenny +In order to avoid the merge conflict in the changelog have a look at *dpkg-mergechangelogs(1)*. To create the necessary cowbuilder chroot for Lenny use: + + DIST=lenny git-pbuilder create [git documentation]: http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#cleaning-up-history |