From 5d6acbe6b9417877a17f9bc66d28f62c4f60a0dc Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Mon, 17 Nov 2008 23:06:17 +0100 Subject: [PATCH] update workflow to make use of tg-export -b Signed-off-by: martin f. krafft --- debian/README.source | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/debian/README.source b/debian/README.source index e6c6f6c..ba9cdd0 100644 --- a/debian/README.source +++ b/debian/README.source @@ -7,7 +7,7 @@ quilt for source packages. The quilt series is, however, generated from the Git repository, using TopGit itself. While subject to change, this currently happens as follows. Please -make sure to have the latest version of TopGit (>= 0.3) installed before +make sure to have the latest version of TopGit (>= 0.5) installed before trying this: 1. Cloning the repository @@ -65,16 +65,13 @@ The upstream tarball for $VERSION can be obtained using pristine-tar: To build the package, you check out the build branch, recreate debian/patches, commit, build, test, upload, tag: - 1. tg create stage-0.4-1 debian/locations - 2. git commit -m'staging 0.4-1' - 3. tg export --quilt debian/patches.new - 4. rm debian/patches.new/stage-* - 5. sed -i '/^stage-/d' debian/patches.new/series - 6. git checkout build && git rm -r debian/patches - 7. mv debian/patches.new debian/patches && git add debian/patches - 8. git commit -m'preparing 0.4-1' - 9. build, test, upload, tag ('debian/topgit-0.4-1') -10. tg delete stage-0.4-1 +1. git checkout build +2. git merge master +3. rm -r debian/patches +4. tg export -b debian/locations --quilt debian/patches +5. git add debian/patches +6. git commit -m'preparing 0.5-1' +7. build, test, upload, tag ('debian/topgit-0.5-1') This process is still very cumbersome and needs to be improved, ideally within TopGit. @@ -90,7 +87,7 @@ then update all TopGit branches: 1. git remote update 2. git checkout master -3. git merge topgit-0.4 +3. git merge topgit-0.5 Now proceed as in the next step. @@ -102,14 +99,13 @@ this procedure: 1. tg summary 2. for every branch that is prefixed with 'D' in the output: git checkout $BRANCH && tg update -3. git checkout build && git merge master 7. Building an upstream tarball ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Until upstream provides official tarballs, the following can be used to create them for Debian: -1. git checkout topgit-0.4 +1. git checkout topgit-0.5 2. git archive --prefix=$(git describe HEAD)/ --verbose HEAD \ | gzip -9 > ../$(git describe HEAD | sed s,-,_,).orig.tar.gz 3. pristine-tar commit ../$(git describe HEAD | sed s,-,_,).orig.tar.gz \ -- 2.30.2