[Pkg-ocaml-maint-commits] [SCM] hevea packaging branch, master, updated. debian/1.10-12-1-g19d84eb

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 19d84eb38e755d1941e65b3134243ec6a318711f
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Oct 10 16:38:34 2010 +0200

    Convert from cdbs to dh, use dh_ocaml for binary dependencies
    
    set DEB_DESTDIR variable
    
    use dh_ocaml for dependencies
    
    fix changelog
    
    fix versions of build depends
    
    use ocaml,tex dh plugins
    
    bump standards version

diff --git a/debian/changelog b/debian/changelog
index 2a4629f..f48af6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+hevea (1.10-13) unstable; urgency=low
+
+  * Convert to dh, drop dependency on cdbs, install gif.hva via dh_install.
+    Bump dependency on debhelper
+  * Use dh_ocaml (>= 0.9) to get binary dependencies in variable
+    ${ocaml:Depends} (closes: 599311).
+  * Bump Standards-Version to 3.9.1 (no change)
+
+ -- Ralf Treinen <treinen at debian.org>  Sun, 10 Oct 2010 16:54:43 +0200
+
 hevea (1.10-12) unstable; urgency=low
 
   [ Stéphane Glondu ]
diff --git a/debian/control b/debian/control
index ca942ef..bf7b4ab 100644
--- a/debian/control
+++ b/debian/control
@@ -9,15 +9,16 @@ Uploaders:
  Sylvain Le Gall <gildor at debian.org>,
  Stéphane Glondu <glondu at debian.org>
 Build-Depends-Indep:  ocaml-nox (>= 3.07), 
-Build-Depends: debhelper (>= 7.0), tex-common, cdbs, dh-ocaml
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50~), tex-common, dh-ocaml (>= 0.9)
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/hevea.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/hevea.git
 Homepage: http://hevea.inria.fr/
 
 Package: hevea
 Architecture: all
-Depends: ghostscript, netpbm(>=2:9.10-1), texlive-base , ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}
+Depends: ghostscript, netpbm(>=2:9.10-1), texlive-base ,
+ ${ocaml:Depends}, ${misc:Depends}
 Suggests: hevea-doc 
 Description: translates from LaTeX to HTML, info, or text
  Its remarkable features are
diff --git a/debian/hevea.install b/debian/hevea.install
new file mode 100644
index 0000000..e002d75
--- /dev/null
+++ b/debian/hevea.install
@@ -0,0 +1 @@
+html/gif.hva usr/share/hevea/html
diff --git a/debian/rules b/debian/rules
index d89118d..be3fe5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,11 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/ocaml.mk
+DEB_DESTDIR = debian/hevea
 
-makebuilddir/hevea::
+%:
+	dh $@ --with=ocaml,tex
+
+override_dh_auto_configure:
 	-rm config.sh
 	$(MAKE) config.sh\
 		DESTDIR=$(DEB_DESTDIR)\
@@ -12,13 +13,15 @@ makebuilddir/hevea::
 		LIBDIR=/usr/share/hevea\
 		LATEXLIBDIR=/usr/share/texmf/tex/latex/misc	
 
-clean/hevea::
+override_dh_auto_clean:
+	$(MAKE) clean
 	cd debian/examples; make clean
 
-install/hevea::
-	cp html/gif.hva $(DEB_DESTDIR)/usr/share/hevea/html
-	dh_installtex
+override_dh_auto_build:
+	$(MAKE) byte
+
+override_dh_auto_install:
+	$(MAKE) install TARGET=byte
+
+
 
-# we have decided to build this package as bytecode
-DEB_MAKE_BUILD_TARGET = byte
-DEB_MAKE_INSTALL_TARGET = install TARGET=byte

-- 
hevea packaging