[Pkg-ocaml-maint-commits] r5182 - in /trunk/packages/galax/trunk/debian: control galax-doc.dirs galax-doc.doc-base galax-doc.docs patches/meta.dpatch rules

zack at users.alioth.debian.org zack at users.alioth.debian.org
Sun Feb 17 17:45:19 UTC 2008 

Author: zack
Date: Sun Feb 17 17:45:19 2008
New Revision: 5182

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5182
Log:
various fixes, by hand ocamldoc generation to install API ref in galax-doc

Removed:
    trunk/packages/galax/trunk/debian/galax-doc.dirs
Modified:
    trunk/packages/galax/trunk/debian/control
    trunk/packages/galax/trunk/debian/galax-doc.doc-base
    trunk/packages/galax/trunk/debian/galax-doc.docs
    trunk/packages/galax/trunk/debian/patches/meta.dpatch
    trunk/packages/galax/trunk/debian/rules

Modified: trunk/packages/galax/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/control?rev=5182&op=diff
==============================================================================
--- trunk/packages/galax/trunk/debian/control (original)
+++ trunk/packages/galax/trunk/debian/control Sun Feb 17 17:45:19 2008
@@ -74,6 +74,7 @@
  webgui) are also provided by this package.
 
 Package: libgalax-ocaml-dev
+Section: libdevel
 Architecture: any
 Depends: ocaml-nox-${F:OCamlABI}, libpcre-ocaml-dev, libocamlnet-ocaml-dev, libpxp-ocaml-dev, libcamomile-ocaml-dev, ${shlibs:Depends}, ${misc:Depends}
 Description: XQuery implementation with static typing - OCaml libraries

Modified: trunk/packages/galax/trunk/debian/galax-doc.doc-base
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/galax-doc.doc-base?rev=5182&op=diff
==============================================================================
--- trunk/packages/galax/trunk/debian/galax-doc.doc-base (original)
+++ trunk/packages/galax/trunk/debian/galax-doc.doc-base Sun Feb 17 17:45:19 2008
@@ -9,9 +9,9 @@
 Section: Applications/Programming
 
 Format: PDF
-Files: /usr/share/doc/galax/manual/galax.pdf
+Files: /usr/share/doc/galax/doc/galax.pdf
 
 Format: HTML
-Index: /usr/share/doc/galax/manual/html/index.html
-Files: /usr/share/doc/galax/manual/html/*.html
+Index: /usr/share/doc/galax/doc/html/index.html
+Files: /usr/share/doc/galax/doc/html/*.html
 

Modified: trunk/packages/galax/trunk/debian/galax-doc.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/galax-doc.docs?rev=5182&op=diff
==============================================================================
--- trunk/packages/galax/trunk/debian/galax-doc.docs (original)
+++ trunk/packages/galax/trunk/debian/galax-doc.docs Sun Feb 17 17:45:19 2008
@@ -1,1 +1,1 @@
-doc/*
+doc/

Modified: trunk/packages/galax/trunk/debian/patches/meta.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/patches/meta.dpatch?rev=5182&op=diff
==============================================================================
--- trunk/packages/galax/trunk/debian/patches/meta.dpatch (original)
+++ trunk/packages/galax/trunk/debian/patches/meta.dpatch Sun Feb 17 17:45:19 2008
@@ -34,7 +34,7 @@
  _EOF_
  
 +# generate META
-+set "s/@VERSION@/$version/g" META.in > META
++sed "s/@VERSION@/$version/g" META.in > META
 +
  exit 0
  

Modified: trunk/packages/galax/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/galax/trunk/debian/rules?rev=5182&op=diff
==============================================================================
--- trunk/packages/galax/trunk/debian/rules (original)
+++ trunk/packages/galax/trunk/debian/rules Sun Feb 17 17:45:19 2008
@@ -5,19 +5,18 @@
 include /usr/share/cdbs/1/class/ocaml.mk
 
 PKGNAME = galax
-OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
-OCAML_OCAMLDOC_OCAMLFIND_FLAGS = -package pcre,netstring,equeue,netclient,netsys,pxp-engine,pxp-lex-iso88591,pxp-lex-utf8,camomile
-
 DEB_MAKE_BUILD_TARGET = world
  # $(LN) override so that we only install the best binary, instead of both .opt
  # and .byte together with the best symlink
 DEB_MAKE_INSTALL_TARGET = install LN=cp DESTDIR=$(CURDIR)/debian/tmp
-
-DEB_DH_INSTALL_ARGS += -XCVS
 ifneq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_STRIP_EXCLUDE += usr/bin
 DEB_DH_GENCONTROL_ARGS += -Vocaml-interp:Depends=ocaml-base-nox-$(OCAMLABI)
 endif
+
+DEB_DH_INSTALL_ARGS += -XCVS
+DEB_INSTALL_DOCS_ALL += -XCVS
+DEB_INSTALL_DOCS_galax-doc += -Xlicense
 
 # configuration flags (incrementally defined)
 CFGFLAGS =
@@ -45,15 +44,6 @@
 # fix wrong permissions (+x) on some .mli files
 binary-post-install/libgalax-ocaml-dev::
 	chmod 644 debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/galax/*.mli
-# move generated API reference to the -doc package (to do so,
-# libgalax-ocaml-dev have to be already installed, since it's during its
-# installation that ocamldoc is invoked by ocaml.mk)
-binary-post-install/galax-doc:: binary-post-install/libgalax-ocaml-dev
-binary-post-install/libgalax-ocaml-dev::
-	mv debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/html/api/ \
-		debian/galax-doc/usr/share/doc/$(cdbs_curpkg)/html/
-	mv debian/$(cdbs_curpkg)/usr/share/doc-base/*api-reference \
-		debian/galax-doc/usr/share/doc-base/
 # avoid cluttering usr/bin with too generic names
 binary-post-install/galaxd::
 	mv debian/$(cdbs_curpkg)/usr/bin/zerod \
@@ -61,3 +51,23 @@
 	mv debian/$(cdbs_curpkg)/usr/bin/webgui \
 		debian/$(cdbs_curpkg)/usr/bin/galax-webgui
 
+# by hand ocamldoc invocation, since we want to install the API reference in
+# galax-doc, see #466277
+OCAML_OCAMLDOC_PACKAGES =
+OCAML_OCAMLDOC_OCAMLFIND_FLAGS = -package pcre,netstring,equeue,netclient,netsys,pxp-engine,pxp-lex-iso88591,pxp-lex-utf8,camomile
+OCAML_OCAMLDOC_DESTDIR_HTML = $(shell $(_cdbs_class_path)/ocamldoc-api-ref-config --html-directory libgalax-ocaml-dev)
+# generate ocamldoc API reference and install it in galax-doc
+binary-install/galax-doc:: binary-install/libgalax-ocaml-dev
+binary-install/galax-doc::
+	mkdir -p debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML)
+	find debian/libgalax-ocaml-dev$(OCAML_STDLIB_DIR)/ \
+		-type f -name '*.mli' -or -name '*.ml' \
+	| xargs ocamlfind ocamldoc $(OCAML_OCAMLDOC_OCAMLFIND_FLAGS) \
+		$(OCAML_OCAMLDOC_FLAGS) $(OCAML_OCAMLDOC_FLAGS_HTML) \
+		-I debian/libgalax-ocaml-dev$(OCAML_STDLIB_DIR)/galax/ \
+		-html -d debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML) \
+		|| true
+build/galax-doc::
+	tmp=`$(_cdbs_class_path)/ocamldoc-api-ref-config --doc-base-generate libgalax-ocaml-dev` \
+	&& mv $$tmp `echo $$tmp | sed s/libgalax-ocaml-dev/galax-doc/`
+

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