[Pkg-ocaml-maint-commits] [SCM] cmigrep packaging branch, master, updated. debian/1.5-7-16-gd39f75c

[Ralf Treinen]

The following commit has been merged in the master branch:
commit b8ee0ea2839c466039685428900153e92690db4a
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed Feb 16 19:53:28 2011 +0100

    source format 3.0, use dh

diff --git a/debian/changelog b/debian/changelog
index 22a8466..dfcbf26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
 cmigrep (1.5-8) UNRELEASED; urgency=low
 
+  [ Stéphane Glondu ]
   * Add libfindlib-ocaml-dev to Build-Depends-Indep
 
- -- Stéphane Glondu <glondu at debian.org>  Wed, 09 Jun 2010 20:07:32 +0200
+  [ Ralf Treinen ]
+  * Standards-Version 3.9.1 (no change)
+  * debian/rules: Migrate to dh, drop build-dependency on cdbs, bump version
+    of build-dependency on debhelper
+  * Convert to source format 3.0, drop quilt from build-dependencies.
+
+ -- Ralf Treinen <treinen at debian.org>  Wed, 16 Feb 2011 19:52:59 +0100
 
 cmigrep (1.5-7) unstable; urgency=low
 
diff --git a/debian/cmigrep.install b/debian/cmigrep.install
new file mode 100644
index 0000000..0d5e951
--- /dev/null
+++ b/debian/cmigrep.install
@@ -0,0 +1 @@
+cmigrep
diff --git a/debian/control b/debian/control
index cf1b9ad..51ea0c0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,13 @@ Uploaders: Ralf Treinen <treinen at debian.org>,
  Samuel Mimram <smimram at debian.org>,
  Mehdi Dogguy <mehdi at debian.org>,
  Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 5.0), quilt, cdbs, dh-ocaml
+Build-Depends: debhelper (>= 7.0), dh-ocaml
 Build-Depends-Indep: ocaml-nox (>= 3.11.1),
  libpcre-ocaml-dev (>= 6.0.1),
  ocaml-findlib (>= 1.2.4-2),
  libfindlib-ocaml-dev,
  ocaml-compiler-libs
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cmigrep.git
 Homepage: http://homepage.mac.com/letaris/
diff --git a/debian/rules b/debian/rules
index 5560251..1e8f80b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,6 @@
 #!/usr/bin/make -f
+%:
+	dh $@ --with ocaml
 
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-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_MAKE_BUILD_TARGET = byte GODI_LIB=/usr/lib/ocaml/$(OCAMLABI)/compiler-libs
-
-install/cmigrep::
-	cp cmigrep debian/cmigrep/usr/bin
-
+override_auto_build:
+	$(MAKE) byte GODI_LIB=/usr/lib/ocaml/$(OCAMLABI)/compiler-libs
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
cmigrep packaging