[Pkg-ocaml-maint-commits] r4635 - in /trunk/packages/ocaml/trunk/debian: cdbs/ocaml-docbase-template.txt cdbs/ocaml.mk changelog control native-archs policy/chapter-progpack.xml policy/ocaml_packaging_policy.xml

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Wed Oct 17 23:27:28 UTC 2007 

Author: gildor
Date: Wed Oct 17 23:27:28 2007
New Revision: 4635

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4635
Log:
* Fix .ocamldoc-apiref generation
* Drop ia64/arm arches
* Read ocaml-docbase-template.txt, for packages already using it

Added:
    trunk/packages/ocaml/trunk/debian/cdbs/ocaml-docbase-template.txt
      - copied unchanged from r4403, trunk/packages/ocaml/trunk/debian/cdbs/ocaml-docbase-template.txt
Modified:
    trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk
    trunk/packages/ocaml/trunk/debian/changelog
    trunk/packages/ocaml/trunk/debian/control
    trunk/packages/ocaml/trunk/debian/native-archs
    trunk/packages/ocaml/trunk/debian/policy/chapter-progpack.xml
    trunk/packages/ocaml/trunk/debian/policy/ocaml_packaging_policy.xml

Modified: trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk?rev=4635&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk Wed Oct 17 23:27:28 2007
@@ -70,7 +70,7 @@
 $(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::

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=4635&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Wed Oct 17 23:27:28 2007
@@ -12,8 +12,10 @@
   [ Sylvain Le Gall ]
   * ... fixes in cdbs class for ocamldoc generation ... (TODO: still to be
     checked) [ entry added by Zack ]
-
- -- Samuel Mimram <smimram at debian.org>  Wed, 10 Oct 2007 22:43:34 +0000
+  * Remove ia64 and arm native arch (no more ocamlopt for this arches)
+  * Resurect debian/cdbs/ocaml-docbase-template.txt for compatibility
+
+ -- Sylvain Le Gall <gildor at debian.org>  Wed, 17 Oct 2007 22:29:46 +0200
 
 ocaml (3.10.0-8) unstable; urgency=low
 

Modified: trunk/packages/ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control?rev=4635&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control (original)
+++ trunk/packages/ocaml/trunk/debian/control Wed Oct 17 23:27:28 2007
@@ -134,7 +134,7 @@
  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)

Modified: trunk/packages/ocaml/trunk/debian/native-archs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/native-archs?rev=4635&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/native-archs (original)
+++ trunk/packages/ocaml/trunk/debian/native-archs Wed Oct 17 23:27:28 2007
@@ -1,1 +1,1 @@
-alpha amd64 arm hurd-i386 i386 ia64 kfreebsd-i386 powerpc sparc
+alpha amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc

Modified: trunk/packages/ocaml/trunk/debian/policy/chapter-progpack.xml
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/policy/chapter-progpack.xml?rev=4635&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/policy/chapter-progpack.xml (original)
+++ trunk/packages/ocaml/trunk/debian/policy/chapter-progpack.xml Wed Oct 17 23:27:28 2007
@@ -111,7 +111,7 @@
     </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>

Modified: trunk/packages/ocaml/trunk/debian/policy/ocaml_packaging_policy.xml
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/policy/ocaml_packaging_policy.xml?rev=4635&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/policy/ocaml_packaging_policy.xml (original)
+++ trunk/packages/ocaml/trunk/debian/policy/ocaml_packaging_policy.xml Wed Oct 17 23:27:28 2007
@@ -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>">

More information about the Pkg-ocaml-maint-commits mailing list