[Pkg-ocaml-maint-commits] r3839 - in /trunk/packages/ocaml/trunk/debian: TODO.Debian rules

[zack at users.alioth.debian.org]

Author: zack
Date: Sat Jun 16 00:17:37 2007
New Revision: 3839

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3839
Log:
still on the camlp4 splitting....

Modified:
    trunk/packages/ocaml/trunk/debian/TODO.Debian
    trunk/packages/ocaml/trunk/debian/rules

Modified: trunk/packages/ocaml/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/TODO.Debian?rev=3839&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/TODO.Debian (original)
+++ trunk/packages/ocaml/trunk/debian/TODO.Debian Sat Jun 16 00:17:37 2007
@@ -1,12 +1,29 @@
 TODO list for ocaml 3.10.0 (and beyond ...)
 - lintian warnings
-  lintian /home/srv/debian/pkg-ocaml-maint/packages/ocaml/build-area/ocaml_3.10.0-1_i386.changes
+  lintian /home/srv/debian/pkg-ocaml-maint/packages/ocaml/build-area/ocaml_3.10.0-2_i386.changes
+  E: ocaml-nox: manpage-not-compressed usr/share/man/man1/camlp4orf.1
+  E: ocaml-nox: manpage-not-compressed usr/share/man/man1/camlp4oof.opt.1
+  E: ocaml-nox: manpage-not-compressed usr/share/man/man1/camlp4of.opt.1
+  E: ocaml-nox: manpage-not-compressed usr/share/man/man1/camlp4prof.1
+  E: ocaml-nox: manpage-not-compressed usr/share/man/man1/camlp4oof.1
+  E: ocaml-nox: manpage-not-compressed usr/share/man/man1/camlp4orf.opt.1
+  E: ocaml-nox: manpage-not-compressed usr/share/man/man1/camlp4o.1
+  E: ocaml-nox: manpage-not-compressed usr/share/man/man1/camlp4rf.opt.1
+  E: ocaml-nox: manpage-not-compressed usr/share/man/man1/camlp4boot.1
+  E: ocaml-nox: manpage-not-compressed usr/share/man/man1/camlp4r.1
+  E: ocaml-nox: manpage-not-compressed usr/share/man/man1/camlp4of.1
+  E: ocaml-nox: manpage-not-compressed usr/share/man/man1/camlp4rf.1
   W: ocaml-nox: binary-without-manpage usr/bin/ocamlbuild.byte
   W: ocaml-nox: binary-without-manpage usr/bin/ocamlbuild.native
   W: ocaml-nox: script-not-executable ./usr/lib/ocaml/3.10.0/camlheader
   W: ocaml-mode: binary-without-manpage usr/bin/ocamltags
-  E: ocaml-compiler-libs: copyright-should-refer-to-common-license-file-for-gpl	    -->> bogus? 
-    -->> Yes, looks for GPL and finds 'NOT LGPL' :-)
+  E: ocaml-compiler-libs: copyright-should-refer-to-common-license-file-for-gpl
   W: ocaml-base-nox: binary-without-manpage usr/bin/ocaml-md5sums
   W: ocaml: binary-without-manpage usr/bin/labltk
   W: ocaml: binary-without-manpage usr/bin/ocamlbrowser
+  W: camlp4: binary-without-manpage usr/bin/camlp4
+  W: camlp4: binary-without-manpage usr/bin/camlp4o
+  W: camlp4: binary-without-manpage usr/bin/camlp4o.opt
+  W: camlp4: binary-without-manpage usr/bin/camlp4r
+  W: camlp4: binary-without-manpage usr/bin/camlp4r.opt
+  W: camlp4: binary-without-manpage usr/bin/mkcamlp4

Modified: trunk/packages/ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/rules?rev=3839&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/rules (original)
+++ trunk/packages/ocaml/trunk/debian/rules Sat Jun 16 00:17:37 2007
@@ -178,8 +178,15 @@
 	fi
 
 	# Move away camlp4 stuff
-	dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4-extras
-	dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4
+	if [ -e opt-built-stamp ]; then					\
+		dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4-extras \
+			`cat debian/camlp4-extra.optfiles` ; \
+		dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4 \
+			`cat debian/camlp4.optfiles` ; \
+	else \
+		dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4-extras ; \
+		dh_movefiles --sourcedir=debian/ocaml-nox -pcamlp4 ; \
+	fi
 
 	# Then move the ocaml-base-nox package.
 	dh_movefiles --sourcedir=debian/ocaml-nox -pocaml-base-nox
@@ -293,6 +300,8 @@
 	dh_gencontrol -pocaml-base -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_gencontrol -pocaml-interp -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_gencontrol -pocaml-compiler-libs -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -pcamlp4 -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -pcamlp4-extra -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums -s
 	dh_builddeb -s