[Pkg-ocaml-maint-commits] r1873 - trunk/packages/ocaml/trunk/debian

[Julien Cristau]

Author: jcristau-guest
Date: 2005-10-31 19:28:07 +0000 (Mon, 31 Oct 2005)
New Revision: 1873

Added:
   trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.override
Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.dirs
   trunk/packages/ocaml/trunk/debian/ocaml-nox.override
   trunk/packages/ocaml/trunk/debian/rules
Log:
* Add override for false positive copyright-should-refer-to-common-license-file-for-gpl lintian warning in ocaml-compiler-libs.
* Update lintian override for ocaml-nox.
* Fix executable-not-elf-or-script ./usr/bin/ocamltags.


Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2005-10-31 19:14:55 UTC (rev 1872)
+++ trunk/packages/ocaml/trunk/debian/changelog	2005-10-31 19:28:07 UTC (rev 1873)
@@ -3,8 +3,9 @@
   * 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 at ens-lyon.org>  Mon, 31 Oct 2005 17:22:03 +0100
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Mon, 31 Oct 2005 20:17:50 +0100
 
 ocaml (3.09.0-0.experimental.1) experimental; urgency=low
 

Modified: trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.dirs
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.dirs	2005-10-31 19:14:55 UTC (rev 1872)
+++ trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.dirs	2005-10-31 19:28:07 UTC (rev 1873)
@@ -1 +1,2 @@
 usr/lib/ocaml/3.09.0/compiler-libs
+usr/share/lintian/overrides

Added: trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.override
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.override	2005-10-31 19:14:55 UTC (rev 1872)
+++ trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.override	2005-10-31 19:28:07 UTC (rev 1873)
@@ -0,0 +1 @@
+copyright-should-refer-to-common-license-file-for-gpl

Modified: trunk/packages/ocaml/trunk/debian/ocaml-nox.override
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.override	2005-10-31 19:14:55 UTC (rev 1872)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.override	2005-10-31 19:28:07 UTC (rev 1873)
@@ -1 +1 @@
-script-not-executable ./usr/lib/ocaml/3.08/camlheader
+script-not-executable ./usr/lib/ocaml/3.09.0/camlheader

Modified: trunk/packages/ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml/trunk/debian/rules	2005-10-31 19:14:55 UTC (rev 1872)
+++ trunk/packages/ocaml/trunk/debian/rules	2005-10-31 19:28:07 UTC (rev 1873)
@@ -116,6 +116,9 @@
 	# 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 @@
 		$(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 \