updated patches that needed updating for the stable release

diff --git a/debian/changelog b/debian/changelog
index 40ea60b2270613427091247cc3b6f8da89119320..d23f2813ac7fd32ece1ac1c3719867d4a7440923 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,10 @@ ocaml (3.10.0-1) UNRELEASED; urgency=low
   * ship ocaml-compiler-libs objects as STDLIB/ocaml-compiler-libs/{parsing/,
     typing/, utils/} rather than as a flat dir tree
   * debian/patches/*
-    - removed: ocaml-interp_manpage (integrated upstream)
+    - removed: ocaml-interp_manpage, build_wo_debug_info (integrated upstream)
+    - updated: install_ocamlbuild
 
- -- Stefano Zacchiroli <zack@debian.org>  Wed, 13 Jun 2007 14:37:10 +0200
+ -- Stefano Zacchiroli <zack@debian.org>  Wed, 13 Jun 2007 16:15:14 +0200
 
 ocaml (3.10.0~beta-1) experimental; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index b6b87c9d39e6cd68a88fc9964d07be4a5c7523ed..7f45259fcda011f2716204eab745be77f6f98148 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -7,5 +7,4 @@ call_ld_with_proper_flags.dpatch
 no_rpath.dpatch
 stdlib_man_section.dpatch
 install_scripts_config.dpatch
-install_ocamlbuild.dpatch
-build_wo_debug_info.dpatch
+#install_ocamlbuild.dpatch

diff --git a/debian/patches/build_wo_debug_info.dpatch b/debian/patches/build_wo_debug_info.dpatch
deleted file mode 100755 (executable)
index 57ab7d7..0000000
--- a/debian/patches/build_wo_debug_info.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build_wo_debug_info.dpatch by Stefano Zacchiroli <zack@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Avoid building with debugging info ocamldoc and camlp4.
-## DP: Wont be needed for the stable release of ocaml 3.10.0.
-
-@DPATCH@
-diff -urNad ocaml-3.10.0~beta~/_tags ocaml-3.10.0~beta/_tags
---- ocaml-3.10.0~beta~/_tags   2007-03-04 12:00:26.000000000 +0100
-+++ ocaml-3.10.0~beta/_tags    2007-04-16 15:02:20.000000000 +0200
-@@ -12,6 +12,8 @@
- 
- # We want -g everywhere it's possible
- true: debug
-+<ocamldoc/**>: -debug
-+<camlp4/**>: -debug
- 
- # By default everything we link needs the stdlib
- true: use_stdlib

diff --git a/debian/patches/install_ocamlbuild.dpatch b/debian/patches/install_ocamlbuild.dpatch
index d646857f9193bc3019410d499d073edbd9d93368..2404484d9358564bcdf6ff273aa310735f246b6c 100755 (executable)
--- a/debian/patches/install_ocamlbuild.dpatch
+++ b/debian/patches/install_ocamlbuild.dpatch
@@ -1,25 +1,25 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## foo.dpatch by Stefano Zacchiroli <zack@debian.org>
+## install_ocamlbuild.dpatch by Stefano Zacchiroli <zack@debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Install ocamlbuild uniformly with other ocaml binaries: bytecode version
-## DP: with no extension, native version (if any) with .opt extension, avoid
-## DP: installing the "best" binary
+## DP: No description.
 
 @DPATCH@
-diff -urNad ocaml-3.10.0~beta~/build/partial-install.sh ocaml-3.10.0~beta/build/partial-install.sh
---- ocaml-3.10.0~beta~/build/partial-install.sh        2007-03-06 10:48:38.000000000 +0100
-+++ ocaml-3.10.0~beta/build/partial-install.sh 2007-04-15 17:38:04.000000000 +0200
-@@ -139,9 +139,9 @@
+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 @@
  
  echo "Installing ocamlbuild..."
- 
--installbin ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild.byte$EXE
--installbin ocamlbuild/ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE
--installbestbin ocamlbuild/ocamlbuild.native$EXE ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
+ cd ocamlbuild
+-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/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
++#installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE
 +installbin ocamlbuild/ocamlbuild.native$EXE $BINDIR/ocamlbuild.opt$EXE
-+#installbestbin ocamlbuild/ocamlbuild.native$EXE ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
++#installbestbin ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
  
  installlibdir \
-   ocamlbuild/ocamlbuildlib.$A ocamlbuild/ocamlbuildlib.p.$A \
+   ocamlbuildlib.$A \