[Pkg-ocaml-maint-commits] [SCM] ocamlmakefile packaging branch, experimental/master, updated. debian/6.36.0-2-10-g67eec5f

[Ralf Treinen]

The following commit has been merged in the experimental/master branch:
commit 25321e02f109f21cb6942bd02abdbb30a900ea73
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Oct 11 07:40:08 2012 +0200

    debian/rules: convert to dh(1)

diff --git a/debian/changelog b/debian/changelog
index ce7802e..f77a27d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,13 @@ ocamlmakefile (6.37.0-1) experimental; urgency=low
       CHANGES.txt
   * Standards-Version 3.9.4 (no change)
   * Migrate debian/rules to dh(1):
+    - debian/rules: use dh
+    - debian/control: bump version in build-dependency on debhelper
     - debian/rules: build modified version of OCamlMakefile and of the examples
       in temporary directory builddir.
     - add files debian/ocamlmakefile.{dirs,install,examples} to install stuff.
 
- -- Ralf Treinen <treinen at debian.org>  Wed, 10 Oct 2012 08:42:38 +0200
+ -- Ralf Treinen <treinen at debian.org>  Thu, 11 Oct 2012 07:39:51 +0200
 
 ocamlmakefile (6.36.0-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index cfc86cd..f62032a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Ralf Treinen <treinen at debian.org>,
  Remi Vanicat <vanicat at debian.org>,
  Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 7.0)
+Build-Depends: debhelper (>= 7.0.50~)
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlmakefile.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlmakefile.git
diff --git a/debian/rules b/debian/rules
index abf3a60..c613694 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,9 @@
 #!/usr/bin/make -f
-# debian/rules for ocaml-tools
 
-#export DH_VERBOSE=1
+%:
+	dh $@ 
 
-# top level dir for documentation
-export DOCDIR=debian/ocamlmakefile/usr/share/doc/ocamlmakefile
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp:
-	dh_testdir
+override_dh_auto_build:
 	mkdir -p builddir
 	mkdir -p builddir/examples
 	sed "s|/usr/local/lib|/usr/lib|" \
@@ -24,35 +16,3 @@ build-stamp:
 	done
 	cp debian/README.examples.idl builddir/examples/calc/README
 	cp debian/README.examples.idl builddir/examples/idl/README
-
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean
-	-rm build-stamp
-	-rm -r builddir
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_prep
-
-binary-arch: build install
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	dh_install
-	dh_installdocs
-	dh_installexamples
-	dh_installchangelogs CHANGES.txt
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

-- 
ocamlmakefile packaging