adopted upstream convention .byte/.native for ocamlbuild, adapted manpages accordingly

diff --git a/debian/changelog b/debian/changelog
index 43528f614b5bf2c74af9bfe35ea197a9da0100a9..13f58cff1afb773294f9dc20dfa6b9783a986325 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ocaml (3.10.0-4) UNRELEASED; urgency=low
+
+  * debian/patches/install_ocamlbuild.dpatch
+    - patched to install ocamlbuild as .native/.byte (following upstream
+      convention which will become widespread in the future), but changes
+      ocamlbuild to be a symlink to the best ocamlbuild available
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sun, 17 Jun 2007 15:04:49 +0100
+
 ocaml (3.10.0-3) experimental; urgency=low
 
   * debian/patches/00list

diff --git a/debian/ocaml-native-compilers.links b/debian/ocaml-native-compilers.links
index dccfc9574cd03c8a653c9465cc0f5e13d2003c31..6367664ce78a5e4360f66f79741b5db4c4be781f 100644 (file)
--- a/debian/ocaml-native-compilers.links
+++ b/debian/ocaml-native-compilers.links
@@ -1,4 +1,3 @@
-usr/share/man/man1/ocamlbuild.1.gz     usr/share/man/man1/ocamlbuild.opt.1.gz
 usr/share/man/man1/ocamlc.1.gz         usr/share/man/man1/ocamlc.opt.1.gz
 usr/share/man/man1/ocamldep.1.gz       usr/share/man/man1/ocamldep.opt.1.gz
 usr/share/man/man1/ocamldoc.1.gz       usr/share/man/man1/ocamldoc.opt.1.gz

diff --git a/debian/ocaml-nox.links b/debian/ocaml-nox.links
new file mode 100644 (file)
index 0000000..ba12315
--- /dev/null
+++ b/debian/ocaml-nox.links
@@ -0,0 +1,2 @@
+usr/share/man/man1/ocamlbuild.1.gz     usr/share/man/man1/ocamlbuild.byte.1.gz
+usr/share/man/man1/ocamlbuild.1.gz     usr/share/man/man1/ocamlbuild.native.1.gz

diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
index e83a5acf7f1e0e2013e0bc835511e9a2567bd4bf..c2409bed88d8a529498cc657ecd951efb1a8f38f 100644 (file)
--- a/debian/patches/00dpatch.conf
+++ b/debian/patches/00dpatch.conf
@@ -1,2 +1,2 @@
 conf_debianonly=1
-conf_origtargzpath=../../upstream
+conf_origtargzpath=../upstream

diff --git a/debian/patches/install_ocamlbuild.dpatch b/debian/patches/install_ocamlbuild.dpatch
index 1db19a5a6bd2a5f4e025e12f0cabdc12feb69de6..b97a8f44a1e2f9f54b320f96a17ab354915dadd4 100755 (executable)
--- a/debian/patches/install_ocamlbuild.dpatch
+++ b/debian/patches/install_ocamlbuild.dpatch
@@ -5,21 +5,37 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad ocaml-3.10.0~/build/partial-install.sh ocaml-3.10.0/build/partial-install.sh
---- ocaml-3.10.0~/build/partial-install.sh     2007-04-05 10:12:39.000000000 +0200
-+++ ocaml-3.10.0/build/partial-install.sh      2007-06-13 16:14:19.000000000 +0200
-@@ -141,9 +141,11 @@
+diff -urNad trunk~/build/partial-install.sh trunk/build/partial-install.sh
+--- trunk~/build/partial-install.sh    2007-06-17 15:13:23.000000000 +0100
++++ trunk/build/partial-install.sh     2007-06-17 15:15:11.000000000 +0100
+@@ -47,6 +47,21 @@
+   [ -x "$3" ] || chmod +x "$3"
+ }
  
- echo "Installing ocamlbuild..."
++installbestlink() {
++  if [ -f "$1" ]; then
++    echo "  linking binary $3 to `basename $1`"
++    ln -fs "$1" "$3"
++  else
++    if [ -f "$2" ]; then
++      echo "  linking binary $3 to `basename $2`"
++      ln -fs "$2" "$3"
++    else
++      echo "None of $1, $2 exists"
++      exit 3
++    fi
++  fi
++}
++
+ installlib() {
+   if [ -f "$1" ]; then
+     dest="$2/`basename $1`"
+@@ -143,7 +158,7 @@
  cd ocamlbuild
--installbin ocamlbuild.byte$EXE $BINDIR/ocamlbuild.byte$EXE
--installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE
+ installbin ocamlbuild.byte$EXE $BINDIR/ocamlbuild.byte$EXE
+ installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE
 -installbestbin ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
-+#installbin ocamlbuild.byte$EXE $BINDIR/ocamlbuild.byte$EXE
-+installbin ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
-+#installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE
-+installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.opt$EXE
-+#installbestbin ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
++installbestlink ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
  
  installlibdir \
    ocamlbuildlib.$A \