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

[gildor at users.alioth.debian.org]

Author: gildor
Date: Wed Oct 17 23:36:13 2007
New Revision: 4638

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4638
Log:
* Use OCAML_OCAMLDOC_PACKAGES_DOCBASE CDBS variable

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

Modified: trunk/packages/ocamldap/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/changelog?rev=4638&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/changelog (original)
+++ trunk/packages/ocamldap/trunk/debian/changelog Wed Oct 17 23:36:13 2007
@@ -1,8 +1,9 @@
 ocamldap (2.1.8-6) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-
- -- Sylvain Le Gall <gildor at debian.org>  Tue, 18 Sep 2007 11:58:18 +0200
+  * Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
+
+ -- Sylvain Le Gall <gildor at debian.org>  Thu, 18 Oct 2007 01:12:07 +0200
 
 ocamldap (2.1.8-5) unstable; urgency=low
 

Modified: trunk/packages/ocamldap/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/control?rev=4638&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/control (original)
+++ trunk/packages/ocamldap/trunk/debian/control Wed Oct 17 23:36:13 2007
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org> 
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), ocaml-findlib (>= 1.1.2pl1-4), libocamlnet-ocaml-dev (>= 2.2.8.1-1), libssl-ocaml-dev (>= 0.4.2-3)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-9), ocaml-findlib (>= 1.1.2pl1-4), libocamlnet-ocaml-dev (>= 2.2.8.1-1), libssl-ocaml-dev (>= 0.4.2-3)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamldap
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/

Modified: trunk/packages/ocamldap/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldap/trunk/debian/rules?rev=4638&op=diff
==============================================================================
--- trunk/packages/ocamldap/trunk/debian/rules (original)
+++ trunk/packages/ocamldap/trunk/debian/rules Wed Oct 17 23:36:13 2007
@@ -38,7 +38,9 @@
 DEB_MAKE_INSTALL_TARGET  := install \
   OCAMLFIND_INSTFLAGS="-ldconf ignore -destdir $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-9),$(CDBS_BUILD_DEPENDS))
+
+OCAML_OCAMLDOC_PACKAGES_DOCBASE := libmlpcap-ocaml-dev
 
 clean::
 	-$(RM) '$(CURDIR)/varcc.cmo' 
@@ -47,12 +49,6 @@
 	-$(RM) '$(CURDIR)/debian/libldap-ocaml-dev.dirs'
 	-$(RM) '$(CURDIR)/debian/libldap-ocaml-dev.doc-base.ocamldoc-apiref'
 
-build/libldap-ocaml-dev::
-	i=libmlpcap-ocaml-dev; \
-	sed -e "s/@PACKAGE@/$$i/g" \
-	  /usr/share/cdbs/1/class/ocaml-docbase-template.txt \
-	  > debian/$$i.doc-base.ocamldoc-apiref
-
 install/libldap-ocaml-dev::
 	ocamlfind ocamldoc -package ssl -html -d \
 	  $(DESTDIR_DEV)/usr/share/doc/libldap-ocaml-dev/html/api/ *.mli