[Pkg-ocaml-maint-commits] [SCM] laby packaging branch, master, updated. debian/0.5.4-1-3-g8b7d247

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit c6f2f8e1c528c723078b71b7aa56fad7add37079
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Nov 12 17:49:35 2009 +0100

    Use new features of dh-ocaml: automatic computation of dependencies

diff --git a/debian/changelog b/debian/changelog
index 2f5f17a..bd93b2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ laby (0.5.4-2) UNRELEASED; urgency=low
   * Build against lablgtk2 (>= 2.14) which brings bindings for
     gtksourceview2 and hence get rid of gtksourceview1
     (Closes: #541958).
+  * Use new features of dh-ocaml: automatic computation of dependencies
 
- -- Mehdi Dogguy <mehdi at debian.org>  Thu, 12 Nov 2009 17:38:57 +0100
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 12 Nov 2009 17:44:55 +0100
 
 laby (0.5.4-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c115a70..58cd5ce 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  quilt (>= 0.46-7~),
  ocaml-nox (>= 3.11.1),
  ocaml-findlib,
- dh-ocaml,
+ dh-ocaml (>= 0.9.0),
  liblablgtk2-ocaml-dev (>= 2.14),
  liblablgtksourceview2-ocaml-dev (>= 2.14)
 Standards-Version: 3.8.3
@@ -21,7 +21,7 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- ${F:LabyRuntime},
+ ${ocaml:Depends},
  ocaml-nox | java-compiler | c-compiler | ruby | gprolog
 Recommends: alsa-utils
 Suggests:
diff --git a/debian/rules b/debian/rules
index 3356343..a074e17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,12 +19,9 @@ override_dh_auto_install:
 	cp data/tiles/ant-e.svg $(CURDIR)/debian/laby/usr/share/icons/hicolor/scalable/apps/laby.svg
 	cp debian/laby.xpm $(CURDIR)/debian/laby/usr/share/pixmaps/
 	cp debian/laby.desktop $(CURDIR)/debian/laby/usr/share/applications/
-ifeq ($(OCAML_OPT_ARCH),)
-	echo 'F:LabyRuntime=liblablgtk2-ocaml,liblablgtksourceview-ocaml,ocaml-base-$(OCAML_ABI)' >> debian/laby.substvars
-endif
 
 %:
-	dh --with quilt $@
+	dh --with quilt,ocaml $@
 
 laby.6: laby.xml
 # Verification

-- 
laby packaging