avoid building camlp4/ocamlbuild with debugging info to reduce the ocaml-nox .deb...

diff --git a/debian/changelog b/debian/changelog
index 6d0f2527d35f38e1349cbc756a69df5dbe33d7bd..14f76d10969cfd9e3353d16ba5de772f8177312e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ocaml (3.10.0~beta-1) UNRELEASED; urgency=low
     - removed: versioned_libdir (no longer needed with this upstream)
     - ported to this upstream: call_ld_with_proper_flags, alpha_ld_no-relax,
       no_rpath
+    - added: build_wo_debug_info.dpatch (avoid building camlp4/ocamldoc with
+      debug info, wont be needed for the stable release)
   * CDBS class
     - added support for the OCAML_DLL_DIR variable, pointing ATM to the
       stublibs/ subdirectory of the standard library directory. It's
@@ -34,7 +36,7 @@ ocaml (3.10.0~beta-1) UNRELEASED; urgency=low
     - Patch LIBDIR and STBLIBDIR setting in config/Makefile after invokation
       of configure
 
- -- Stefano Zacchiroli <zack@debian.org>  Sun, 15 Apr 2007 17:26:45 +0200
+ -- Stefano Zacchiroli <zack@debian.org>  Mon, 16 Apr 2007 15:19:03 +0200
 
 ocaml (3.09.3-1) experimental; urgency=low
 

diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
index c2409bed88d8a529498cc657ecd951efb1a8f38f..e83a5acf7f1e0e2013e0bc835511e9a2567bd4bf 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/00list b/debian/patches/00list
index 66679a4cb629ad614e5583b6379ed533a55e98f0..446e4a301c53d2892b5b4e7a61687d024f9038d2 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -9,3 +9,4 @@ stdlib_man_section.dpatch
 install_scripts_config.dpatch
 ocaml-interp_manpage.dpatch
 install_ocamlbuild.dpatch
+build_wo_debug_info.dpatch

diff --git a/debian/patches/build_wo_debug_info.dpatch b/debian/patches/build_wo_debug_info.dpatch
new file mode 100755 (executable)
index 0000000..57ab7d7
--- /dev/null
+++ b/debian/patches/build_wo_debug_info.dpatch
@@ -0,0 +1,20 @@
+#! /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