OcamlABI'fied the remaining 3.09.0 containing files.

diff --git a/debian/ocaml-md5sums/configure b/debian/ocaml-md5sums/configure
deleted file mode 100644 (file)
index 10a6930..0000000
--- a/debian/ocaml-md5sums/configure
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-DEFAULT="/var/lib/ocaml/3.09.0/md5sums"
-if [ -z "$1" ]; then
-  echo "No dir provided, using default: $DEFAULT"
-  echo "You can override it with: ./configure [ md5sums_dir ]"
-  MD5SUMS_DIR="$DEFAULT"
-else
-  MD5SUMS_DIR="$1"
-fi
-echo -n "Creating ocaml-md5sums.ml ... "
-sed "s:@MD5SUMS_DIR@:$MD5SUMS_DIR:" < ocaml-md5sums.ml.in > ocaml-md5sums.ml
-echo "done."

diff --git a/debian/ocaml-md5sums/configure.in b/debian/ocaml-md5sums/configure.in
new file mode 100644 (file)
index 0000000..addfa60
--- /dev/null
+++ b/debian/ocaml-md5sums/configure.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+DEFAULT="/var/lib/ocaml/#OcamlABI#/md5sums"
+if [ -z "$1" ]; then
+  echo "No dir provided, using default: $DEFAULT"
+  echo "You can override it with: ./configure [ md5sums_dir ]"
+  MD5SUMS_DIR="$DEFAULT"
+else
+  MD5SUMS_DIR="$1"
+fi
+echo -n "Creating ocaml-md5sums.ml ... "
+sed "s:@MD5SUMS_DIR@:$MD5SUMS_DIR:" < ocaml-md5sums.ml.in > ocaml-md5sums.ml
+echo "done."

diff --git a/debian/patches/versioned_libdir.dpatch b/debian/patches/versioned_libdir.dpatch
deleted file mode 100755 (executable)
index 922e053..0000000
--- a/debian/patches/versioned_libdir.dpatch
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh -e 
-## versioned_libdir.dpatch by  <luther@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add the version as path element for OCAML_LIBDIR.
-
-if [ $# -ne 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;   
-    *)
-       echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-       exit 1;;
-esac
-
-exit 0
-@DPATCH@
-diff -ur ocaml-3.08.orig/camlp4/config/configure_batch ocaml-3.08/camlp4/config/configure_batch
---- ocaml-3.08.orig/camlp4/config/configure_batch.orig 2003-09-30 18:11:57.000000000 +0200
-+++ ocaml-3.08/camlp4/config/configure_batch   2003-09-30 18:12:51.000000000 +0200
-@@ -94,13 +94,13 @@
-    *) echo "BINDIR=$bindir" >> Makefile.cnf;;
- esac
- case "$libdir" in
--  "") echo 'LIBDIR=$(PREFIX)/lib/camlp4' >> Makefile.cnf
--      libdir="$prefix/lib/camlp4";;
-+  "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/3.09.0/camlp4' >> Makefile.cnf
-+      libdir="$prefix/lib/ocaml/3.09.0/camlp4";;
-    *) echo "LIBDIR=$libdir" >> Makefile.cnf;;
- esac
- case "$mandir" in
--  "") echo 'MANDIR=$(PREFIX)/man/man1' >> Makefile.cnf
--      mandir="$prefix/man/man1";;
-+  "") echo 'MANDIR=$(PREFIX)/share/man/man1' >> Makefile.cnf
-+      mandir="$prefix/share/man/man1";;
-    *) echo "MANDIR=$mandir" >> Makefile.cnf;;
- esac
- 
-diff -ur ocaml-3.08.orig/configure ocaml-3.08/configure
---- ocaml-3.08.orig/configure  2003-09-30 18:09:47.000000000 +0200
-+++ ocaml-3.08/configure       2003-09-30 18:10:12.000000000 +0200
-@@ -149,8 +149,8 @@
-    *) echo "BINDIR=$bindir" >> Makefile;;
- esac
- case "$libdir" in
--  "") echo 'LIBDIR=$(PREFIX)/lib/ocaml' >> Makefile
--      libdir="$prefix/lib/ocaml";;
-+  "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/3.09.0' >> Makefile
-+      libdir="$prefix/lib/ocaml/3.09.0";;
-    *) echo "LIBDIR=$libdir" >> Makefile;;
- esac
- echo 'STUBLIBDIR=$(LIBDIR)/stublibs' >> Makefile

diff --git a/debian/patches/versioned_libdir.dpatch.in b/debian/patches/versioned_libdir.dpatch.in
new file mode 100755 (executable)
index 0000000..2b45c5a
--- /dev/null
+++ b/debian/patches/versioned_libdir.dpatch.in
@@ -0,0 +1,55 @@
+#! /bin/sh -e 
+## versioned_libdir.dpatch by  <luther@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add the version as path element for OCAML_LIBDIR.
+
+if [ $# -ne 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+case "$1" in
+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;   
+    *)
+       echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+       exit 1;;
+esac
+
+exit 0
+@DPATCH@
+diff -ur ocaml.orig/camlp4/config/configure_batch ocaml/camlp4/config/configure_batch
+--- ocaml.orig/camlp4/config/configure_batch.orig      2003-09-30 18:11:57.000000000 +0200
++++ ocaml/camlp4/config/configure_batch        2003-09-30 18:12:51.000000000 +0200
+@@ -94,13 +94,13 @@
+    *) echo "BINDIR=$bindir" >> Makefile.cnf;;
+ esac
+ case "$libdir" in
+-  "") echo 'LIBDIR=$(PREFIX)/lib/camlp4' >> Makefile.cnf
+-      libdir="$prefix/lib/camlp4";;
++  "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/#OcamlABI#/camlp4' >> Makefile.cnf
++      libdir="$prefix/lib/ocaml/#OcamlABI#/camlp4";;
+    *) echo "LIBDIR=$libdir" >> Makefile.cnf;;
+ esac
+ case "$mandir" in
+-  "") echo 'MANDIR=$(PREFIX)/man/man1' >> Makefile.cnf
+-      mandir="$prefix/man/man1";;
++  "") echo 'MANDIR=$(PREFIX)/share/man/man1' >> Makefile.cnf
++      mandir="$prefix/share/man/man1";;
+    *) echo "MANDIR=$mandir" >> Makefile.cnf;;
+ esac
+ 
+diff -ur ocaml.orig/configure ocaml/configure
+--- ocaml.orig/configure       2003-09-30 18:09:47.000000000 +0200
++++ ocaml/configure    2003-09-30 18:10:12.000000000 +0200
+@@ -149,8 +149,8 @@
+    *) echo "BINDIR=$bindir" >> Makefile;;
+ esac
+ case "$libdir" in
+-  "") echo 'LIBDIR=$(PREFIX)/lib/ocaml' >> Makefile
+-      libdir="$prefix/lib/ocaml";;
++  "") echo 'LIBDIR=$(PREFIX)/lib/ocaml/#OcamlABI#' >> Makefile
++      libdir="$prefix/lib/ocaml/#OcamlABI#";;
+    *) echo "LIBDIR=$libdir" >> Makefile;;
+ esac
+ echo 'STUBLIBDIR=$(LIBDIR)/stublibs' >> Makefile