[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. upstream/1.2.1-12-gf2f16c1

Stephane Glondu steph at glondu.net
Sun Oct 12 14:34:26 UTC 2008


The following commit has been merged in the master branch:
commit f2f16c133c0c6e736545f9825cc46d0e1c2e3f00
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Oct 12 16:30:29 2008 +0200

    Clarifications in README.source

diff --git a/debian/README.source b/debian/README.source
index 1acdefb..5c1a098 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -33,14 +33,22 @@ cloning:
       git add -f -u
       git add -f debian/patches
       git commit "Releasing ${VERSION}"
- 4. Build the package (and tag):
+ 6. Build the package (and tag):
       git-buildpackage \
         --git-pristine-tar --git-tag \
         --git-debian-branch=build [options]
 
-During development/tests, steps 3 and 5 (and --git-tag) are not
-needed, and you may use git-buildpackage with the master branch
-instead of build, provided you git-ignore debian/patches.
+During development/tests, you can work directly on branch master,
+provided you tell git to ignore debian/patches. You can then skip
+steps 3 and 5, and forget --git-tag and --git-debian-branch options in
+step 6:
+
+  git-buildpackage --git-pristine-tar [options]
+
+Notes:
+ - don't commit serialized patches into master
+ - don't commit patched sources into master ("git status" will be
+   meaningful only after "debclean")
 
 
 3. Known problems

-- 
nurpawiki packaging



More information about the Pkg-ocaml-maint-commits mailing list