[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, 312/master, updated. debian/3.11.2-4-42-g49f9260

[Stephane Glondu]

The following commit has been merged in the 312/master branch:
commit 1e0d9bb1d7499ef9e78fb03314c4bbd108cb128c
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Mar 18 16:38:36 2011 +0100

    Add debian/source/local-options

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/gbp.conf b/debian/gbp.conf
index ef8fd01..d84e16c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,4 @@
 [DEFAULT]
 pristine-tar = True
-cleaner = debuild clean && dh_quilt_unpatch && dh_clean
 upstream-branch = 312/upstream
 debian-branch = 312/master
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches

-- 
OCaml packaging