[Pkg-ocaml-maint-commits] [SCM] ocamlduce packaging branch, master, updated. debian/3.11.2.0-1-18-ge87b40c

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 7d968e758da226de9f93d6568f387542870a6bcf
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Apr 20 10:02:09 2010 +0200

    New branches

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 79243c7..814e958 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,9 +1,4 @@
-# Configuration file for git-buildpackage and friends
-
 [DEFAULT]
-# the default branch for upstream sources:
-upstream-branch = upstream
-# the default branch for the debian patch:
-debian-branch = master
-# use pristine-tar:
+upstream-branch = 312/upstream
+debian-branch = 312/master
 pristine-tar = True

-- 
ocamlduce packaging