[Pkg-ocaml-maint-commits] r4315 - in /trunk/packages/lablgtk/trunk/debian: changelog control rules

[gildor at users.alioth.debian.org]

Author: gildor
Date: Mon Sep  3 21:59:46 2007
New Revision: 4315

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4315
Log:
* Generate documentation
* Tighter build-dep on lablgl

Modified:
    trunk/packages/lablgtk/trunk/debian/changelog
    trunk/packages/lablgtk/trunk/debian/control
    trunk/packages/lablgtk/trunk/debian/rules

Modified: trunk/packages/lablgtk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/changelog?rev=4315&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/changelog (original)
+++ trunk/packages/lablgtk/trunk/debian/changelog Mon Sep  3 21:59:46 2007
@@ -1,8 +1,10 @@
-lablgtk2 (2.6.0-10) UNRELEASED; urgency=low
-
-  * UNRELEASED UNRELEASED
-
- -- Sylvain Le Gall <gildor at debian.org>  Mon, 03 Sep 2007 17:47:16 +0200
+lablgtk2 (2.6.0-10) unstable; urgency=low
+
+  * Tighten build dependency on liblabgl to make it build with the first
+    lablgl library which will have ocaml 3.10.0 ABI
+  * Generate ocamldoc documentation
+
+ -- Sylvain Le Gall <gildor at debian.org>  Mon, 03 Sep 2007 23:12:34 +0200
 
 lablgtk2 (2.6.0-9) unstable; urgency=low
 

Modified: trunk/packages/lablgtk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/control?rev=4315&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/control (original)
+++ trunk/packages/lablgtk/trunk/debian/control Mon Sep  3 21:59:46 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sven Luther <luther at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>> 5.0.0), ocaml (>= 3.10.0), camlp4 (>= 3.10.0), libncurses5-dev, libgtk2.0-dev, libgtkgl2.0-dev, libglade2-dev, liblablgl-ocaml-dev (>= 1.02-1), librsvg2-dev, libgnomecanvas2-dev, libgtkspell-dev, libgnomeui-dev, libpanel-applet2-dev, dpatch
+Build-Depends: debhelper (>> 5.0.0), ocaml (>= 3.10.0), camlp4 (>= 3.10.0), libncurses5-dev, libgtk2.0-dev, libgtkgl2.0-dev, libglade2-dev, liblablgl-ocaml-dev (>= 1.02-5), librsvg2-dev, libgnomecanvas2-dev, libgtkspell-dev, libgnomeui-dev, libpanel-applet2-dev, dpatch
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/lablgtk
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/

Modified: trunk/packages/lablgtk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/rules?rev=4315&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/rules (original)
+++ trunk/packages/lablgtk/trunk/debian/rules Mon Sep  3 21:59:46 2007
@@ -89,11 +89,27 @@
 	dh_testroot -s
 
 #	dh_installdebconf -s
-	dh_installdocs -s
 	dh_installexamples -s --exclude='.cvsignore' --exclude='rsvg' --exclude='panel' --exclude='canvas' --exclude='GL'
 	dh_installmenu -s
 	dh_movefiles -s
 	dh_install -s --sourcedir=$(DESTDIR) --list-missing
+	# Doc generation (TODO: use CDBS)
+	OCAMLDOC_PKG="liblablgtk2-ocaml-dev liblablgtk2-gl-ocaml-dev liblablgtk2-gnome-ocaml-dev"; \
+	OCAMLDOC_INCLUDE=`for i in $$OCAMLDOC_PKG; do find debian/$$i/$(OCAML_LIBDIR)/ -type d -exec echo -I \{} \; ; done`; \
+	for i in $$OCAMLDOC_PKG; do \
+	  mkdir -p debian/$$i/usr/share/doc/$$i/html/api; \
+	  find debian/$$i/$(OCAML_LIBDIR)/ \
+  	    -type f -name '*.mli' \
+	    | xargs ocamldoc -I $(OCAML_LIBDIR)/lablgl -I $(OCAML_LIBDIR)/threads \
+	     -pp "sed 's/@gtkdoc *\([A-Za-z-]* *[A-Za-z-]*\)/\(gtkdoc: \1\)/g'" \
+	     -stars -m A -no-custom-tags $$OCAMLDOC_INCLUDE -html \
+	     -d debian/$$i/usr/share/doc/$$i/html/api \
+            || true; \
+	    sed -e "s/@PACKAGE@/$$i/g" \
+	     /usr/share/cdbs/1/class/ocaml-docbase-template.txt \
+	     > debian/$$i.doc-base.ocamldoc-apiref ; \
+	done
+	dh_installdocs -s
 	dh_installman -s
 	dh_installinfo -s
 	dh_installchangelogs CHANGES -s