[Pkg-ocaml-maint-commits] [SCM] menhir packaging branch, master, updated. debian/20090505.dfsg-1-1-g1fb2971

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 1fb29717c0023de5668f0b04979aea180bbe4aff
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Fri Jul 24 18:07:01 2009 +0200

    Use new features of dh-ocaml

diff --git a/debian/changelog b/debian/changelog
index 777891d..019cbd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+menhir (20090505.dfsg-2) unstable; urgency=low
+
+  * Use new features of dh-ocaml.
+
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Fri, 24 Jul 2009 18:07:25 +0200
+
 menhir (20090505.dfsg-1) unstable; urgency=low
 
   * New Upstream Version
diff --git a/debian/control b/debian/control
index 7182a52..91a1af5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
   debhelper (>= 7.0.0),
   dpatch,
   ocaml-nox (>= 3.11.1),
-  dh-ocaml (>= 0.4)
+  dh-ocaml (>= 0.9)
 Standards-Version: 3.8.0
 DM-Upload-Allowed: yes
 Homepage: http://gallium.inria.fr/~fpottier/menhir/
@@ -19,7 +19,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/menhir.git
 Package: menhir
 Architecture: any
 Depends:
-  ${F:OCamlRuntime},
+  ${ocaml:Depends},
   ${shlibs:Depends},
   ${misc:Depends}
 Description: Parser generator for OCaml
@@ -37,9 +37,11 @@ Package: libmenhir-ocaml-dev
 Section: ocaml
 Architecture: any
 Depends:
-  ocaml-nox-${F:OCamlAbi},
+  ${ocaml:Depends},
   ${shlibs:Depends},
   ${misc:Depends}
+Provides:
+  ${ocaml:Provides}
 Description: Menhir library for OCaml
  This package contains the Menhir library for OCaml. It gives access to,
  among others, the following modules:
diff --git a/debian/libmenhir-ocaml-dev.install.in b/debian/libmenhir-ocaml-dev.install.in
index e1337cd..eba55ce 100644
--- a/debian/libmenhir-ocaml-dev.install.in
+++ b/debian/libmenhir-ocaml-dev.install.in
@@ -1,2 +1,2 @@
 src/menhirLib.*		@OCamlStdlibDir@/menhirLib/
-META			@OCamlStdlibDir@/menhirLib/
+src/META		@OCamlStdlibDir@/menhirLib/
diff --git a/debian/menhir.clean b/debian/menhir.clean
deleted file mode 100644
index ea21f4e..0000000
--- a/debian/menhir.clean
+++ /dev/null
@@ -1 +0,0 @@
-META
diff --git a/debian/rules b/debian/rules
index 2965be4..7793294 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,38 +3,18 @@
 
 export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
 include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
 
 DESTDIR := $(CURDIR)/debian/menhir
-STRIPOPT := $(if $(OCAML_OPT_ARCH),-e "",-e "/native/d")
 
-build: ocamlinit-stamp build-stamp
-build-stamp: patch-stamp
-	dh_testdir
+override_dh_auto_build:
 	$(MAKE) TARGET=$(OCAML_BEST) PREFIX=/usr
-	sed $(STRIPOPT) src/META > META
-	dh build --after auto_build
-	touch $@
 
-clean: unpatch ocamlinit-clean
-	dh clean
+override_dh_auto_clean:
 	$(MAKE) -C src/ clean PREFIX=$(DESTDIR)/usr
 
-install: build install-stamp
-install-stamp:
-	dh install --before auto_install
+override_dh_auto_install:
 	cp src/menhir.$(OCAML_BEST) $(DESTDIR)/usr/bin/menhir
-	dh install --after auto_install
-	touch $@
 
-binary-indep: install-stamp
-
-binary-arch: install-stamp
-	echo 'F:OCamlRuntime=ocaml-base-nox-$(OCAML_ABI)' >> debian/menhir.substvars
-	echo 'F:OCamlAbi=$(OCAML_ABI)' >> debian/libmenhir-ocaml-dev.substvars
-	dh $@
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+%:
+	dh --with ocaml $@

-- 
menhir packaging