[Pkg-ocaml-maint-commits] [SCM] bibtex2html packaging branch, master, updated. debian/1.95-1-27-g50935dd

[Ralf Treinen]

The following commit has been merged in the master branch:
commit caf6885d408f42048b3ff9ea6d890189f9d00990
Author: Ralf Treinen <treinen at free.fr>
Date:   Sat Apr 3 10:23:32 2010 +0200

    migrated from cdbs to dh

diff --git a/debian/changelog b/debian/changelog
index c82615b..ae36acb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ bibtex2html (1.95-1) unstable; urgency=low
   * New upstream version
   * Remove patch strings_utf8, this is fixed by upstream now.
   * Shifted linenumbers of patches according to the new upstream version.
+  * Migrated debian/rules from cdbs to dh, removed build-dependency on cdbs.
 
- -- Ralf Treinen <treinen at debian.org>  Wed, 31 Mar 2010 20:44:19 +0200
+ -- Ralf Treinen <treinen at debian.org>  Sat, 03 Apr 2010 10:22:59 +0200
 
 bibtex2html (1.94-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3378466..88d8804 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Uploaders:
  Sylvain Le Gall <gildor at debian.org>
 Standards-Version: 3.8.4
 Build-Depends-Indep: ocaml-nox (>= 3.07), hevea
-Build-Depends: debhelper (>= 7.0), cdbs, dh-ocaml
+Build-Depends: debhelper (>= 7.0), dh-ocaml
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/bibtex2html.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/bibtex2html.git
 Homepage: http://www.lri.fr/~filliatr/bibtex2html/index.en.html
diff --git a/debian/rules b/debian/rules
index aea44e8..86b0758 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,20 @@
 #!/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=$(PWD)/debian/bibtex2html
 
-# we have decided to build this package as bytecode
-DEB_MAKE_BUILD_TARGET = byte manual.html
-DEB_MAKE_INSTALL_TARGET = install-byte
+%:
+	dh $@ --with ocaml
 
-# upstream makefile does not respect DESTDIR
-DEB_CONFIGURE_NORMAL_ARGS = \
-	 --bindir=$(DEB_DESTDIR)/usr/bin --prefix=$(DEB_DESTDIR)/usr/share
+override_dh_auto_configure:
+	./configure --bindir=$(DEB_DESTDIR)/usr/bin\
+			 --prefix=$(DEB_DESTDIR)/usr/share
+
+override_dh_auto_build:
+	$(MAKE) byte manual.html
+
+override_dh_auto_install:
+	$(MAKE) install-byte
+
+override_dh_strip:
+
+override_dh_auto_test:

-- 
bibtex2html packaging