[Pkg-ocaml-maint-commits] r6393 - in /trunk/packages/camlrpc/trunk/debian: changelog control control.in librpc-ocaml-dev.dirs.in rules

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

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

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

Modified:
    trunk/packages/camlrpc/trunk/debian/changelog
    trunk/packages/camlrpc/trunk/debian/control
    trunk/packages/camlrpc/trunk/debian/control.in
    trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs.in
    trunk/packages/camlrpc/trunk/debian/rules

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

Modified: trunk/packages/camlrpc/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlrpc/trunk/debian/control?rev=6393&op=diff
==============================================================================
--- trunk/packages/camlrpc/trunk/debian/control (original)
+++ trunk/packages/camlrpc/trunk/debian/control Wed Jun 24 20:36:36 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Thomas Petazzoni <thomas.petazzoni at enix.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.2), ocaml-findlib, libequeue-ocaml-dev, dpatch (>= 1.19)
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.2), ocaml-findlib, libequeue-ocaml-dev, dpatch (>= 1.19), dh-ocaml (>= 0.4.1)
 Standards-Version: 3.7.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlrpc/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlrpc/trunk/

Modified: trunk/packages/camlrpc/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlrpc/trunk/debian/control.in?rev=6393&op=diff
==============================================================================
--- trunk/packages/camlrpc/trunk/debian/control.in (original)
+++ trunk/packages/camlrpc/trunk/debian/control.in Wed Jun 24 20:36:36 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Thomas Petazzoni <thomas.petazzoni at enix.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= #OcamlABI#), ocaml-findlib, libequeue-ocaml-dev, dpatch (>= 1.19)
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= #OcamlABI#), ocaml-findlib, libequeue-ocaml-dev, dpatch (>= 1.19), dh-ocaml (>= 0.4.1)
 Standards-Version: 3.7.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlrpc/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlrpc/trunk/

Modified: trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs.in?rev=6393&op=diff
==============================================================================
--- trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs.in (original)
+++ trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs.in Wed Jun 24 20:36:36 2009
@@ -1,2 +1,2 @@
-usr/lib/ocaml/#OcamlABI#
+#OCamlStdLibDir#
 usr/bin

Modified: trunk/packages/camlrpc/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlrpc/trunk/debian/rules?rev=6393&op=diff
==============================================================================
--- trunk/packages/camlrpc/trunk/debian/rules (original)
+++ trunk/packages/camlrpc/trunk/debian/rules Wed Jun 24 20:36:36 2009
@@ -8,12 +8,14 @@
 PACKAGE = camlrpc
 OCAMLABI := $(shell ocamlc -version)
 
+include /usr/share/ocaml/ocamlvars.mk
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 OCAML_LIBDIR=`ocamlc -where`
 
-DESTDIR=$(CURDIR)/debian/librpc-ocaml-dev/$(OCAML_LIBDIR)
+DESTDIR=$(CURDIR)/debian/librpc-ocaml-dev$(OCAML_STDLIB_DIR)
 BINDIR=$(CURDIR)/debian/librpc-ocaml-dev/usr/bin/
 
 # We use dpatch
@@ -21,7 +23,7 @@
 PACKAGE = camlrpc
 
 debian/control:
-	sed -e 's%#OcamlABI#%$(OCAMLABI)%' $@.in >$@
+	sed -e 's%#OcamlABI#%$(OCAMLABI)%' -e 's%#OCamlStdLibDir#%$(OCAML_STDLIB_DIR)%' $@.in >$@
 
 configure-stamp: configure
 	for t in `find debian/ -name \*.in | grep -v debian/control.in`; do \
@@ -67,6 +69,7 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp
+	mkdir -p $(DESTDIR)
 	$(MAKE) install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 	install -m 644 -D debian/librpc-ocaml-dev.linda-overrides debian/librpc-ocaml-dev/usr/share/linda/overrides/librpc-ocaml-dev
 	find . -name 'depend' -exec rm {} \;