I could have sworn I attached it last time... Oh well. -- Mike Furr <mfurr@debian.org> 1024D/124B26F3 5B9F 587F BC5C D823 50CE 4DB0 ED93 CA29 124B 26F3
diff -urNad numerix-0.19.orig/debian/patches/00list numerix-0.19/debian/patches/00list
--- numerix-0.19.orig/debian/patches/00list 2004-04-13 04:50:57.000000000 +0000
+++ numerix-0.19/debian/patches/00list 2004-04-13 04:51:33.000000000 +0000
@@ -1,3 +1,4 @@
05_copyrights.dpatch
10_build_system.dpatch
+15_ocamlopt_nmu.dpatch
90_configure.dpatch
diff -urNad numerix-0.19.orig/debian/patches/15_ocamlopt_nmu.dpatch numerix-0.19/debian/patches/15_ocamlopt_nmu.dpatch
--- numerix-0.19.orig/debian/patches/15_ocamlopt_nmu.dpatch 1970-01-01 00:00:00.000000000 +0000
+++ numerix-0.19/debian/patches/15_ocamlopt_nmu.dpatch 2004-04-13 04:51:18.000000000 +0000
@@ -0,0 +1,68 @@
+#! /bin/sh -e
+## 15_ocamlopt_nmu.dpatch by Mike Furr <mfurr@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/furrm/debian/fix/numerix-0.19/config/makefile.ocaml numerix-0.19/config/makefile.ocaml
+--- /home/furrm/debian/fix/numerix-0.19/config/makefile.ocaml 2004-04-13 00:22:23.000000000 -0400
++++ numerix-0.19/config/makefile.ocaml 2004-04-13 00:22:44.000000000 -0400
+@@ -69,7 +69,6 @@
+ # bibliothèques à produire
+ mlnumx="$kcom/libmlnumx.a"
+ mlnumx_s="$kcom/dllmlnumx.so"
+-numx="$numerix.cma $numerix.cmxa"
+
+ # exemples
+ exemples="cmp hamming nextpp pi simple"
+@@ -187,6 +186,14 @@
+
+ # bibliothèques Ocaml
+ cat <<EOF
++ifeq (\$(OCAMLOPT),)
++NUMX=$numerix.cma
++NUMA=
++else
++NUMX=$numerix.cma $numerix.cmxa
++NUMA=$numerix.a
++endif
++
+ $mlnumx: $numerix.cma
+ $numerix.cma: $cmo $mlobj
+ rm -rf .libobj && mkdir -p .libobj
+@@ -197,14 +204,14 @@
+ $numerix.cmxa: $cmx $numerix.cma
+ \$(OCAMLMKLIB) -o numerix -oc mlnumx -I $ocamldir \$(notdir $cmx) -cclib -L$kcom $lnk
+ mv numerix.cmxa numerix.a $ocamldir
+-ocaml_lib: $mlnumx $numx $ocamlnumx
++ocaml_lib: $mlnumx \$(NUMX) $ocamlnumx
+ EOF
+
+ # installation
+ cat <<EOF
+ ocaml_install: ocaml_lib $ocamlnumx
+ mkdir -p \$(INSTALL_LIB)/numerix
+- cp -p $mlnumx $numx $numerix.a $cmi $mli \$(INSTALL_LIB)/numerix
++ cp -p $mlnumx \$(NUMX) \$(NUMA) $cmi $mli \$(INSTALL_LIB)/numerix
+ mkdir -p \$(INSTALL_LIB)/stublibs
+ cp -p $mlnumx_s \$(INSTALL_LIB)/stublibs
+ mkdir -p \$(INSTALL_BIN)
diff -urNad numerix-0.19.orig/debian/rules numerix-0.19/debian/rules
--- numerix-0.19.orig/debian/rules 2004-04-13 04:50:57.000000000 +0000
+++ numerix-0.19/debian/rules 2004-04-13 04:51:40.000000000 +0000
@@ -33,7 +33,7 @@
dh_testdir
dh_clean -k
- cp /usr/share/misc/config.guess /usr/share/misc/config.sub .
+ cp /usr/share/misc/config.guess /usr/share/misc/config.sub config
./configure --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
Attachment:
signature.asc
Description: This is a digitally signed message part