diff -Nru mlpost-0.8.1/debian/changelog mlpost-0.8.1/debian/changelog --- mlpost-0.8.1/debian/changelog 2017-07-10 13:03:05.000000000 +0000 +++ mlpost-0.8.1/debian/changelog 2017-07-22 17:30:20.000000000 +0000 @@ -1,20 +1,21 @@ -mlpost (0.8.1-6ubuntu1) artful; urgency=medium +mlpost (0.8.1-8) unstable; urgency=medium - * Skip ocamlbuild vs ocamlc version check, as the two are now separate packages. + * Disable configure check that ocamlbuild has the same version as + ocaml - -- Dimitri John Ledkov Mon, 10 Jul 2017 14:02:59 +0100 + -- Stéphane Glondu Sat, 22 Jul 2017 19:30:20 +0200 -mlpost (0.8.1-6build2) artful; urgency=high +mlpost (0.8.1-7) unstable; urgency=medium - * No change rebuild against ocaml 4.04. + [ Mehdi Dogguy ] + * Update watch file - -- Dimitri John Ledkov Mon, 03 Jul 2017 01:29:41 +0100 + [ Stéphane Glondu ] + * Add ocamlbuild to Build-Depends + * Bump debhelper compat to 10 + * Update Vcs-* -mlpost (0.8.1-6build1) xenial; urgency=medium - - * No-change rebuild against ocaml 4.02. - - -- Łukasz 'sil2100' Zemczak Wed, 04 Nov 2015 18:17:55 -0600 + -- Stéphane Glondu Fri, 21 Jul 2017 17:43:54 +0200 mlpost (0.8.1-6) unstable; urgency=low diff -Nru mlpost-0.8.1/debian/compat mlpost-0.8.1/debian/compat --- mlpost-0.8.1/debian/compat 2014-02-10 19:32:56.000000000 +0000 +++ mlpost-0.8.1/debian/compat 2017-07-21 16:23:00.000000000 +0000 @@ -1 +1 @@ -7 +10 diff -Nru mlpost-0.8.1/debian/control mlpost-0.8.1/debian/control --- mlpost-0.8.1/debian/control 2017-07-10 12:53:28.000000000 +0000 +++ mlpost-0.8.1/debian/control 2017-07-21 16:23:12.000000000 +0000 @@ -1,16 +1,15 @@ Source: mlpost Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian OCaml Maintainers +Maintainer: Debian OCaml Maintainers Uploaders: Stéphane Glondu Build-Depends: - debhelper (>= 7.2.11~), + debhelper (>= 10), dh-ocaml (>= 0.9~), - dh-autoreconf, libcairo-ocaml-dev (>= 20090223-2~), libbitstring-ocaml-dev (>= 2.0.0-5~), camlp4, ocaml-findlib (>= 1.4), + ocamlbuild, ocaml-nox (>= 4.01) Build-Depends-Indep: context (>= 2012.05.23.20120524-1~), @@ -23,8 +22,8 @@ Standards-Version: 3.9.3 Section: tex Homepage: http://mlpost.lri.fr/ -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/mlpost.git -Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/mlpost.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/mlpost.git +Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/mlpost.git Package: mlpost Architecture: any diff -Nru mlpost-0.8.1/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch mlpost-0.8.1/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch --- mlpost-0.8.1/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch 2014-02-10 19:32:56.000000000 +0000 +++ mlpost-0.8.1/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch 2017-07-22 17:29:32.000000000 +0000 @@ -20,4 +20,3 @@ dist-clean distclean:: clean - rm -f Makefile config.cache config.log config.status META version.ml myocamlbuild.ml ocamlbuild.Makefile simple.Makefile + rm -f Makefile config.cache config.log config.status META version.ml myocamlbuild.ml simple.Makefile --- diff -Nru mlpost-0.8.1/debian/patches/0002-Create-man-dir-before-installing-into-it.patch mlpost-0.8.1/debian/patches/0002-Create-man-dir-before-installing-into-it.patch --- mlpost-0.8.1/debian/patches/0002-Create-man-dir-before-installing-into-it.patch 2014-02-10 19:32:56.000000000 +0000 +++ mlpost-0.8.1/debian/patches/0002-Create-man-dir-before-installing-into-it.patch 2017-07-22 17:29:32.000000000 +0000 @@ -20,4 +20,3 @@ cp -f $(BUILD)$(TOOL) $(BINDIR)/mlpost cp -f mlpost.1 $(MANDIR)/man1 --- diff -Nru mlpost-0.8.1/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch mlpost-0.8.1/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch --- mlpost-0.8.1/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch 2014-02-10 19:32:56.000000000 +0000 +++ mlpost-0.8.1/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch 2017-07-22 17:29:32.000000000 +0000 @@ -52,4 +52,3 @@ Don't remove intermediates files. The metapost backend use some intermediates files which are removed without this option. .TP --- diff -Nru mlpost-0.8.1/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch mlpost-0.8.1/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch --- mlpost-0.8.1/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch 2014-02-10 19:32:56.000000000 +0000 +++ mlpost-0.8.1/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch 2017-07-22 17:29:32.000000000 +0000 @@ -29,4 +29,3 @@ flag ["ocaml";"doc"] & S([A"-hide" ; A "Mlpost"; A"-g"; A "customdoc/img.cmo"] @ (if "@LABLGTK2@" = "yes" --- diff -Nru mlpost-0.8.1/debian/patches/0005-Fully-qualify-name-of-input-ed-files.patch mlpost-0.8.1/debian/patches/0005-Fully-qualify-name-of-input-ed-files.patch --- mlpost-0.8.1/debian/patches/0005-Fully-qualify-name-of-input-ed-files.patch 2014-02-10 19:32:56.000000000 +0000 +++ mlpost-0.8.1/debian/patches/0005-Fully-qualify-name-of-input-ed-files.patch 2017-07-22 17:29:32.000000000 +0000 @@ -21,4 +21,3 @@ %%redefinition def doexternalfigure (expr filename) text transformation = --- diff -Nru mlpost-0.8.1/debian/patches/0006-Fix-for-ocamldoc-4.patch mlpost-0.8.1/debian/patches/0006-Fix-for-ocamldoc-4.patch --- mlpost-0.8.1/debian/patches/0006-Fix-for-ocamldoc-4.patch 2014-02-10 19:32:56.000000000 +0000 +++ mlpost-0.8.1/debian/patches/0006-Fix-for-ocamldoc-4.patch 2017-07-22 17:29:32.000000000 +0000 @@ -39,4 +39,3 @@ (* we need to deactivate the -html option of ocamldoc, otherwise our generator * is overwritten by the standard html generator. Ocamlbuild gives the -html * option to ocamldoc, so this is really required *) --- diff -Nru mlpost-0.8.1/debian/patches/0007-Disable-configure-check-that-ocamlbuild-has-the-same.patch mlpost-0.8.1/debian/patches/0007-Disable-configure-check-that-ocamlbuild-has-the-same.patch --- mlpost-0.8.1/debian/patches/0007-Disable-configure-check-that-ocamlbuild-has-the-same.patch 1970-01-01 00:00:00.000000000 +0000 +++ mlpost-0.8.1/debian/patches/0007-Disable-configure-check-that-ocamlbuild-has-the-same.patch 2017-07-22 17:29:32.000000000 +0000 @@ -0,0 +1,21 @@ +From: Stephane Glondu +Date: Sat, 22 Jul 2017 19:29:26 +0200 +Subject: Disable configure check that ocamlbuild has the same version as ocaml + +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 91137f2..4c0f109 100644 +--- a/configure.in ++++ b/configure.in +@@ -175,7 +175,7 @@ else + AC_MSG_RESULT(ok) + fi ;; + *) +- if test "$TMPVER" != "$OCAMLVERSION" ; then ++ if false && test "$TMPVER" != "$OCAMLVERSION" ; then + AC_MSG_ERROR(ocamlbuild version differs from ocamlc. Aborting.) + else + AC_MSG_RESULT(ok) diff -Nru mlpost-0.8.1/debian/patches/series mlpost-0.8.1/debian/patches/series --- mlpost-0.8.1/debian/patches/series 2017-07-10 13:00:14.000000000 +0000 +++ mlpost-0.8.1/debian/patches/series 2017-07-22 17:29:32.000000000 +0000 @@ -4,4 +4,4 @@ 0004-myocamlmacroparser-use-.byte-instead-of-.native.patch 0005-Fully-qualify-name-of-input-ed-files.patch 0006-Fix-for-ocamldoc-4.patch -skip-version-check.patch +0007-Disable-configure-check-that-ocamlbuild-has-the-same.patch diff -Nru mlpost-0.8.1/debian/patches/skip-version-check.patch mlpost-0.8.1/debian/patches/skip-version-check.patch --- mlpost-0.8.1/debian/patches/skip-version-check.patch 2017-07-10 13:02:40.000000000 +0000 +++ mlpost-0.8.1/debian/patches/skip-version-check.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -Description: Skip ocamlbuild vs ocamlc version check, as the two are now separate packages. -Author: Dimitri John Ledkov - ---- mlpost-0.8.1.orig/configure.in -+++ mlpost-0.8.1/configure.in -@@ -164,23 +164,6 @@ fi - AC_PATH_PROG(OCAMLBUILD, ocamlbuild, no) - if test "$OCAMLBUILD" = no; then - AC_MSG_ERROR(Cannot find ocamlbuild.) --else -- AC_MSG_CHECKING(ocamlbuild version) -- TMPVER=`$OCAMLBUILD -version | sed -n -e 's|.*ocamlbuild *\(.*\)$|\1|p' ` -- case $OCAMLVERSION in -- 3.10.1|3.10.2*) -- if test "$TMPVER" != "0.1"; then -- AC_MSG_ERROR(ocamlbuild version differs from ocamlc. Aborting.) -- else -- AC_MSG_RESULT(ok) -- fi ;; -- *) -- if test "$TMPVER" != "$OCAMLVERSION" ; then -- AC_MSG_ERROR(ocamlbuild version differs from ocamlc. Aborting.) -- else -- AC_MSG_RESULT(ok) -- fi ;; -- esac - fi - # Then check that we are dealing with ocamlbuild at the right place - AC_MSG_CHECKING(ocamlbuild place) diff -Nru mlpost-0.8.1/debian/rules mlpost-0.8.1/debian/rules --- mlpost-0.8.1/debian/rules 2017-07-10 12:53:37.000000000 +0000 +++ mlpost-0.8.1/debian/rules 2017-07-21 16:23:12.000000000 +0000 @@ -8,7 +8,7 @@ EXAMPLES_TARBALL = debian/examples.tar.gz %: - dh --with autoreconf,ocaml $@ + dh $@ --with ocaml $(EXAMPLES_TARBALL): tar -czf $(EXAMPLES_TARBALL) --exclude=parse.ml examples diff -Nru mlpost-0.8.1/debian/watch mlpost-0.8.1/debian/watch --- mlpost-0.8.1/debian/watch 2014-02-10 19:32:56.000000000 +0000 +++ mlpost-0.8.1/debian/watch 2017-07-21 16:23:12.000000000 +0000 @@ -1,6 +1,4 @@ -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -http://mlpost.lri.fr/download/ mlpost-([0-9.]+)\.tar\.gz +version=4 +opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%-$1.tar.gz%" \ + https://github.com/backtracking/mlpost/tags \ + (?:.*?/)?version-(\d[\d.]*)\.tar\.gz debian uupdate