diff -Nru ocamldsort-0.16.0/debian/changelog ocamldsort-0.16.0/debian/changelog --- ocamldsort-0.16.0/debian/changelog 2017-06-29 09:09:47.000000000 +0000 +++ ocamldsort-0.16.0/debian/changelog 2019-07-22 21:10:49.000000000 +0000 @@ -1,8 +1,16 @@ -ocamldsort (0.16.0-5build1) artful; urgency=high +ocamldsort (0.16.0-6) unstable; urgency=medium - * No change rebuild against ocaml 4.04. + * Update Vcs-* fields to salsa. + * debian/rules: use the --no-parallel option to dh, instead of setting + DEB_BUILD_OPTIONS. + * Standards-Version 4.4.0: + - debian/copyright: use https in format header. + * Build-depend on debhelper-compat, remove file debian/compat. + * Debhelper compatibility level 12 (no change) + * Add as-installed package test. + * debian/copyright: fix link to copyright file GPL-2. - -- Dimitri John Ledkov Thu, 29 Jun 2017 10:09:47 +0100 + -- Ralf Treinen Mon, 22 Jul 2019 18:10:49 -0300 ocamldsort (0.16.0-5) unstable; urgency=medium @@ -62,7 +70,7 @@ [ Ralf Treinen ] * added debian/watch * debian/rules: added targets build-{arch,indep} - * Standards-Version 3.9.3: + * Standards-Version 3.9.3: - debian/copyright: convert to machine-readable format 1.0 * use dh-ocaml (closes: #599325): - debian/rules: rewrite, using dh and dh-ocaml diff -Nru ocamldsort-0.16.0/debian/compat ocamldsort-0.16.0/debian/compat --- ocamldsort-0.16.0/debian/compat 2016-11-05 22:27:07.000000000 +0000 +++ ocamldsort-0.16.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru ocamldsort-0.16.0/debian/control ocamldsort-0.16.0/debian/control --- ocamldsort-0.16.0/debian/control 2017-06-29 09:09:47.000000000 +0000 +++ ocamldsort-0.16.0/debian/control 2019-07-22 21:10:49.000000000 +0000 @@ -1,15 +1,14 @@ Source: ocamldsort Section: ocaml Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian OCaml Maintainers +Maintainer: Debian OCaml Maintainers Uploaders: Ralf Treinen -Build-Depends: debhelper (>= 10), +Build-Depends: debhelper-compat (=12), ocaml-nox (>= 3.09.0), camlp4, dh-ocaml (>= 0.9) -Standards-Version: 3.9.8 +Standards-Version: 4.4.0 Homepage: http://iml.univ-mrs.fr/~ara/programmes.html.en -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ocaml-maint/packages/ocamldsort.git -Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocamldsort.git +Vcs-Git: https://salsa.debian.org/ocaml-team/ocamldsort.git +Vcs-Browser: https://salsa.debian.org/ocaml-team/ocamldsort Package: ocamldsort Architecture: any diff -Nru ocamldsort-0.16.0/debian/copyright ocamldsort-0.16.0/debian/copyright --- ocamldsort-0.16.0/debian/copyright 2016-11-05 16:27:04.000000000 +0000 +++ ocamldsort-0.16.0/debian/copyright 2019-07-22 21:10:49.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ocamldsort Upstream-Contact: Dimitri Ara Source: http://www.math.jussieu.fr/~ara/informatique.html @@ -11,4 +11,4 @@ the Free Software Foundation; either version 2 of the License, or (at your option) any later version. On Debian systems, the complete text of the GNU General Public License can be found in the file - `/usr/share/common-licenses/GPL'. + `/usr/share/common-licenses/GPL-2'. diff -Nru ocamldsort-0.16.0/debian/rules ocamldsort-0.16.0/debian/rules --- ocamldsort-0.16.0/debian/rules 2016-11-06 09:01:32.000000000 +0000 +++ ocamldsort-0.16.0/debian/rules 2019-07-22 21:10:49.000000000 +0000 @@ -3,10 +3,8 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_BUILD_OPTIONS=parallel=1 - %: - dh $@ --with=ocaml + dh $@ --with=ocaml --no-parallel override_dh_auto_configure: ./configure --host=$(DEB_HOST_GNU_TYPE) \ @@ -19,6 +17,3 @@ $(MAKE) install prefix=$(CURDIR)/debian/ocamldsort/usr cd $(CURDIR)/debian/ocamldsort/usr/bin/; \ [ ! -f ocamldsort.opt ] || mv ocamldsort.opt ocamldsort - - - diff -Nru ocamldsort-0.16.0/debian/tests/control ocamldsort-0.16.0/debian/tests/control --- ocamldsort-0.16.0/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ ocamldsort-0.16.0/debian/tests/control 2019-07-22 21:10:49.000000000 +0000 @@ -0,0 +1,2 @@ +Tests: threemodules +Depends: ocamldsort, ocaml-nox diff -Nru ocamldsort-0.16.0/debian/tests/modules/a.ml ocamldsort-0.16.0/debian/tests/modules/a.ml --- ocamldsort-0.16.0/debian/tests/modules/a.ml 1970-01-01 00:00:00.000000000 +0000 +++ ocamldsort-0.16.0/debian/tests/modules/a.ml 2019-07-22 21:10:49.000000000 +0000 @@ -0,0 +1 @@ +B.b () diff -Nru ocamldsort-0.16.0/debian/tests/modules/b.ml ocamldsort-0.16.0/debian/tests/modules/b.ml --- ocamldsort-0.16.0/debian/tests/modules/b.ml 1970-01-01 00:00:00.000000000 +0000 +++ ocamldsort-0.16.0/debian/tests/modules/b.ml 2019-07-22 21:10:49.000000000 +0000 @@ -0,0 +1 @@ +let b () = C.c () diff -Nru ocamldsort-0.16.0/debian/tests/modules/c.ml ocamldsort-0.16.0/debian/tests/modules/c.ml --- ocamldsort-0.16.0/debian/tests/modules/c.ml 1970-01-01 00:00:00.000000000 +0000 +++ ocamldsort-0.16.0/debian/tests/modules/c.ml 2019-07-22 21:10:49.000000000 +0000 @@ -0,0 +1,2 @@ +let c() = + Printf.printf "Hello, world.\n" diff -Nru ocamldsort-0.16.0/debian/tests/threemodules ocamldsort-0.16.0/debian/tests/threemodules --- ocamldsort-0.16.0/debian/tests/threemodules 1970-01-01 00:00:00.000000000 +0000 +++ ocamldsort-0.16.0/debian/tests/threemodules 2019-07-22 21:10:49.000000000 +0000 @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +# ocamldep checks whether its stdin is a terminal, so we have to +# write tests that work in case the stdin of ocamldsort is redirected. + +cd debian/tests/modules +expected="c.cmo b.cmo a.cmo" +result=$(ocamldep *.ml | ocamldsort -byte *.ml) +if [ "$result" != "$expected" ] +then + echo ocamldsort returned $result + exit 1 +fi