* Fix .ocamldoc-apiref generation

* Drop ia64/arm arches
* Read ocaml-docbase-template.txt, for packages already using it

diff --git a/debian/cdbs/ocaml-docbase-template.txt b/debian/cdbs/ocaml-docbase-template.txt
new file mode 100644 (file)
index 0000000..d0deb55
--- /dev/null
+++ b/debian/cdbs/ocaml-docbase-template.txt
@@ -0,0 +1,8 @@
+Document: @PACKAGE@-ocamldoc-api-reference
+Title: @PACKAGE@ OCamldoc API Reference
+Abstract: API reference manual for @PACKAGE@ (generated via OCamldoc)
+Section: Applications/Programming
+
+Format: HTML
+Index: /usr/share/doc/@PACKAGE@/html/api/index.html
+Files: /usr/share/doc/@PACKAGE@/html/api/*

diff --git a/debian/cdbs/ocaml.mk b/debian/cdbs/ocaml.mk
index 4b2532388c34ce3d941057d0ed6f1f1dd176b537..6b49204961d684f8e645ca72b5ac85a1b388b7b2 100644 (file)
--- a/debian/cdbs/ocaml.mk
+++ b/debian/cdbs/ocaml.mk
@@ -16,7 +16,7 @@
 # this program; if not, write to the Free Software Foundation, Inc., 51
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# $Id: ocaml.mk 4592 2007-09-28 14:50:04Z zack $
+# $Id: ocaml.mk 4635 2007-10-17 23:27:28Z gildor $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -70,7 +70,7 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES))::
 $(patsubst %,build/%,$(DEB_PACKAGES))::
        @if (echo $(OCAML_OCAMLDOC_PACKAGES) $(OCAML_OCAMLDOC_PACKAGES_DOCBASE) \
          | egrep '( |^)$(cdbs_curpkg)( |$$)' > /dev/null) ; then \
-               ocamldoc-api-ref-config --doc-base-generate $(cdbs_curpkg) ; \
+               $(_cdbs_class_path)/ocamldoc-api-ref-config --doc-base-generate $(cdbs_curpkg) ; \
        fi
 
 clean::

diff --git a/debian/changelog b/debian/changelog
index f9d14d2b0c229ad24ef422d50877e165d7ddce15..24240f57a109c118fdc8519802a8232c9e4d2aa6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ ocaml (3.10.0-9) UNRELEASED; urgency=low
   [ Sylvain Le Gall ]
   * ... fixes in cdbs class for ocamldoc generation ... (TODO: still to be
     checked) [ entry added by Zack ]
+  * Remove ia64 and arm native arch (no more ocamlopt for this arches)
+  * Resurect debian/cdbs/ocaml-docbase-template.txt for compatibility
 
- -- Samuel Mimram <smimram@debian.org>  Wed, 10 Oct 2007 22:43:34 +0000
+ -- Sylvain Le Gall <gildor@debian.org>  Wed, 17 Oct 2007 22:29:46 +0200
 
 ocaml (3.10.0-8) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 2b0928e8f552105fc3bfe8ccc56a32c3605afe47..fd2460684a59bfca76e40a731f409253f5c4844d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -134,7 +134,7 @@ Description: Runtime system for ocaml bytecode executables
  you do not require any graphical capabilities for your runtime.
 
 Package: ocaml-native-compilers
-Architecture: alpha amd64 arm hurd-i386 i386 ia64 kfreebsd-i386 powerpc sparc
+Architecture: alpha amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc
 Depends: ocaml-nox (= ${binary:Version}), ocaml-nox-${F:OCamlABI}, gcc, binutils, ${shlibs:Depends}
 Provides: ocaml-best-compilers
 Replaces: ocaml-nox (<= 3.09.2-3)

diff --git a/debian/native-archs b/debian/native-archs
index 26a6d99be678cb9710dc9326b4e6dacbf9bf7ee9..9f143ff829153c681e5d44fe68af681464400d0a 100644 (file)
--- a/debian/native-archs
+++ b/debian/native-archs
@@ -1 +1 @@
-alpha amd64 arm hurd-i386 i386 ia64 kfreebsd-i386 powerpc sparc
+alpha amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc

diff --git a/debian/policy/chapter-progpack.xml b/debian/policy/chapter-progpack.xml
index c9de9e8cb281e8405d25cc223da6934a679e88ff..0ab26e990e8eb343291de86bd09bba04837d1da7 100644 (file)
--- a/debian/policy/chapter-progpack.xml
+++ b/debian/policy/chapter-progpack.xml
@@ -111,7 +111,7 @@ the requirements of the compilation of the program.
     </para>
 
     <para>
-        The bytecode versions are portable. In order to spare the buildds and the Debian archive, bytecode versions should be compiled once for all for big packages (which either take a lot of place on disks or take a lot of time to build). For example, the <filename>spamoracle</filename> package provides the <filename>spamoracle-byte</filename> package which is <varname>Architecture: all</varname> and contains the bytecode version of spamoracle, and the <filename>spamoracle</filename> package which contains the native version of spamoracle and is available only where a native OCaml compiler is available (<varname>Architecture: alpha amd64 arm i386 ia64 kfreebsd-i386 powerpc sparc</varname>).
+        The bytecode versions are portable. In order to spare the buildds and the Debian archive, bytecode versions should be compiled once for all for big packages (which either take a lot of place on disks or take a lot of time to build). For example, the <filename>spamoracle</filename> package provides the <filename>spamoracle-byte</filename> package which is <varname>Architecture: all</varname> and contains the bytecode version of spamoracle, and the <filename>spamoracle</filename> package which contains the native version of spamoracle and is available only where a native OCaml compiler is available (<varname>Architecture: alpha amd64 i386 kfreebsd-i386 powerpc sparc</varname>).
     </para>
 
     <para>

diff --git a/debian/policy/ocaml_packaging_policy.xml b/debian/policy/ocaml_packaging_policy.xml
index 4880846abbe169a1766bb0134cc7ae966371b5df..9420b5ed1dca000bd560cc0c9f88c27b51e0a5b5 100644 (file)
--- a/debian/policy/ocaml_packaging_policy.xml
+++ b/debian/policy/ocaml_packaging_policy.xml
@@ -5,7 +5,7 @@
 <!ENTITY ocaml-sys-dir-base "/usr/lib/ocaml">
 <!ENTITY ocaml-sys-dir "&ocaml-sys-dir-base;/&ocaml-version;">
 <!ENTITY ocaml-metas-dir "&ocaml-sys-dir;/METAS">
-<!ENTITY supported-archs "alpha, amd64, arm, i386, ia64, kfreebsd-i386, powerpc, sparc">
+<!ENTITY supported-archs "alpha, amd64, i386, kfreebsd-i386, powerpc, sparc">
 <!ENTITY ocaml-compat  "1">
 <!ENTITY ocaml-pkg       "<application>ocaml</application>">
 <!ENTITY ocaml-vpkg      "<application>ocaml-&ocaml-version;</application>">