* Add override for false positive copyright-should-refer-to-common-license-file-for...

* Update lintian override for ocaml-nox.
* Fix executable-not-elf-or-script ./usr/bin/ocamltags.

diff --git a/debian/changelog b/debian/changelog
index 01297a43b520e861e9f2b53b4949e4ef5c1e2427..e3112a22883fc7c76628a4fb9ec440e7a1e6fa95 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ ocaml (3.09.0-0.experimental.2) experimental; urgency=low
   * Cleanup debian/control: remove redundant Depends.
   * Update location of ocaml-md5sums stuff.
   * Build-Depend on chrpath and delete rpath from DLLs.
+  * Various lintian warnings fixed, and overrides cleaned up.
 
- -- Julien Cristau <julien.cristau@ens-lyon.org>  Mon, 31 Oct 2005 17:22:03 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Mon, 31 Oct 2005 20:17:50 +0100
 
 ocaml (3.09.0-0.experimental.1) experimental; urgency=low
 

diff --git a/debian/ocaml-compiler-libs.dirs b/debian/ocaml-compiler-libs.dirs
index 51bf33bc6e863ffa3779650a82d95ef8b6949818..7fbd5bd59e877edef2a88a8e7c605c834d62d032 100644 (file)
--- a/debian/ocaml-compiler-libs.dirs
+++ b/debian/ocaml-compiler-libs.dirs
@@ -1 +1,2 @@
 usr/lib/ocaml/3.09.0/compiler-libs
+usr/share/lintian/overrides

diff --git a/debian/ocaml-compiler-libs.override b/debian/ocaml-compiler-libs.override
new file mode 100644 (file)
index 0000000..25f6b61
--- /dev/null
+++ b/debian/ocaml-compiler-libs.override
@@ -0,0 +1 @@
+copyright-should-refer-to-common-license-file-for-gpl

diff --git a/debian/ocaml-nox.override b/debian/ocaml-nox.override
index bcdd2f38e6a6184887abcc64e919775ba084fea4..50f66c2ceed2863d3cd8d012896c02ab879446ff 100644 (file)
--- a/debian/ocaml-nox.override
+++ b/debian/ocaml-nox.override
@@ -1 +1 @@
-script-not-executable ./usr/lib/ocaml/3.08/camlheader
+script-not-executable ./usr/lib/ocaml/3.09.0/camlheader

diff --git a/debian/rules b/debian/rules
index bfe0ce76a38e2714fdf12345cdfe3ed5b55a0945..1031372fe73cf2b4e71e35099c710798f54c16bd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -116,6 +116,9 @@ install-indep:
        # Install Emacs files
        $(MAKE) -C emacs EMACSDIR=$(CURDIR)/debian/ocaml-mode/usr/share/emacs/site-lisp/ocaml-mode \
                NOCOMPILE=true simple-install
+       if ! head -n 1 emacs/ocamltags.in | grep -q '^#!/bin/sh'; then \
+               sed -i -e '1 i #!/bin/sh' emacs/ocamltags.in; \
+       fi
        $(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-mode/usr/bin install-ocamltags
 
        # Add here commands to install the indep part of the package into
@@ -146,6 +149,8 @@ install-arch:
                $(CURDIR)/debian/ocaml-interp/usr/share/pixmaps
        install -m 644 debian/ocaml-nox.override \
                $(CURDIR)/debian/ocaml-nox/usr/share/lintian/overrides/ocaml-nox
+       install -m 644 debian/ocaml-compiler-libs.override \
+               $(CURDIR)/debian/ocaml-compiler-libs/usr/share/lintian/overrides/ocaml-compiler-libs
        install -m 644 otherlibs/labltk/README \
                $(CURDIR)/debian/README.labltk
        install -m 644 config/Makefile \