[Pkg-ocaml-maint-commits] [SCM] pxp packaging branch, master, updated. debian/1.2.0.test1-3-26-g060dc7f

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 060dc7f3ed1d0293a70ecce41ac4d2d6b716a778
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Mar 16 17:57:05 2009 +0100

    generate doc-base entry for upstream ocamldoc API reference

diff --git a/debian/changelog b/debian/changelog
index d502e64..0b7b73e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,11 +18,13 @@ pxp (1.2.1-1) UNRELEASED; urgency=low
     - bump Standards-Version to 3.8.1 (no changes)
     - move pxp to (new) archive section "ocaml"
   * debian/docs: avoid installing vanished documents
+  * use upstream build system to create the ocamldoc reference manual,
+    because it includes extra documentation
   * debian/rules:
     - use ocaml.mk as a CDBS "rules" snippet
     - create destdir at the end of the build
-  * use upstream build system to create the ocamldoc reference manual,
-    because it includes extra documentation
+    - generate doc-base entry for upstream ocamldoc API reference
+  * debian/links: add link to preserve upstream manual dir structure
 
   [ Stephane Glondu ]
   * Switching packaging to git
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..758c4cc
--- /dev/null
+++ b/debian/links
@@ -0,0 +1 @@
+usr/share/doc/libpxp-ocaml-dev/html/ref	/usr/share/doc/libpxp-ocaml-dev/html/api
diff --git a/debian/rules b/debian/rules
index cc9c335..ae56738 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ endif
 build/$(PKGNAME)::
 	$(MAKE) -C doc/manual/
 	mkdir -p $(DESTDIR)
+	/usr/share/ocaml/ocamldoc-api-ref-config --doc-base-generate $(PKGNAME)
 binary-post-install/$(PKGNAME)::
 	-for f in debian/$(PKGNAME)/usr/share/doc/$(PKGNAME)/examples/xmlforms/styles/* ; do \
 		test ! -r $$f && rm -f $$f ; \

-- 
pxp packaging