[Pkg-ocaml-maint-commits] r4643 - in /trunk/packages/ocaml/trunk/debian: cdbs/ocaml-vars.mk cdbs/ocaml.mk cdbs/ocamldoc-api-ref-config 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
Thu Oct 18 00:21:51 UTC 2007
Author: gildor
Date: Thu Oct 18 00:21:51 2007
New Revision: 4643
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4643
Log:
* Drop alpha arch (maybe need a further discussion -- there is only build error
with it)
* Further fix for CDBS && ocamldoc-api-ref-config
Modified:
trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk
trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk
trunk/packages/ocaml/trunk/debian/cdbs/ocamldoc-api-ref-config
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-vars.mk
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk?rev=4643&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml-vars.mk Thu Oct 18 00:21:51 2007
@@ -115,7 +115,7 @@
# 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
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=4643&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocaml.mk Thu Oct 18 00:21:51 2007
@@ -52,7 +52,7 @@
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 \
Modified: trunk/packages/ocaml/trunk/debian/cdbs/ocamldoc-api-ref-config
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/cdbs/ocamldoc-api-ref-config?rev=4643&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/cdbs/ocamldoc-api-ref-config (original)
+++ trunk/packages/ocaml/trunk/debian/cdbs/ocamldoc-api-ref-config Thu Oct 18 00:21:51 2007
@@ -18,7 +18,7 @@
# MA 02110-1301, USA.
set -e
-set -x
+#set -x
print_usage ()
{
Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=4643&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Thu Oct 18 00:21:51 2007
@@ -10,10 +10,9 @@
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 at debian.org> Wed, 17 Oct 2007 22:29:46 +0200
Modified: trunk/packages/ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control?rev=4643&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control (original)
+++ trunk/packages/ocaml/trunk/debian/control Thu Oct 18 00:21:51 2007
@@ -134,7 +134,7 @@
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)
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=4643&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/native-archs (original)
+++ trunk/packages/ocaml/trunk/debian/native-archs Thu Oct 18 00:21:51 2007
@@ -1,1 +1,1 @@
-alpha amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc
+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=4643&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/policy/chapter-progpack.xml (original)
+++ trunk/packages/ocaml/trunk/debian/policy/chapter-progpack.xml Thu Oct 18 00:21:51 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 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>
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=4643&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/policy/ocaml_packaging_policy.xml (original)
+++ trunk/packages/ocaml/trunk/debian/policy/ocaml_packaging_policy.xml Thu Oct 18 00:21:51 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, 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>">
More information about the Pkg-ocaml-maint-commits
mailing list