fixing ocamlbuild installation

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index c219c61dadc1c0b0a5f3997a264bf4883e453736..f9bfcfa9fc32cac9f69295ee4ed59d563c045870 100644 (file)
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,7 +1,5 @@
 TODO list for ocaml 3.10.0 (and beyond ...)
 
-- ocamlbuild is not installed
-
 - lintian warnings
 
   lintian /home/srv/debian/pkg-ocaml-maint/packages/ocaml/build-area/ocaml_3.10.0-3_i386.changes

diff --git a/debian/changelog b/debian/changelog
index af5a7e55096bed7421d0db5ade47d039b26fbab5..252cd421e6a573d5f5a6bbb7ec61267367f41a88 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 ocaml (3.10.0-3) UNRELEASED; urgency=low
 
   * debian/patches/00list
-    - enabled install_ocamlbuild patch, which was disabled by mistake
+    - enabled install_ocamlbuild patch (was disabled by mistake) and patched
+      it fixing a wrong path
   * debian/rules
     - pass -libdir to configure (now that it is supported upstream) in
       addition to sed-ing generated config Makefiles; otherwise ocamlrun won't
@@ -9,7 +10,7 @@ ocaml (3.10.0-3) UNRELEASED; urgency=low
   * debian/ocaml-md5sums/ocaml-md5sums.1
     - written ocaml-md5sums manpage
 
- -- Stefano Zacchiroli <zack@debian.org>  Sat, 16 Jun 2007 16:41:03 +0100
+ -- Stefano Zacchiroli <zack@debian.org>  Sat, 16 Jun 2007 16:03:48 +0000
 
 ocaml (3.10.0-2) experimental; urgency=low
 

diff --git a/debian/patches/install_ocamlbuild.dpatch b/debian/patches/install_ocamlbuild.dpatch
index 2404484d9358564bcdf6ff273aa310735f246b6c..1db19a5a6bd2a5f4e025e12f0cabdc12feb69de6 100755 (executable)
--- a/debian/patches/install_ocamlbuild.dpatch
+++ b/debian/patches/install_ocamlbuild.dpatch
@@ -16,9 +16,9 @@ diff -urNad ocaml-3.10.0~/build/partial-install.sh ocaml-3.10.0/build/partial-in
 -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/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
++installbin ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
 +#installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE
-+installbin ocamlbuild/ocamlbuild.native$EXE $BINDIR/ocamlbuild.opt$EXE
++installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.opt$EXE
 +#installbestbin ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
  
  installlibdir \