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

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

Author: dogguy-guest
Date: Wed Jun 24 20:06:36 2009
New Revision: 6391

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

Modified:
    trunk/packages/ocaml-getopt/trunk/debian/changelog
    trunk/packages/ocaml-getopt/trunk/debian/control
    trunk/packages/ocaml-getopt/trunk/debian/rules

Modified: trunk/packages/ocaml-getopt/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-getopt/trunk/debian/changelog?rev=6391&op=diff
==============================================================================
--- trunk/packages/ocaml-getopt/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-getopt/trunk/debian/changelog Wed Jun 24 20:06:36 2009
@@ -1,8 +1,13 @@
 ocaml-getopt (0.0.20040811-9) 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:08 +0100
+  [ Mehdi Dogguy ]
+  * Add dh-ocaml as a build-dependency
+  * Use new Ocaml's standard library location
+
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Wed, 24 Jun 2009 22:04:21 +0200
 
 ocaml-getopt (0.0.20040811-8) unstable; urgency=low
 

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

Modified: trunk/packages/ocaml-getopt/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-getopt/trunk/debian/rules?rev=6391&op=diff
==============================================================================
--- trunk/packages/ocaml-getopt/trunk/debian/rules (original)
+++ trunk/packages/ocaml-getopt/trunk/debian/rules Wed Jun 24 20:06:36 2009
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 OCAMLABI = $(shell ocamlc -version)
-
+include /usr/share/ocaml/ocamlvars.mk
 ABI_FILES = $(wildcard debian/*.in)
 
 .PHONY: transition
@@ -44,9 +44,9 @@
 	
 	dh_install doc/* usr/share/doc/libgetopt-ocaml-dev/html/
 
-	mkdir -p $(CURDIR)/debian/libgetopt-ocaml-dev/usr/lib/ocaml/$(OCAMLABI)/
-	$(MAKE) install OCAMLFIND_DESTDIR=$(CURDIR)/debian/libgetopt-ocaml-dev/usr/lib/ocaml/$(OCAMLABI)/
-	cp getopt.mli $(CURDIR)/debian/libgetopt-ocaml-dev/usr/lib/ocaml/$(OCAMLABI)/getopt
+	mkdir -p $(CURDIR)/debian/libgetopt-ocaml-dev$(OCAML_STDLIB_DIR)
+	$(MAKE) install OCAMLFIND_DESTDIR=$(CURDIR)/debian/libgetopt-ocaml-dev$(OCAML_STDLIB_DIR)
+	cp getopt.mli $(CURDIR)/debian/libgetopt-ocaml-dev$(OCAML_STDLIB_DIR)/getopt
 
 
 # Build architecture-independent files here.