[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/3.0.1-1-8-gbc4f455

[Ralf Treinen]

The following commit has been merged in the master branch:
commit bc4f4552bd5f3251104c6d41d4ce4dcb487b6c4f
Author: Ralf Treinen <treinen at debian.org>
Date:   Wed Jun 27 11:24:40 2012 +0200

    fix upstream version number
    
    patch the version in configure.ac, call aclocal and autoconf before configure

diff --git a/debian/changelog b/debian/changelog
index fefd206..cb7b657 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,12 @@ dose3 (3.0.2-1) unstable; urgency=low
     - fix typo Licence -> License
   * debian/rules: in clean target, remove doc/debcheck-primer/version.tex
     since it should be generated.
+  * fix the version number that upstream forgot to bump:
+    - add patch version-3.0.2
+    - add automake and autoconf to build-dependencies
+    - call aclocal and autconf in the configure target of debian/rules
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 25 Jun 2012 18:12:28 +0200
+ -- Ralf Treinen <treinen at debian.org>  Wed, 27 Jun 2012 11:24:15 +0200
 
 dose3 (3.0.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f7307f0..9eb9727 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stefano Zacchiroli <zack at debian.org>,
  Ralf Treinen <treinen at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), dh-ocaml (>= 0.9~),
+ automake, autoconf,
  ocaml-nox (>= 3.11.1-3~), camlp4,
  libpcre-ocaml-dev,
  libextlib-ocaml-dev,
diff --git a/debian/patches/series b/debian/patches/series
index 9dceec7..c377e65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 binaries-prefix-edos
+version-3.0.2
diff --git a/debian/patches/version-3.0.2 b/debian/patches/version-3.0.2
new file mode 100644
index 0000000..2c0f8cb
--- /dev/null
+++ b/debian/patches/version-3.0.2
@@ -0,0 +1,13 @@
+Author: Ralf Treinen <treinen at debian.rg>
+Description: fix upstream versin which really is 3.0.2
+
+Index: dose3/configure.ac
+===================================================================
+--- dose3.orig/configure.ac	2012-06-27 11:07:06.000000000 +0200
++++ dose3/configure.ac	2012-06-27 11:21:50.000000000 +0200
+@@ -1,4 +1,4 @@
+-AC_INIT(dose3, 3.0.1, pietro.abate at pps.jussieu.fr)
++AC_INIT(dose3, 3.0.2, pietro.abate at pps.jussieu.fr)
+ 
+ AC_PROG_OCAML
+ if test "$OCAMLC" = "no"; then
diff --git a/debian/rules b/debian/rules
index 954ee2b..769eeeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@ RELEASE = $(shell dpkg-parsechangelog | grep ^Version: | cut -f 2 -d' ')
 
 override_dh_auto_configure:
 	rm -f doc/debcheck-primer/version.tex
+	aclocal -I m4
+	autoconf
 	./configure --with-ocamlgraph --with-zip --with-bz2 --with-rpm4
 
 override_dh_auto_install:

-- 
dose3 packaging