[Pkg-ocaml-maint-commits] r4332 - in /trunk/packages/xml-light/trunk/debian: changelog control libxml-light-ocaml-dev.doc-base libxml-light-ocaml-dev.install.in rules

[gildor at users.alioth.debian.org]

Author: gildor
Date: Mon Sep  3 23:29:01 2007
New Revision: 4332

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4332
Log:
* Rebuild for ocaml 3.10.0
* CDBS ocamldoc

Removed:
    trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.doc-base
Modified:
    trunk/packages/xml-light/trunk/debian/changelog
    trunk/packages/xml-light/trunk/debian/control
    trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.install.in
    trunk/packages/xml-light/trunk/debian/rules

Modified: trunk/packages/xml-light/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/changelog?rev=4332&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/changelog (original)
+++ trunk/packages/xml-light/trunk/debian/changelog Mon Sep  3 23:29:01 2007
@@ -1,3 +1,10 @@
+xml-light (2.2-8) unstable; urgency=low
+
+  * Build for ocaml 3.10.0
+  * Use CDBS generated documentation rather than upstream doc
+
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 04 Sep 2007 01:23:52 +0200
+
 xml-light (2.2-7) experimental; urgency=low
 
   * Upgrade debian/watch version to 3,

Modified: trunk/packages/xml-light/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/control?rev=4332&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/control (original)
+++ trunk/packages/xml-light/trunk/debian/control Mon Sep  3 23:29:01 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.09.2-7)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/xml-light
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/

Modified: trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.install.in?rev=4332&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.install.in (original)
+++ trunk/packages/xml-light/trunk/debian/libxml-light-ocaml-dev.install.in Mon Sep  3 23:29:01 2007
@@ -1,2 +1,1 @@
-doc/*                 /usr/share/doc/libxml-light-ocaml-dev/html/
 debian/META.xml-light @OCamlStdlibDir@/METAS/

Modified: trunk/packages/xml-light/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/xml-light/trunk/debian/rules?rev=4332&op=diff
==============================================================================
--- trunk/packages/xml-light/trunk/debian/rules (original)
+++ trunk/packages/xml-light/trunk/debian/rules Mon Sep  3 23:29:01 2007
@@ -34,7 +34,6 @@
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET    += opt
 endif
-DEB_MAKE_BUILD_TARGET    += doc
 
 DEB_MAKE_INSTALL_TARGET  := install 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
@@ -42,10 +41,11 @@
 endif
 DEB_MAKE_INSTALL_TARGET  += INSTALLDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/xml-light"
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
+
+OCAML_OCAMLDOC_PACKAGES := libxml-light-ocaml-dev
 
 clean::
-	-$(RM) -r $(CURDIR)/doc
 	-$(RM) $(CURDIR)/xml-light.a
 	-$(RM) $(CURDIR)/debian/META.xml-light
 	-$(RM) $(CURDIR)/debian/libxml-light-ocaml-dev.dirs