From: Stephane Glondu <steph@glondu.net>
Date: Sun, 18 Apr 2010 12:20:00 +0000 (+0200)
Subject: New branches for OCaml 3.12 packaging
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~354
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0f07af5fba0b27ed44a6f3f7896ad8872c062f3d;p=ocaml.git

New branches for OCaml 3.12 packaging
---

diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c7..d84e16cf 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,4 @@
 [DEFAULT]
 pristine-tar = True
+upstream-branch = 312/upstream
+debian-branch = 312/master