still on the camlp4 splitting....

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 00b2a3f257c2d2d242f9ea8bec2b0c3388d3147e..d31ee4517150cce666f1f1b0c8ab47afff5a69ac 100644 (file)
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -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

diff --git a/debian/rules b/debian/rules
index 335925ff4334b9a72f2ea30b4ce72e1aa504b224..d5bf93f7d7b8eb5b050e9f447e619c0e43d601f1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -178,8 +178,15 @@ install-arch: build-arch
        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 @@ binary-arch: install-arch
        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