From 2003fbd150c4982d2c968b683d2cd38f103a6b4d Mon Sep 17 00:00:00 2001 From: Sylvain Le Gall Date: Sat, 15 Dec 2007 17:00:18 +0000 Subject: [PATCH] * Enable lintian override * Remove empty directories (in ocaml-nox) * Comment install_ocamlbuild patch * Prepare for the release --- debian/changelog | 18 ++++++++++++++---- debian/control | 2 +- debian/control.in | 2 +- debian/ocaml-compiler-libs.install.in | 1 - debian/ocaml-compiler-libs.override | 2 +- debian/ocaml-nox.empty-dirs.in | 13 +++++++++++++ debian/ocaml-nox.install.in | 1 - debian/ocaml-nox.override.in | 2 +- debian/patches/install_ocamlbuild.dpatch | 2 +- debian/rules | 13 +++++++++++++ 10 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 debian/ocaml-nox.empty-dirs.in diff --git a/debian/changelog b/debian/changelog index 9fda52b2..05af6c05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ocaml (3.10.0-9) UNRELEASED; urgency=low +ocaml (3.10.0-9) unstable; urgency=low [ Samuel Mimram ] * Suggest "tarballs" instead of "upstream" in the policy as directory name @@ -14,9 +14,19 @@ ocaml (3.10.0-9) UNRELEASED; urgency=low * fixes in cdbs class for ocamldoc generation, provides ocamldoc-api-ref-config to centralize generation of .ocamldoc-apiref * remove ia64, arm and alpha native arches (no more ocamlopt for this arches) - * Array is bashism, remove it from ocamldoc-api-ref-config - - -- Sylvain Le Gall Sat, 10 Nov 2007 17:28:48 +0100 + * array is bashism, remove it from ocamldoc-api-ref-config + * upgrade to Standards-Version 3.7.3 (no change) + * make the lintian override work: add the name of the package in + front of each override line, place the file in + usr/share/lintian/overrides and not inside a directory in this + directory + * make clean cleaner (remove byterun/libcamlrun_shared.so) + * remove empty directories left after moving files away from ocaml-nox + hierarchy + * add a comment to install_ocamlbuild patch, to prevent lintian + warning + + -- Sylvain Le Gall Sat, 15 Dec 2007 17:57:36 +0100 ocaml (3.10.0-8) unstable; urgency=low diff --git a/debian/control b/debian/control index 587b3488..5a45cf19 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian OCaml Maintainers Uploaders: Sven Luther , Stefano Zacchiroli , Julien Cristau , Samuel Mimram , Sylvain Le Gall Build-Depends: debhelper (>> 5.0.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/ Homepage: http://caml.inria.fr/ diff --git a/debian/control.in b/debian/control.in index a4d065a6..3a5a0da2 100644 --- a/debian/control.in +++ b/debian/control.in @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian OCaml Maintainers Uploaders: Sven Luther , Stefano Zacchiroli , Julien Cristau , Samuel Mimram , Sylvain Le Gall Build-Depends: debhelper (>> 5.0.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/ Homepage: http://caml.inria.fr/ diff --git a/debian/ocaml-compiler-libs.install.in b/debian/ocaml-compiler-libs.install.in index 264f4b11..84372c91 100644 --- a/debian/ocaml-compiler-libs.install.in +++ b/debian/ocaml-compiler-libs.install.in @@ -1,4 +1,3 @@ -debian/ocaml-compiler-libs.override /usr/share/lintian/overrides/ocaml-compiler-libs parsing/* /usr/lib/ocaml/#OcamlABI#/compiler-libs/parsing/ typing/* /usr/lib/ocaml/#OcamlABI#/compiler-libs/typing/ utils/* /usr/lib/ocaml/#OcamlABI#/compiler-libs/utils/ diff --git a/debian/ocaml-compiler-libs.override b/debian/ocaml-compiler-libs.override index 25f6b616..f3480945 100644 --- a/debian/ocaml-compiler-libs.override +++ b/debian/ocaml-compiler-libs.override @@ -1 +1 @@ -copyright-should-refer-to-common-license-file-for-gpl +ocaml-compiler-libs: copyright-should-refer-to-common-license-file-for-lgpl diff --git a/debian/ocaml-nox.empty-dirs.in b/debian/ocaml-nox.empty-dirs.in new file mode 100644 index 00000000..3e7839c6 --- /dev/null +++ b/debian/ocaml-nox.empty-dirs.in @@ -0,0 +1,13 @@ +usr/lib/ocaml/#OcamlABI#/camlp4/Camlp4Parsers +usr/lib/ocaml/#OcamlABI#/camlp4/Camlp4Top +usr/lib/ocaml/#OcamlABI#/camlp4/Camlp4Filters +usr/lib/ocaml/#OcamlABI#/camlp4/Camlp4Printers +usr/lib/ocaml/#OcamlABI#/camlp4 +usr/include +usr/lib/ocaml/#OcamlABI#/labltk +usr/lib/ocaml/#OcamlABI#/ocamldoc/custom +usr/lib/ocaml/#OcamlABI#/stublibs +usr/share/texmf/tex/latex/misc +usr/share/texmf/tex/latex +usr/share/texmf/tex +usr/share/texmf diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in index 257884c0..0f9231d0 100644 --- a/debian/ocaml-nox.install.in +++ b/debian/ocaml-nox.install.in @@ -1,4 +1,3 @@ debian/cdbs/* /usr/share/cdbs/1/class/ -debian/ocaml-nox.override /usr/share/lintian/overrides/ocaml-nox config/Makefile /usr/lib/ocaml/#OcamlABI#/config/Makefile debian/native-archs /usr/lib/ocaml/#OcamlABI#/ diff --git a/debian/ocaml-nox.override.in b/debian/ocaml-nox.override.in index 5c348863..2c94fc64 100644 --- a/debian/ocaml-nox.override.in +++ b/debian/ocaml-nox.override.in @@ -1 +1 @@ -script-not-executable ./usr/lib/ocaml/#OcamlABI#/camlheader +ocaml-nox: script-not-executable ./usr/lib/ocaml/#OcamlABI#/camlheader diff --git a/debian/patches/install_ocamlbuild.dpatch b/debian/patches/install_ocamlbuild.dpatch index b97a8f44..d0cae201 100755 --- a/debian/patches/install_ocamlbuild.dpatch +++ b/debian/patches/install_ocamlbuild.dpatch @@ -2,7 +2,7 @@ ## install_ocamlbuild.dpatch by Stefano Zacchiroli ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. +## DP: install ocamlbuild as a link on either .native or .byte. @DPATCH@ diff -urNad trunk~/build/partial-install.sh trunk/build/partial-install.sh diff --git a/debian/rules b/debian/rules index 9ad636ba..9298ec5c 100755 --- a/debian/rules +++ b/debian/rules @@ -143,6 +143,7 @@ endif -$(RM) _log -$(RM) myocamlbuild_config.ml -$(RM) ocaml-$(OCAMLABI) + -$(RM) byterun/libcamlrun_shared.so dh_clean debian/README.labltk camlp4/config/Makefile.cnf camlp4/config/Makefile config/m.h config/s.h config/Makefile emacs/ocamltags driver/ocamlcomp.sh debian/rules abi-sed-clean @@ -251,6 +252,18 @@ install-arch: build-arch ln -sf ../ocaml-base-nox/ocaml_packaging_policy.txt.gz .; \ ln -sf ../ocaml-base-nox/ocaml_packaging_policy.html . + # Remove empty directory + for i in `cat debian/ocaml-nox.empty-dirs`; do \ + if test -d "debian/ocaml-nox/$$i" && test -z "`ls -1 'debian/ocaml-nox/$$i'`"; then \ + $(RM) -r "debian/ocaml-nox/$$i"; \ + fi; \ + done + + + # Install override files + cp debian/ocaml-compiler-libs.override debian/ocaml-compiler-libs/usr/share/lintian/overrides/ocaml-compiler-libs + cp debian/ocaml-nox.override debian/ocaml-nox/usr/share/lintian/overrides/ocaml-nox + dh_install -a # Must not depend on anything. This is to be called by -- 2.30.2