[Pkg-ocaml-maint-commits] [SCM] menhir packaging branch, master, updated. debian/20090204.dfsg-1-2-g2e19118

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit d8dd664bbf5d4f652607a723b9d834caaae812c4
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Thu Feb 19 23:43:56 2009 +0100

    Depend on ocaml-nox, Closes: #516134.

diff --git a/debian/changelog b/debian/changelog
index ffd86af..5146599 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+menhir (20090204.dfsg-2) UNRELEASED; urgency=low
+
+  * Depend on ocaml-nox, Closes: #516134.
+
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Thu, 19 Feb 2009 23:41:32 +0100
+
 menhir (20090204.dfsg-1) experimental; urgency=low
 
   * New Upstream Version
diff --git a/debian/control b/debian/control
index f8a7dcb..29045b7 100644
--- a/debian/control
+++ b/debian/control
@@ -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-nox-${F:OCamlAbi},
   ${shlibs:Depends},
   ${misc:Depends}
 Description: Parser generator for OCaml
diff --git a/debian/rules b/debian/rules
index 360c9a7..441b8ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,11 +46,7 @@ binary-indep: install-stamp
 
 # Build architecture-dependent files here.
 binary-arch: install-stamp
-ifeq ($(TARGET),byte)
-	echo 'F:OCamlRuntime=ocaml-base-nox-$(OCAMLABI)' >> debian/menhir.substvars
-else
-	echo 'F:OCamlRuntime=' >> debian/menhir.substvars
-endif
+	echo 'F:OCamlAbi=$(OCAMLABI)' >> debian/menhir.substvars
 	dh $@
 
 binary: binary-indep binary-arch

-- 
menhir packaging