[Pkg-ocaml-maint-commits] r4895 - in /trunk/packages/ocaml/trunk/debian: changelog control control.in ocaml-compiler-libs.install.in ocaml-compiler-libs.override ocaml-nox.empty-dirs.in ocaml-nox.install.in ocaml-nox.override.in patches/install_ocamlbuild.dpatch rules

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Sat Dec 15 17:00:19 UTC 2007 

Author: gildor
Date: Sat Dec 15 17:00:18 2007
New Revision: 4895

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4895
Log:
* Enable lintian override
* Remove empty directories (in ocaml-nox)
* Comment install_ocamlbuild patch
* Prepare for the release

Added:
    trunk/packages/ocaml/trunk/debian/ocaml-nox.empty-dirs.in
Modified:
    trunk/packages/ocaml/trunk/debian/changelog
    trunk/packages/ocaml/trunk/debian/control
    trunk/packages/ocaml/trunk/debian/control.in
    trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.install.in
    trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.override
    trunk/packages/ocaml/trunk/debian/ocaml-nox.install.in
    trunk/packages/ocaml/trunk/debian/ocaml-nox.override.in
    trunk/packages/ocaml/trunk/debian/patches/install_ocamlbuild.dpatch
    trunk/packages/ocaml/trunk/debian/rules

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=4895&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Sat Dec 15 17:00:18 2007
@@ -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 @@
   * 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 <gildor at debian.org>  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 <gildor at debian.org>  Sat, 15 Dec 2007 17:57:36 +0100
 
 ocaml (3.10.0-8) unstable; urgency=low
 

Modified: trunk/packages/ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control?rev=4895&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control (original)
+++ trunk/packages/ocaml/trunk/debian/control Sat Dec 15 17:00:18 2007
@@ -4,7 +4,7 @@
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>, Julien Cristau <julien.cristau at ens-lyon.org>, Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>
 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/

Modified: trunk/packages/ocaml/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control.in?rev=4895&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control.in (original)
+++ trunk/packages/ocaml/trunk/debian/control.in Sat Dec 15 17:00:18 2007
@@ -4,7 +4,7 @@
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>, Julien Cristau <julien.cristau at ens-lyon.org>, Samuel Mimram <smimram at debian.org>, Sylvain Le Gall <gildor at debian.org>
 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/

Modified: trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.install.in?rev=4895&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.install.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.install.in Sat Dec 15 17:00:18 2007
@@ -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/

Modified: trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.override
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.override?rev=4895&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.override (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-compiler-libs.override Sat Dec 15 17:00:18 2007
@@ -1,1 +1,1 @@
-copyright-should-refer-to-common-license-file-for-gpl
+ocaml-compiler-libs: copyright-should-refer-to-common-license-file-for-lgpl

Added: trunk/packages/ocaml/trunk/debian/ocaml-nox.empty-dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-nox.empty-dirs.in?rev=4895&op=file
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.empty-dirs.in (added)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.empty-dirs.in Sat Dec 15 17:00:18 2007
@@ -1,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

Modified: trunk/packages/ocaml/trunk/debian/ocaml-nox.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-nox.install.in?rev=4895&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.install.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.install.in Sat Dec 15 17:00:18 2007
@@ -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#/

Modified: trunk/packages/ocaml/trunk/debian/ocaml-nox.override.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-nox.override.in?rev=4895&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.override.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.override.in Sat Dec 15 17:00:18 2007
@@ -1,1 +1,1 @@
-script-not-executable ./usr/lib/ocaml/#OcamlABI#/camlheader
+ocaml-nox: script-not-executable ./usr/lib/ocaml/#OcamlABI#/camlheader

Modified: trunk/packages/ocaml/trunk/debian/patches/install_ocamlbuild.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/patches/install_ocamlbuild.dpatch?rev=4895&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/patches/install_ocamlbuild.dpatch (original)
+++ trunk/packages/ocaml/trunk/debian/patches/install_ocamlbuild.dpatch Sat Dec 15 17:00:18 2007
@@ -2,7 +2,7 @@
 ## install_ocamlbuild.dpatch by Stefano Zacchiroli <zack at debian.org>
 ##
 ## 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

Modified: trunk/packages/ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/rules?rev=4895&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/rules (original)
+++ trunk/packages/ocaml/trunk/debian/rules Sat Dec 15 17:00:18 2007
@@ -143,6 +143,7 @@
 	-$(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 @@
 		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

More information about the Pkg-ocaml-maint-commits mailing list