[Pkg-ocaml-maint-commits] [SCM] lablgtkmathview packaging branch, master, updated. debian/0.7.8-5-11-gfe47835

2011-04-21 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 79d4635478687458641b8f5b2d5e30f821e7ba39
Author: Stephane Glondu st...@glondu.net
Date:   Thu Apr 21 09:49:09 2011 +0200

Add debian/source/local-options

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 680cec2..cec628c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,2 @@
 [DEFAULT]
-upstream-branch = upstream
-debian-branch = master
 pristine-tar = True
-cleaner = debuild clean  dh_quilt_unpatch  dh_clean
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches

-- 
lablgtkmathview packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] lablgtkmathview packaging branch, master, updated. debian/0.7.8-5-11-gfe47835

2011-04-21 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit fe47835f3ed8641c6941e3771fd97dceb7701555
Author: Stephane Glondu st...@glondu.net
Date:   Wed Apr 20 19:26:50 2011 +0200

Prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index de66283..66ea007 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-lablgtkmathview (0.7.8-6) UNRELEASED; urgency=low
+lablgtkmathview (0.7.8-6) unstable; urgency=low
+
+  * Team upload
 
   [ Stefano Zacchiroli ]
   * fix package sections to ocaml
@@ -14,7 +16,7 @@ lablgtkmathview (0.7.8-6) UNRELEASED; urgency=low
   * Add debian/watch
   * Bump Standards-Version to 3.9.2 (no changes)
 
- -- Stéphane Glondu glo...@debian.org  Wed, 20 Apr 2011 18:57:16 +0200
+ -- Stéphane Glondu glo...@debian.org  Thu, 21 Apr 2011 09:49:31 +0200
 
 lablgtkmathview (0.7.8-5) unstable; urgency=low
 

-- 
lablgtkmathview packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits