[Pkg-ocaml-maint-commits] r3546 - in /trunk/packages/ocamldsort/trunk/debian: changelog control rules

[jcristau at users.alioth.debian.org]

Author: jcristau
Date: Thu Feb  8 12:12:53 2007
New Revision: 3546

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3546
Log:
* Non-maintainer upload.
* High-urgency upload for RC bugfix.
* Add dependency on the package containing /usr/bin/ocamlrun on
  architectures where ocamldsort is built as bytecode (closes: #409169).

Modified:
    trunk/packages/ocamldsort/trunk/debian/changelog
    trunk/packages/ocamldsort/trunk/debian/control
    trunk/packages/ocamldsort/trunk/debian/rules

Modified: trunk/packages/ocamldsort/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldsort/trunk/debian/changelog?rev=3546&op=diff
==============================================================================
--- trunk/packages/ocamldsort/trunk/debian/changelog (original)
+++ trunk/packages/ocamldsort/trunk/debian/changelog Thu Feb  8 12:12:53 2007
@@ -1,3 +1,12 @@
+ocamldsort (0.14.3-1.4) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * Add dependency on the package containing /usr/bin/ocamlrun on
+    architectures where ocamldsort is built as bytecode (closes: #409169).
+
+ -- Julien Cristau <jcristau at debian.org>  Thu,  8 Feb 2007 11:07:25 +0100
+
 ocamldsort (0.14.3-1.3) unstable; urgency=low
 
   * NMU.

Modified: trunk/packages/ocamldsort/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldsort/trunk/debian/control?rev=3546&op=diff
==============================================================================
--- trunk/packages/ocamldsort/trunk/debian/control (original)
+++ trunk/packages/ocamldsort/trunk/debian/control Thu Feb  8 12:12:53 2007
@@ -8,7 +8,7 @@
 
 Package: ocamldsort
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${F:OCamlRun}
 Description: dependency sorter for OCaml source files
  The ocamldsort command scans a set of Objective Caml source files (.ml
  and .mli files), sorts them according to their dependencies and prints

Modified: trunk/packages/ocamldsort/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamldsort/trunk/debian/rules?rev=3546&op=diff
==============================================================================
--- trunk/packages/ocamldsort/trunk/debian/rules (original)
+++ trunk/packages/ocamldsort/trunk/debian/rules Thu Feb  8 12:12:53 2007
@@ -10,6 +10,9 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+OCAMLABI = $(shell ocamlc -version)
+BYTECODE = $(shell [ -x /usr/bin/ocamlopt ] || echo yes)
+OCAMLRUN = $(if $(BYTECODE),ocaml-base-nox-$(OCAMLABI))
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -72,7 +75,7 @@
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlRun=$(OCAMLRUN)
 	dh_md5sums
 	dh_builddeb