[Pkg-ocaml-maint-commits] r3823 - in /trunk/packages/ocaml/branches/ocaml-3.10.0/debian: changelog patches/00list patches/build_wo_debug_info.dpatch patches/install_ocamlbuild.dpatch

[zack at users.alioth.debian.org]

Author: zack
Date: Wed Jun 13 14:16:41 2007
New Revision: 3823

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3823
Log:
updated patches that needed updating for the stable release

Removed:
    trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/build_wo_debug_info.dpatch
Modified:
    trunk/packages/ocaml/branches/ocaml-3.10.0/debian/changelog
    trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/00list
    trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/install_ocamlbuild.dpatch

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0/debian/changelog?rev=3823&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0/debian/changelog (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0/debian/changelog Wed Jun 13 14:16:41 2007
@@ -5,9 +5,10 @@
   * 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)
-
- -- Stefano Zacchiroli <zack at debian.org>  Wed, 13 Jun 2007 14:37:10 +0200
+    - removed: ocaml-interp_manpage, build_wo_debug_info (integrated upstream)
+    - updated: install_ocamlbuild
+
+ -- Stefano Zacchiroli <zack at debian.org>  Wed, 13 Jun 2007 16:15:14 +0200
 
 ocaml (3.10.0~beta-1) experimental; urgency=low
 

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/00list?rev=3823&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/00list (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/00list Wed Jun 13 14:16:41 2007
@@ -7,5 +7,4 @@
 no_rpath.dpatch
 stdlib_man_section.dpatch
 install_scripts_config.dpatch
-install_ocamlbuild.dpatch
-build_wo_debug_info.dpatch
+#install_ocamlbuild.dpatch

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/install_ocamlbuild.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/install_ocamlbuild.dpatch?rev=3823&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/install_ocamlbuild.dpatch (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0/debian/patches/install_ocamlbuild.dpatch Wed Jun 13 14:16:41 2007
@@ -1,25 +1,25 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## foo.dpatch by Stefano Zacchiroli <zack at debian.org>
+## install_ocamlbuild.dpatch by Stefano Zacchiroli <zack at 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 \