[Pkg-ocaml-maint-commits] [SCM] ocaml-batteries packaging branch, master, updated. debian/1.1.0-2-15-g950a692

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit f6240fcfd3ffbd3414d7c5021cfec5cf90f4f31a
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jul 14 22:56:58 2010 +0200

    Bump standards version to 3.9.0, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index 2260456..5e45614 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ ocaml-batteries (1.2.2-1) UNRELEASED; urgency=low
     - Remove quilt from build-depends
   * Bump dh-ocaml version to 0.9.5 in Build-Depends.
   * Update libbatteries-ocaml-doc.doc-base
+  * Bump standards version to 3.9.0, no changes needed.
 
- -- Mehdi Dogguy <mehdi at debian.org>  Wed, 14 Jul 2010 22:55:56 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 14 Jul 2010 22:56:36 +0200
 
 ocaml-batteries (1.1.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fb6f1e7..f6f421c 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  libcamomile-ocaml-dev (>= 0.7),
  libounit-ocaml-dev,
  dh-ocaml (>= 0.9.5~)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-batteries.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-batteries.git
 Homepage: http://batteries.forge.ocamlcore.org
diff --git a/debian/libbatteries-ocaml-doc.doc-base b/debian/libbatteries-ocaml-doc.doc-base
index b3a0a7a..0acab43 100644
--- a/debian/libbatteries-ocaml-doc.doc-base
+++ b/debian/libbatteries-ocaml-doc.doc-base
@@ -4,5 +4,5 @@ Abstract: API reference manual for libbatteries-ocaml-doc (generated via OCamldo
 Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/libbatteries-ocaml-doc/html/api/index.html
-Files: /usr/share/doc/libbatteries-ocaml-doc/html/api/*
+Index: /usr/share/doc/libbatteries-ocaml-doc/html/index.html
+Files: /usr/share/doc/libbatteries-ocaml-doc/html/*
diff --git a/debian/libbatteries-ocaml-doc.install b/debian/libbatteries-ocaml-doc.install
index 838ddc5..648b9d0 100644
--- a/debian/libbatteries-ocaml-doc.install
+++ b/debian/libbatteries-ocaml-doc.install
@@ -1 +1 @@
-debian/tmp/doc/*	/usr/share/doc/libbatteries-ocaml-doc/html/api
+debian/tmp/doc/*	/usr/share/doc/libbatteries-ocaml-doc
diff --git a/debian/rules b/debian/rules
index 0a258ca..afaf256 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@ include /usr/share/ocaml/ocamlvars.mk
 
 DEB_DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 BATTERIES_DEB_DOCROOT = $(CURDIR)/debian/tmp/doc
-export BATTERIES_DOCROOT = /usr/share/doc/libbatteries-ocaml-doc/html/api/
+export BATTERIES_DOCROOT = /usr/share/doc/libbatteries-ocaml-doc/
 export DESTDIR = $(OCAML_STDLIB_DIR)
 DOC_PKG = libbatteries-ocaml-doc
 

-- 
ocaml-batteries packaging