summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Stephane Glondu <steph@glondu.net>2010-10-31 10:59:15 +0100
committerGravatar Stephane Glondu <steph@glondu.net>2010-10-31 10:59:15 +0100
commita361346aaab3805ecbed297b005ef31fd6dbfe34 (patch)
tree04832838551bd15724706a2f94d602552d926cd8
parente942f0c9b2c6be2799f0858a11edaf26e17b18f8 (diff)
Add debian/source/local-options
-rw-r--r--.gitignore1
-rw-r--r--debian/gbp.conf1
-rw-r--r--debian/source/local-options2
3 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 16d011c3..75324995 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,3 +102,4 @@ _build
plugins/*/*_mod.ml
myocamlbuild_config.ml
.DS_Store
+.pc
diff --git a/debian/gbp.conf b/debian/gbp.conf
index a469c3a7..dfa07a01 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 = experimental/upstream
debian-branch = experimental/master
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 00000000..c4cf4805
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches