[Pkg-ocaml-maint-commits] r1891 - in
trunk/packages/ocaml/trunk/debian: ocaml-md5sums patches
Sven Luther
luther at costa.debian.org
Wed Nov 2 11:45:37 UTC 2005
Author: luther
Date: 2005-11-02 11:45:37 +0000 (Wed, 02 Nov 2005)
New Revision: 1891
Added:
trunk/packages/ocaml/trunk/debian/ocaml-md5sums/configure.in
trunk/packages/ocaml/trunk/debian/patches/versioned_libdir.dpatch.in
Removed:
trunk/packages/ocaml/trunk/debian/ocaml-md5sums/configure
trunk/packages/ocaml/trunk/debian/patches/versioned_libdir.dpatch
Log:
OcamlABI'fied the remaining 3.09.0 containing files.
Deleted: trunk/packages/ocaml/trunk/debian/ocaml-md5sums/configure
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-md5sums/configure 2005-11-02 11:37:58 UTC (rev 1890)
+++ trunk/packages/ocaml/trunk/debian/ocaml-md5sums/configure 2005-11-02 11:45:37 UTC (rev 1891)
@@ -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."
Copied: trunk/packages/ocaml/trunk/debian/ocaml-md5sums/configure.in (from rev 1882, trunk/packages/ocaml/trunk/debian/ocaml-md5sums/configure)
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-md5sums/configure 2005-11-02 10:17:16 UTC (rev 1882)
+++ trunk/packages/ocaml/trunk/debian/ocaml-md5sums/configure.in 2005-11-02 11:45:37 UTC (rev 1891)
@@ -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."
Deleted: trunk/packages/ocaml/trunk/debian/patches/versioned_libdir.dpatch
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/versioned_libdir.dpatch 2005-11-02 11:37:58 UTC (rev 1890)
+++ trunk/packages/ocaml/trunk/debian/patches/versioned_libdir.dpatch 2005-11-02 11:45:37 UTC (rev 1891)
@@ -1,55 +0,0 @@
-#! /bin/sh -e
-## versioned_libdir.dpatch by <luther at 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
- at 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
Copied: trunk/packages/ocaml/trunk/debian/patches/versioned_libdir.dpatch.in (from rev 1882, trunk/packages/ocaml/trunk/debian/patches/versioned_libdir.dpatch)
===================================================================
--- trunk/packages/ocaml/trunk/debian/patches/versioned_libdir.dpatch 2005-11-02 10:17:16 UTC (rev 1882)
+++ trunk/packages/ocaml/trunk/debian/patches/versioned_libdir.dpatch.in 2005-11-02 11:45:37 UTC (rev 1891)
@@ -0,0 +1,55 @@
+#! /bin/sh -e
+## versioned_libdir.dpatch by <luther at 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
+ at 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
More information about the Pkg-ocaml-maint-commits
mailing list