The following commit has been merged in the master branch: commit 69ae4f9a915a0dc0caab6f196d5cbdd1cfca4d5e Author: Sylvain Le Gall <gil...@debian.org> Date: Tue Jun 25 23:25:51 2013 +0000
Take into account H. Tews remarks. diff --git a/debian/changelog b/debian/changelog index b5acfec..b2f274b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ ocamlmod (0.0.4-1) unstable; urgency=low * New upstream version + * Upgrade to debhelper 9 + * Remove cleaner line in gbp.conf + * Don't try to create the documentation (none available) + * Fix VCS field + * Add a watch file + * Remove empty /usr/lib/ocaml -- Sylvain Le Gall <gil...@debian.org> Tue, 25 Jun 2013 23:14:15 +0200 diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index bef4611..10d15d1 100644 --- a/debian/control +++ b/debian/control @@ -10,11 +10,11 @@ Build-Depends: libpcre-ocaml-dev, libfileutils-ocaml-dev, dh-ocaml (>= 0.9~), - debhelper (>= 7.0.50~) + debhelper (>= 9) Standards-Version: 3.9.4 Homepage: http://forge.ocamlcore.org/projects/ocamlmod -Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlmod.git -Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlmod.git +Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocamlmod.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/ocamlmod.git Package: ocamlmod Architecture: any diff --git a/debian/copyright b/debian/copyright index e142748..a0cd970 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,13 +1,14 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: ocamlmod -Maintainer: Sylvain Le Gall <gil...@debian.org> +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ocamlmod +Upstream-Contact: Sylvain Le Gall <sylv...@le-gall.net> +Source: http://forge.ocamlcore.org/projects/ocamlmod/ Files: * Copyright: (C) 2011 OCamlCore SARL License: LGPL-2.1 with OCaml linking exception - + . See '/usr/share/common-licenses/LGPL-2.1' for full text. - + . As a special exception to the GNU Library General Public License, you may link, statically or dynamically, a "work that uses the Library" with a publicly distributed version of the Library to produce an executable file @@ -24,6 +25,5 @@ License: LGPL-2.1 with OCaml linking exception Files: debian/* Copyright: (C) 2012 Sylvain Le Gall <gil...@debian.org> License: GPL-3+ - See '/usr/share/common-licenses/GPL-3' for full text. diff --git a/debian/gbp.conf b/debian/gbp.conf index 6c7ed3b..cec628c 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,3 +1,2 @@ [DEFAULT] pristine-tar = True -cleaner = debuild clean && dh_quilt_unpatch && dh_clean diff --git a/debian/ocamlmod.mkd b/debian/ocamlmod.mkd index 4bf41a8..dc19228 100644 --- a/debian/ocamlmod.mkd +++ b/debian/ocamlmod.mkd @@ -12,8 +12,8 @@ ocamlmod [-help|--help] file.mod # DESCRIPTION -This program allows to generate a single module files from a bunch of -OCaml source file. +This program allows one to generate a single module files from a bunch of OCaml +source file. # FILE SYNTAX diff --git a/debian/rules b/debian/rules index 3598088..bb67fd9 100755 --- a/debian/rules +++ b/debian/rules @@ -8,13 +8,8 @@ DESTDIR=$(CURDIR)/debian/ocamlmod include /usr/share/ocaml/ocamlvars.mk -OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR) -export OCAMLFIND_DESTDIR -OCAMLFIND_LDCONF=ignore -export OCAMLFIND_LDCONF - %: - dh --with ocaml $@ + dh $@ --with ocaml .PHONY: override_dh_auto_configure override_dh_auto_configure: @@ -23,7 +18,6 @@ override_dh_auto_configure: .PHONY: override_dh_auto_build override_dh_auto_build: ocaml setup.ml -build - ocaml setup.ml -doc .PHONY: override_dh_auto_test override_dh_auto_test: @@ -32,8 +26,7 @@ override_dh_auto_test: .PHONY: override_dh_auto_install override_dh_auto_install: mkdir -p '$(DESTDIR)/usr/bin' - mkdir -p '$(OCAMLFIND_DESTDIR)' - ocaml setup.ml -install + ocaml setup.ml -install .PHONY: override_dh_install override_dh_install: diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..125f3bb --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://forge.ocamlcore.org/frs/?group_id=244 .*/ocamlmod-([0-9\.]*)\.tar\.gz -- ocamlmod packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits