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

[gildor at users.alioth.debian.org]

Author: gildor
Date: Thu Oct 18 00:23:23 2007
New Revision: 4644

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

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

Modified: trunk/packages/cameleon/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/changelog?rev=4644&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/changelog (original)
+++ trunk/packages/cameleon/trunk/debian/changelog Thu Oct 18 00:23:23 2007
@@ -6,7 +6,10 @@
   [ Stefano Zacchiroli ]
   * promote Homepage to a real debian/control field
 
- -- Stefano Zacchiroli <zack at debian.org>  Fri, 21 Sep 2007 09:59:48 +0200
+  [ Sylvain Le Gall ]
+  * Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
+
+ -- Sylvain Le Gall <gildor at debian.org>  Thu, 18 Oct 2007 01:07:58 +0200
 
 cameleon (1.9.18.svn20070918-1) unstable; urgency=low
 

Modified: trunk/packages/cameleon/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/control?rev=4644&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/control (original)
+++ trunk/packages/cameleon/trunk/debian/control Thu Oct 18 00:23:23 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:  Julien Cristau <julien.cristau at ens-lyon.org>, Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sven Luther <luther at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, 
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-9), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, 
  liblablgtk2-ocaml-dev (>= 2.6.0-13), libxml-light-ocaml-dev,
  liblablgtksourceview-ocaml-dev (>= 0.2.1-5), imagemagick, ocaml-findlib,
  dpkg-dev (>= 1.13.19), libpcre-ocaml-dev, camlp4 (>= 3.10.0),
@@ -42,7 +42,6 @@
     utility,
   - Report, a tool aims to make generation of XML documents from OCaml
     applications easier,
- .
 
 Package: cameleon-doc
 Section: doc

Modified: trunk/packages/cameleon/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/rules?rev=4644&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/rules (original)
+++ trunk/packages/cameleon/trunk/debian/rules Thu Oct 18 00:23:23 2007
@@ -76,7 +76,9 @@
 DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml      \
                                  $(CURDIR)/debian/xml-man/en/refentryinfo.xml
 
-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 := libcameleon-ocaml-dev
 
 clean::
 	-$(RM) '$(CURDIR)/src/odot/.depend'
@@ -110,13 +112,6 @@
 	-$(RM) '$(CURDIR)/debian/META.cameleon'
 	-$(RM) '$(CURDIR)/debian/libcameleon-ocaml-dev.ocamldoc-apiref'
 
-build/libcameleon-ocaml-dev::
-	i=libcameleon-ocaml-dev; \
-	sed -e "s/@PACKAGE@/$$i/g" \
-	  /usr/share/cdbs/1/class/ocaml-docbase-template.txt \
-	  > debian/$$i.doc-base.ocamldoc-apiref
-
-
 install/cameleon install/cameleon-doc install/libcameleon-ocaml-dev:: cameleon-install-extra
 
 cameleon-install-extra: common-install-indep common-install-arch