[Pkg-ocaml-maint-commits] r2102 - trunk/packages/camlrpc/trunk/debian

[Thomas Petazzoni]

Author: tpetazzo-guest
Date: 2005-11-22 21:55:08 +0000 (Tue, 22 Nov 2005)
New Revision: 2102

Added:
   trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs.in
Removed:
   trunk/packages/camlrpc/trunk/debian/control
   trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs
Modified:
   trunk/packages/camlrpc/trunk/debian/changelog
   trunk/packages/camlrpc/trunk/debian/control.in
   trunk/packages/camlrpc/trunk/debian/rules
Log:
Upgrade for Ocaml 3.09.

Modified: trunk/packages/camlrpc/trunk/debian/changelog
===================================================================
--- trunk/packages/camlrpc/trunk/debian/changelog	2005-11-22 21:28:42 UTC (rev 2101)
+++ trunk/packages/camlrpc/trunk/debian/changelog	2005-11-22 21:55:08 UTC (rev 2102)
@@ -1,3 +1,10 @@
+camlrpc (0.4.4-2) unstable; urgency=low
+
+  * Update to ocaml 3.09.
+  * No longer hardcoding OCaml's ABI in debian/* files.
+
+ -- Thomas Petazzoni <thomas.petazzoni at enix.org>  Tue, 22 Nov 2005 22:29:49 +0100
+
 camlrpc (0.4.4-1) unstable; urgency=low
 
   * New upstream version, with the following improvments:

Deleted: trunk/packages/camlrpc/trunk/debian/control
===================================================================
--- trunk/packages/camlrpc/trunk/debian/control	2005-11-22 21:28:42 UTC (rev 2101)
+++ trunk/packages/camlrpc/trunk/debian/control	2005-11-22 21:55:08 UTC (rev 2102)
@@ -1,18 +0,0 @@
-Source: camlrpc
-Section: devel
-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.0), ocaml-findlib, libequeue-ocaml-dev, dpatch (>= 1.19)
-Standards-Version: 3.6.2
-
-Package: librpc-ocaml-dev
-Section: libdevel
-Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libequeue-ocaml-dev, ${shlibs:Depends}
-Description: Ocaml Sun RPC libraries
- RPC is a package supporting the Sun RPC protocol. RPC programs,
- procedures, clients, and servers can be dynamically represented and
- modified. Of course, there is also a classical RPC generator which
- generates functions doing the language mapping from XDR values to
- language values and vice versa.

Modified: trunk/packages/camlrpc/trunk/debian/control.in
===================================================================
--- trunk/packages/camlrpc/trunk/debian/control.in	2005-11-22 21:28:42 UTC (rev 2101)
+++ trunk/packages/camlrpc/trunk/debian/control.in	2005-11-22 21:55:08 UTC (rev 2102)
@@ -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)
 Standards-Version: 3.6.2
 
 Package: librpc-ocaml-dev

Deleted: trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs
===================================================================
--- trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs	2005-11-22 21:28:42 UTC (rev 2101)
+++ trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs	2005-11-22 21:55:08 UTC (rev 2102)
@@ -1,2 +0,0 @@
-usr/lib/ocaml/3.08.3
-usr/bin

Copied: trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs.in (from rev 1691, trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs)
===================================================================
--- trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs	2005-08-28 10:49:55 UTC (rev 1691)
+++ trunk/packages/camlrpc/trunk/debian/librpc-ocaml-dev.dirs.in	2005-11-22 21:55:08 UTC (rev 2102)
@@ -0,0 +1,2 @@
+usr/lib/ocaml/#OcamlABI#
+usr/bin

Modified: trunk/packages/camlrpc/trunk/debian/rules
===================================================================
--- trunk/packages/camlrpc/trunk/debian/rules	2005-11-22 21:28:42 UTC (rev 2101)
+++ trunk/packages/camlrpc/trunk/debian/rules	2005-11-22 21:55:08 UTC (rev 2102)
@@ -6,15 +6,13 @@
 # dh-make output file, you may use that output file without restriction.
 # This special exception was added by Craig Small in version 0.37 of dh-make.
 PACKAGE = camlrpc
+OCAMLABI := $(shell ocamlc -version)
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 OCAML_LIBDIR=`ocamlc -where`
 
-OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
-
 DESTDIR=$(CURDIR)/debian/librpc-ocaml-dev/$(OCAML_LIBDIR)
 BINDIR=$(CURDIR)/debian/librpc-ocaml-dev/usr/bin/
 
@@ -22,10 +20,15 @@
 include /usr/share/dpatch/dpatch.make
 PACKAGE = camlrpc
 
-ocamlinit:
-	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+debian/control:
+         sed -e 's%#OcamlABI#%$(OCAMLABI)%' $@.in >$@
 
+configure: configure-stamp
 configure-stamp: configure
+        for t in `find . -name \*.in |  | grep -v debian/control.in`; do \
+                sed -e 's%#OcamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
+        done
+
 	dh_testdir
 	# Add here commands to configure the package.
 	./configure -with-ocamlrpcgen \
@@ -35,8 +38,8 @@
                     -bindir $(BINDIR)
 	touch configure-stamp
 
-build: build-stamp
-build-stamp: patch-stamp configure-stamp
+build: configure-stamp build-stamp
+build-stamp: patch-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -85,7 +88,7 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
+	dh_gencontrol -s -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums
 	dh_builddeb