From 5a1c8ba4d8defcb7c25088a2fd8e8f97d7b5fb0c Mon Sep 17 00:00:00 2001 From: Sylvain Le Gall Date: Wed, 17 Oct 2007 23:27:28 +0000 Subject: [PATCH] * Fix .ocamldoc-apiref generation * Drop ia64/arm arches * Read ocaml-docbase-template.txt, for packages already using it --- debian/cdbs/ocaml-docbase-template.txt | 8 ++++++++ debian/cdbs/ocaml.mk | 4 ++-- debian/changelog | 4 +++- debian/control | 2 +- debian/native-archs | 2 +- debian/policy/chapter-progpack.xml | 2 +- debian/policy/ocaml_packaging_policy.xml | 2 +- 7 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 debian/cdbs/ocaml-docbase-template.txt diff --git a/debian/cdbs/ocaml-docbase-template.txt b/debian/cdbs/ocaml-docbase-template.txt new file mode 100644 index 00000000..d0deb550 --- /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 4b253238..6b492049 100644 --- 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 f9d14d2b..24240f57 100644 --- 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 Wed, 10 Oct 2007 22:43:34 +0000 + -- Sylvain Le Gall 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 2b0928e8..fd246068 100644 --- 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 26a6d99b..9f143ff8 100644 --- 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 c9de9e8c..0ab26e99 100644 --- a/debian/policy/chapter-progpack.xml +++ b/debian/policy/chapter-progpack.xml @@ -111,7 +111,7 @@ the requirements of the compilation of the program. - 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 spamoracle package provides the spamoracle-byte package which is Architecture: all and contains the bytecode version of spamoracle, and the spamoracle package which contains the native version of spamoracle and is available only where a native OCaml compiler is available (Architecture: alpha amd64 arm i386 ia64 kfreebsd-i386 powerpc sparc). + 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 spamoracle package provides the spamoracle-byte package which is Architecture: all and contains the bytecode version of spamoracle, and the spamoracle package which contains the native version of spamoracle and is available only where a native OCaml compiler is available (Architecture: alpha amd64 i386 kfreebsd-i386 powerpc sparc). diff --git a/debian/policy/ocaml_packaging_policy.xml b/debian/policy/ocaml_packaging_policy.xml index 4880846a..9420b5ed 100644 --- a/debian/policy/ocaml_packaging_policy.xml +++ b/debian/policy/ocaml_packaging_policy.xml @@ -5,7 +5,7 @@ - + ocaml"> ocaml-&ocaml-version;"> -- 2.30.2