* Drop alpha arch (maybe need a further discussion -- there is only build error

  with it)
* Further fix for CDBS && ocamldoc-api-ref-config

diff --git a/debian/cdbs/ocaml-vars.mk b/debian/cdbs/ocaml-vars.mk
index 3e2d1dc69c135adda09131cfd609c0a717716b63..a826d0fd0258a64b66769be7b070c8413227cdcd 100644 (file)
--- a/debian/cdbs/ocaml-vars.mk
+++ b/debian/cdbs/ocaml-vars.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-vars.mk 4403 2007-09-07 21:09:52Z gildor $
+# $Id: ocaml-vars.mk 4643 2007-10-18 00:21:51Z gildor $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -115,7 +115,7 @@ OCAML_OCAMLDOC_FLAGS_MAN = -man-mini
 # can use "$(cdbs_curpkg)" stem there, it will be expanded to the current
 # package name by CDBS
 # For debian/rules writers
-OCAML_OCAMLDOC_DESTDIR_HTML = $(shell ocamldoc-api-ref-config --html-directory $(cdbs_curpkg))
+OCAML_OCAMLDOC_DESTDIR_HTML = $(shell $(_cdbs_class_path)/ocamldoc-api-ref-config --html-directory $(cdbs_curpkg))
 
 endif
 

diff --git a/debian/cdbs/ocaml.mk b/debian/cdbs/ocaml.mk
index 6b49204961d684f8e645ca72b5ac85a1b388b7b2..df434bf15aac2114d81795380b827b80e5179ccb 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 4635 2007-10-17 23:27:28Z gildor $
+# $Id: ocaml.mk 4643 2007-10-18 00:21:51Z gildor $
 
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
@@ -52,7 +52,7 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES))::
                fi; \
                OCAMLDOC="ocamlfind $$OCAMLDOC $(OCAML_OCAMLDOC_OCAMLFIND_FLAGS)"; \
        fi; \
-       OCAML_OCAMLDOC_INCLUDE=`for i in "$(OCAML_OCAMLDOC_PACKAGES)"; do \
+       OCAML_OCAMLDOC_INCLUDE=`for i in $(OCAML_OCAMLDOC_PACKAGES); do \
                                                find debian/$$i/$(OCAML_STDLIB_DIR)/ -type d -exec echo -I \{} \; ; \
                                done`; \
        if (echo $(OCAML_OCAMLDOC_PACKAGES) | egrep '( |^)$(cdbs_curpkg)( |$$)' > /dev/null) ; then \

diff --git a/debian/cdbs/ocamldoc-api-ref-config b/debian/cdbs/ocamldoc-api-ref-config
index cbd1afd831b58920d014de9ba0b36ee19fdaadeb..bce02f15c147005c59fe5cf72aec7f4ffaa88f19 100755 (executable)
--- a/debian/cdbs/ocamldoc-api-ref-config
+++ b/debian/cdbs/ocamldoc-api-ref-config
@@ -18,7 +18,7 @@
 # MA 02110-1301, USA.
 
 set -e
-set -x
+#set -x
 
 print_usage ()
 {

diff --git a/debian/changelog b/debian/changelog
index 24240f57a109c118fdc8519802a8232c9e4d2aa6..d748c0861d13c88590cae96aca9672ba6db83a66 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,10 +10,9 @@ ocaml (3.10.0-9) UNRELEASED; urgency=low
     camlrun library (called "camlrun_shared") made of PIC objects
 
   [ 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
+  * 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)
 
  -- Sylvain Le Gall <gildor@debian.org>  Wed, 17 Oct 2007 22:29:46 +0200
 

diff --git a/debian/control b/debian/control
index fd2460684a59bfca76e40a731f409253f5c4844d..aeb8a46317b2466aedff0012f2b0be60fd56b352 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 hurd-i386 i386 kfreebsd-i386 powerpc sparc
+Architecture: 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 9f143ff829153c681e5d44fe68af681464400d0a..17daf3ef6086e8f5dca7794562f92a741b224dc3 100644 (file)
--- a/debian/native-archs
+++ b/debian/native-archs
@@ -1 +1 @@
-alpha amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc
+amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc

diff --git a/debian/policy/chapter-progpack.xml b/debian/policy/chapter-progpack.xml
index 0ab26e990e8eb343291de86bd09bba04837d1da7..20030fe8c66d4660acc7f8ff9f3b58cfb9a311ca 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 i386 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: 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 9420b5ed1dca000bd560cc0c9f88c27b51e0a5b5..9448fc35d2c7ceefcc7bef373d55dd229421e633 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, i386, kfreebsd-i386, powerpc, sparc">
+<!ENTITY supported-archs "amd64, i386, kfreebsd-i386, powerpc, sparc">
 <!ENTITY ocaml-compat  "1">
 <!ENTITY ocaml-pkg       "<application>ocaml</application>">
 <!ENTITY ocaml-vpkg      "<application>ocaml-&ocaml-version;</application>">