From 385808dae0bf04b65e791717ae709ddb094c1328 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 3 Oct 2013 18:25:52 -0300
Subject: Updating development guidelines for a pure pristine-tar build

---
 Makefile         |  4 ----
 development.mdwn | 27 ++++++++++-----------------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 5a84ffe..0379ea0 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,3 @@ build_man:
 
 tarball:
 	git archive --prefix=keyringer-$(VERSION)/ --format=tar HEAD | bzip2 >../tarballs/keyringer-$(VERSION).tar.bz2
-
-dh:
-	#dh_make -f ../tarballs/keyringer-$(VERSION).tar.bz2 -i -p keyringer_$(VERSION)
-	git archive --prefix=keyringer-$(VERSION)/ --format=tar HEAD | bzip2 >../tarballs/keyringer_$(VERSION).orig.tar.bz2
diff --git a/development.mdwn b/development.mdwn
index 1313e9a..d312bf2 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -44,29 +44,15 @@ Prepare the source code:
     $EDITOR ChangeLog
     make build_man
 
-Update debian changelog:
-
-    cd debian
-    dch -i
-    cd -
-
 Commit and tag a release:
 
     git commit -a -m "Keyringer $VERSION"
     git tag -s $VERSION -m "Keyringer $VERSION"
-    git checkout upstream
-    git merge    master
-    git checkout debian
-    git merge    upstream
 
 Create a release file:
 
     make tarball
 
-Generate a `keyringer_VERSION.orig.tar.bz2` file:
-
-    make dh
-
 Sign the release ([see backupninja development guidelines](https://labs.riseup.net/code/projects/backupninja/wiki/Release)):
 
     cd ../tarballs
@@ -77,15 +63,17 @@ Upload the release:
     scp keyringer-$VERSION.tar.bz2* server:/var/sites/keyringer/releases/
     cd -
 
-Add the release into the `pristine-tar` branch:
+Update the debian branch:
 
-    pristine-tar commit ../tarballs/keyringer_$VERSION.orig.tar.bz2 $VERSION
+    git checkout debian
+    git-import-orig --upstream-vcs-tag=$VERSION ../tarballs/keyringer-$VERSION.tar.bz2
+    dch -e # fine tune the changelog prepared by git-dch
 
 Push everything:
 
     git push --tags
 
-Build the package from the git three using the upstream branch:
+Build the package from the debian Git branch:
 
     git-buildpackage
 
@@ -94,6 +82,11 @@ Run lintian (or [add it to your pbuilder hooks](http://askubuntu.com/questions/1
     lintian --info --display-info --pedantic --color auto \
      ../build-area/keyringer_$VERSION*.changes
 
+Notes:
+
+* `git-import-orig` takes care of running `pristine-tar commit`, of merging of the tag and orig tarball into the upstream branch, and then it merges the result into the debian branch. With the above configuration, it also runs git-dch to do the bulk of the work in `debian/changelog`.
+* To build a development package, checkout the debian branch, merge master, run `git-dch --auto --snapshot` and build. 
+
 Adding a subcommand
 -------------------
 
-- 
cgit v1.2.3