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

[dogguy-guest at users.alioth.debian.org]

Author: dogguy-guest
Date: Wed Jun 24 19:43:54 2009
New Revision: 6389

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6389
Log:
Remove usage of old Ocaml's Standard library location and add dh-ocaml as a build-dep

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

Modified: trunk/packages/otags/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/otags/trunk/debian/changelog?rev=6389&op=diff
==============================================================================
--- trunk/packages/otags/trunk/debian/changelog (original)
+++ trunk/packages/otags/trunk/debian/changelog Wed Jun 24 19:43:54 2009
@@ -1,8 +1,13 @@
 otags (3.09.3-3) UNRELEASED; urgency=low
 
+  [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
 
- -- Stefano Zacchiroli <zack at debian.org>  Mon, 31 Dec 2007 16:50:15 +0100
+  [ Mehdi Dogguy ]
+  * Remove usage of old Ocaml's Standard library location
+  * Add dh-ocaml as a build dependency
+
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Wed, 24 Jun 2009 21:36:51 +0200
 
 otags (3.09.3-2) unstable; urgency=low
 

Modified: trunk/packages/otags/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/otags/trunk/debian/control?rev=6389&op=diff
==============================================================================
--- trunk/packages/otags/trunk/debian/control (original)
+++ trunk/packages/otags/trunk/debian/control Wed Jun 24 19:43:54 2009
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: ocaml-nox (>= 3.10.0), debhelper (>= 4.0.0), dpatch, camlp5
+Build-Depends: ocaml-nox (>= 3.10.0), debhelper (>= 4.0.0), dh-ocaml (>= 0.4.1), dpatch, camlp5
 Standards-Version: 3.7.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/otags/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/otags/trunk/

Modified: trunk/packages/otags/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/otags/trunk/debian/rules?rev=6389&op=diff
==============================================================================
--- trunk/packages/otags/trunk/debian/rules (original)
+++ trunk/packages/otags/trunk/debian/rules Wed Jun 24 19:43:54 2009
@@ -7,18 +7,18 @@
 #export DH_VERBOSE=1
 
 PACKAGE=otags
+include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/dpatch/dpatch.make
-OCAMLABI = $(shell ocamlc -version)
 
 .PHONY: ocamlinit
 
 ocamlinit: debian/dirs.in
 	for t in $^; do \
-	    sed -e 's%#OCamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
+	    sed -e 's%#OCamlABI#%$(OCAML_ABI)%' $$t >$${t%.in}; \
 	done
 configure-stamp: patch-stamp configure
 	dh_testdir
-	./configure --prefix /usr --libdir /usr/lib/ocaml/$(OCAMLABI)/otags/ --bytecode
+	./configure --prefix /usr --libdir $(OCAML_STDLIB_DIR)/otags/ --bytecode
 	touch configure-stamp
 
 build: build-stamp
@@ -70,7 +70,7 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
 	dh_md5sums
 	dh_builddeb