summaryrefslogtreecommitdiff
path: root/development
diff options
context:
space:
mode:
authoragx <agx@web>2009-07-22 16:23:48 +0200
committerWiki User <wikwik@wiki.sigxcpu.org>2009-07-22 16:23:48 +0200
commit2a462542c7c5a2a85bca0c180d3f4610bbde05bd (patch)
treea683baf40f0a6fed92ea5cb693a0913c9529387f /development
parent9bc40e1b201926be2e8223ce97238e71f1109ea6 (diff)
build package
Diffstat (limited to 'development')
-rw-r--r--development/debian_packages_in_git.mdwn9
1 files changed, 5 insertions, 4 deletions
diff --git a/development/debian_packages_in_git.mdwn b/development/debian_packages_in_git.mdwn
index ca4c0d4..8c83998 100644
--- a/development/debian_packages_in_git.mdwn
+++ b/development/debian_packages_in_git.mdwn
@@ -12,7 +12,9 @@ Disadvantage:
* no history on the *patch-queue/foo* branch, but you do have the history on *foo* of course.
### Workflow:
-* create *patch-queue* branch and import *debian/patches* onto it using [gbp-pq](http://honk.sigxcpu.org/projects/git-buildpackage/gbp-pq). This assumes the patches are parseable by *git-quiltimport(1)*:
+Assuming the Debian source package has it's patches in *debian/patches* and these are parseable by *git-guiltimport(1)*:
+
+* create *patch-queue* branch and import *debian/patches* onto it using [gbp-pq](http://honk.sigxcpu.org/projects/git-buildpackage/gbp-pq):
cd $REPO
gbp-pq import
@@ -27,14 +29,13 @@ Disadvantage:
gpg-pq export
* commit the result
-
+* update *debian/changelog* (e.g. by running "git-dch -S -a")
+* build the package
* after importing a new upstream version you can use the following commands to refresh *debian/patches*:
gbp-pq rebase
git checkout master
gbp export
-
-
#### Team maintenance
You can push out patch-queue branches. Other team members must just be aware that that branches in the *patch-queue/* namespace are being rebased frequently. But it's actually easier to simply use *gbp-pq import* and keep the patch-queue branch local only.