Fixed hppa build problem.

Now only depend on debhelper 4.0.2, since i removed the .dpatch from 00list.
Removed leftover 3.06 ld.conf cruft.

diff --git a/debian/changelog b/debian/changelog
index 78b42fb9dd0acae7dee4d54e32cd84fbba08dd32..6a72c49a4a3e8156bc9a529cf47b4a09c5aa1cfe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ocaml (3.07-7) unstable; urgency=low
+
+  * Fixed hppa build problem : hppa needs doubleword aligned doubles.
+  * Removed .dpatch extensions for debian/patches/00list, should enable to
+    build with older versions of debhelper, like the one in woody.
+    (Closes: #214967).
+  * Removed leftover ocaml 3.06 ld.conf stuff. (Closes: #214772)
+
+ -- Sven Luther <luther@debian.org>  Thu, 16 Oct 2003 16:18:51 +0200
+
 ocaml (3.07-6) unstable; urgency=low
 
   * Changed from the -a to the -s option in debhelper functions. Fixed FTBFS

diff --git a/debian/control b/debian/control
index a4c0e4e5db5e9ca9fdb1cc0706406b8612a758aa..0c9d86805ce8501d4aa9956c737d14f75ab654d2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ocaml
 Section: devel
 Priority: optional
 Maintainer: Sven Luther <luther@debian.org>
-Build-Depends: debhelper (>> 4.1.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2
+Build-Depends: debhelper (>> 4.0.2), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2
 Standards-Version: 3.6.0
 
 Package: ocaml

diff --git a/debian/ocaml-base.postinst b/debian/ocaml-base.postinst
index 2396b214165746df087f2c8f0f69ade628579270..1c4bce5f7b7d6f5644818c6504e21c9e15152974 100644 (file)
--- a/debian/ocaml-base.postinst
+++ b/debian/ocaml-base.postinst
@@ -1,4 +1,12 @@
 #!/bin/sh
 mkdir -p /usr/local/lib/ocaml/3.07/stublibs || true
 
+for i in /usr/lib/ocaml/3.06 /etc/ocaml /var/lib/ocaml; do     \
+       if [ -e $i/ld.conf ]; then                              \
+               echo "Removing leftover $i.ld.conf";            \
+               rm -f $i/ld.conf;                               \
+               rmdir --ignore-fail-on-non-empty $i;            \
+       fi;                                                     \
+done
+
 #DEBHELPER#

diff --git a/debian/patches/00list b/debian/patches/00list
index 1ab5cda8464121d8aac27bf1b7cbc0da6e22a611..4ecaabea51948d5a29285f40d49042515ac47785 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
-versioned_libdir.dpatch
-objinfo.dpatch
-camlp4_optional.dpatch
+versioned_libdir
+objinfo
+camlp4_optional
+hppa

diff --git a/debian/patches/hppa.dpatch b/debian/patches/hppa.dpatch
new file mode 100644 (file)
index 0000000..0f14eed
--- /dev/null
+++ b/debian/patches/hppa.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh -e 
+## hppa.dpatch by <luther@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Makefiles, configure scripts and other build stuff adapted for
+## DP: debian package creation
+
+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@
+--- ocaml-3.07/configure.orig  2003-10-16 13:15:23.000000000 +0000
++++ ocaml-3.07/configure       2003-10-16 13:15:54.000000000 +0000
+@@ -401,9 +401,10 @@
+ # Determine alignment constraints
+ 
+ case "$host" in
+-  sparc-*-*)
++  sparc-*-*|hppa*-*-*)
+     # On Sparc V9 with certain versions of gcc, determination of double
+     # alignment is not reliable (PR#1521), hence force it
++    # Same goes for hppa.
+     echo "Doubles must be doubleword-aligned."
+     echo "#define ARCH_ALIGN_DOUBLE" >> m.h;;
+   *)