[Pkg-ocaml-maint-commits] [SCM] ocamlweb packaging branch, master, updated. debian/1.37-13-1-g68940f9

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 68940f93248aae2abd7d9fa52004853995b16bf6
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri Oct 8 09:45:41 2010 +0200

    convert to dh, use dh-ocaml for dependencies
    
    disable auto test
    
    really disable auto test
    
    fix install target
    
    fix configure target
    
    fix config
    
    realy fix config
    
    do not run updatetex when building the package
    
    fix build target
    
    uploaders: -zack, bump Standards-version, dep on debhelper
    
    ??
    
    bump version of dh-ocaml, drop cdbs, install manual via dh_isnatll
    
    fix version of dh-ocaml
    
    install manula via dh_installdocs
    
    install manual via dh_installdocs
    
    keep original name of manual
    
    fix location of package dir
    
    {ocaml:Depends} for dependencies

diff --git a/debian/changelog b/debian/changelog
index f93fdc3..d988a4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ocamlweb (1.37-14) UNRELEASED; urgency=low
+
+  * debian/rule: convert to dh. Bump version of build-dependency on debhelper
+    to allow for overrides, drop dependency on cdbs.
+  * install manual via dh_installdocs
+  * Bump version of build-dependency on dh-ocaml to >= 0.9~. Use
+    {ocaml:Depends} to get binary dependencies (closes: #599323).
+  * Standards-Version: 3.9.1 (no change)
+  * Dropped zack from uploaders on his request.
+
+ -- Ralf Treinen <treinen at debian.org>  Sat, 09 Oct 2010 10:41:20 +0200
+
 ocamlweb (1.37-13) unstable; urgency=low
 
   * Standards-Version 3.8.4 (no change)
diff --git a/debian/control b/debian/control
index 5a6ab32..cf218ef 100644
--- a/debian/control
+++ b/debian/control
@@ -5,19 +5,20 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
  Ralf Treinen <treinen at debian.org>,
  Remi Vanicat <vanicat at debian.org>,
- Stefano Zacchiroli <zack at debian.org>,
  Samuel Mimram <smimram at debian.org>,
  Sylvain Le Gall <gildor at debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Build-Depends-Indep: ocaml-nox (>= 3.07)
-Build-Depends: debhelper (>= 7.0), tex-common, cdbs, dh-ocaml
+Build-Depends: debhelper (>= 7.0.50~),
+ tex-common,
+ dh-ocaml (>= 0.9~)
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlweb.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlweb.git
 Homepage: http://www.lri.fr/~filliatr/ocamlweb/index.en.html
 
 Package: ocamlweb
 Architecture: all
-Depends: ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}
+Depends: ${ocaml:Depends}, ${misc:Depends}
 # Recommends: texlive-latex-extra for fullpage.sty, texlive-binaries for
 # dvips, texlive-latex-base for latex.
 Recommends: texlive-latex-extra, texlive-binaries, texlive-latex-base
diff --git a/debian/ocamlweb.doc-base b/debian/ocamlweb.doc-base
index 2333c28..bf97413 100644
--- a/debian/ocamlweb.doc-base
+++ b/debian/ocamlweb.doc-base
@@ -6,5 +6,5 @@ Abstract: This manual describes what ocamlweb is
 Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/ocamlweb/ocamlweb-man.html
-Files: /usr/share/doc/ocamlweb/ocamlweb-man.html
+Index: /usr/share/doc/ocamlweb/ocamlweb-1.37-man.html
+Files: /usr/share/doc/ocamlweb/ocamlweb-1.37-man.html
diff --git a/debian/ocamlweb.docs b/debian/ocamlweb.docs
new file mode 100644
index 0000000..c817a0f
--- /dev/null
+++ b/debian/ocamlweb.docs
@@ -0,0 +1,2 @@
+doc/ocamlweb-1.37-man.html
+
diff --git a/debian/rules b/debian/rules
index 437b557..1f578f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,23 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
+DEB_DESTDIR=debian/ocamlweb
 
-install/ocamlweb::
-	cp doc/ocamlweb-*-man.html \
-		debian/ocamlweb/usr/share/doc/ocamlweb/ocamlweb-man.html
-	dh_installtex
+%:
+	dh $@ --with ocaml,tex
 
-DEB_CONFIGURE_NORMAL_ARGS = \
-	--prefix=$(DEB_DESTDIR)/usr/\
-	--mandir=$(DEB_DESTDIR)/usr/share/man
+# test target is currently broken
+override_dh_auto_test:
+
+override_dh_auto_configure:
+	./configure \
+	 	--prefix=$(DEB_DESTDIR)/usr/\
+		--mandir=$(DEB_DESTDIR)/usr/share/man
 
 # we have decided to build this package as bytecode
-DEB_MAKE_BUILD_TARGET = byte
-DEB_MAKE_INSTALL_TARGET = install-byte UPDATETEX=true
+override_dh_auto_build:
+	$(MAKE) byte
+
+# UPDATETEX: executed after installation of tex files
+override_dh_auto_install:
+	$(MAKE) install-byte UPDATETEX=true
+

-- 
ocamlweb packaging