[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, master, updated. debian/5.10-1-1-g4d00a03

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 4d00a03d40a499674ade8e6b0cba20b280ad4796
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Feb 19 11:23:20 2009 +0100

    Merge the 3.11 branch

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

-- 
camlp5 packaging