[Pkg-ocaml-maint-commits] r4336 - in /trunk/packages/extlib/trunk/debian: changelog control libextlib-ocaml-dev.doc-base patches/00list patches/03_install.dpatch rules

[zack at users.alioth.debian.org]

Author: zack
Date: Tue Sep  4 08:04:02 2007
New Revision: 4336

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4336
Log:
* debian/rules
  - use CDBS support to generated ocamldoc documentation
* debian/patches
  - remove no longer needed patch 03_install (was only useful to tune
    ocamldoc generation)
* debian/*.doc-base
  - remove doc-base entry for ocamldoc API reference, now it will be
    automatically generated during build

Removed:
    trunk/packages/extlib/trunk/debian/libextlib-ocaml-dev.doc-base
    trunk/packages/extlib/trunk/debian/patches/03_install.dpatch
Modified:
    trunk/packages/extlib/trunk/debian/changelog
    trunk/packages/extlib/trunk/debian/control
    trunk/packages/extlib/trunk/debian/patches/00list
    trunk/packages/extlib/trunk/debian/rules

Modified: trunk/packages/extlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/extlib/trunk/debian/changelog?rev=4336&op=diff
==============================================================================
--- trunk/packages/extlib/trunk/debian/changelog (original)
+++ trunk/packages/extlib/trunk/debian/changelog Tue Sep  4 08:04:02 2007
@@ -1,8 +1,15 @@
-extlib (1.5-9) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Stefano Zacchiroli <zack at debian.org>  Thu, 12 Jul 2007 13:44:35 +0000
+extlib (1.5-9) unstable; urgency=low
+
+  * debian/rules
+    - use CDBS support to generated ocamldoc documentation
+  * debian/patches
+    - remove no longer needed patch 03_install (was only useful to tune
+      ocamldoc generation)
+  * debian/*.doc-base
+    - remove doc-base entry for ocamldoc API reference, now it will be
+      automatically generated during build
+
+ -- Stefano Zacchiroli <zack at debian.org>  Tue, 04 Sep 2007 10:02:33 +0200
 
 extlib (1.5-8) experimental; urgency=low
 

Modified: trunk/packages/extlib/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/extlib/trunk/debian/control?rev=4336&op=diff
==============================================================================
--- trunk/packages/extlib/trunk/debian/control (original)
+++ trunk/packages/extlib/trunk/debian/control Tue Sep  4 08:04:02 2007
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: ocaml-nox (>= 3.10.0), ocaml-findlib (>= 1.1), debhelper (>> 5.0.0), dpatch, cdbs
+Build-Depends: ocaml-nox (>= 3.10.0-8), ocaml-findlib (>= 1.1), debhelper (>> 5.0.0), dpatch, cdbs
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/extlib
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/extlib/trunk/

Modified: trunk/packages/extlib/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/extlib/trunk/debian/patches/00list?rev=4336&op=diff
==============================================================================
--- trunk/packages/extlib/trunk/debian/patches/00list (original)
+++ trunk/packages/extlib/trunk/debian/patches/00list Tue Sep  4 08:04:02 2007
@@ -1,2 +1,1 @@
-03_install.dpatch
 build_with_debug_info.dpatch

Modified: trunk/packages/extlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/extlib/trunk/debian/rules?rev=4336&op=diff
==============================================================================
--- trunk/packages/extlib/trunk/debian/rules (original)
+++ trunk/packages/extlib/trunk/debian/rules Tue Sep  4 08:04:02 2007
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
 PKGNAME = libextlib-ocaml-dev
-
+OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
 PKGDIR = $(CURDIR)/debian/$(PKGNAME)
 DESTDIR = $(PKGDIR)$(OCAML_STDLIB_DIR)/extlib
 DOCDIR = $(PKGDIR)/usr/share/doc/$(PKGNAME)/
@@ -11,12 +12,9 @@
 common-build-arch::
 	mkdir -p $(DESTDIR)/ $(DOCDIR)/
 	if [ -x /usr/bin/ocamlopt ]; then \
-		ocaml install.ml -d $(DESTDIR)/ -b -n -doc; \
+		ocaml install.ml -d $(DESTDIR)/ -b -n -nodoc; \
 	else \
-		ocaml install.ml -d $(DESTDIR)/ -b -doc; \
+		ocaml install.ml -d $(DESTDIR)/ -b -nodoc; \
 	fi
 	cp -a extLib.ml *.mli $(DESTDIR)/
 	cp -a META.txt $(DESTDIR)/META
-	mv $(DESTDIR)/extlib-doc/ $(DOCDIR)/html
-
-include /usr/share/cdbs/1/rules/dpatch.mk