[Pkg-ocaml-maint-commits] r3697 - in /trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches: 00list install_ocamlbuild.dpatch pr_o.dpatch versioned_libdir.dpatch.in

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Apr 15 15:41:48 2007
New Revision: 3697

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3697
Log:
- removed ancient patches
- added a patch to install ocamlbuild as the other legacy binaries

Added:
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/install_ocamlbuild.dpatch   (with props)
Removed:
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/pr_o.dpatch
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/versioned_libdir.dpatch.in
Modified:
    trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/00list

Modified: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/patches/00list?rev=3697&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/00list (original)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/00list Sun Apr 15 15:41:48 2007
@@ -1,14 +1,11 @@
-#versioned_libdir
-objinfo
-dumpobj
-man-ocamlmklib
-#kbsd-gnu
-alpha_ld_no-relax
-call_ld_with_proper_flags
-#pr_o
-no_rpath
-stdlib_man_section
-install_scripts_config
-ocaml-interp_manpage
-
-
+objinfo.dpatch
+dumpobj.dpatch
+man-ocamlmklib.dpatch
+#kbsd-gnu.dpatch
+alpha_ld_no-relax.dpatch
+call_ld_with_proper_flags.dpatch
+no_rpath.dpatch
+stdlib_man_section.dpatch
+install_scripts_config.dpatch
+ocaml-interp_manpage.dpatch
+install_ocamlbuild.dpatch

Added: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/install_ocamlbuild.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/ocaml-3.10.0%7Ebeta/debian/patches/install_ocamlbuild.dpatch?rev=3697&op=file
==============================================================================
--- trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/install_ocamlbuild.dpatch (added)
+++ trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/install_ocamlbuild.dpatch Sun Apr 15 15:41:48 2007
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## foo.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
+
+ at 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 @@
+ 
+ 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
++installbin ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
++installbin ocamlbuild/ocamlbuild.native$EXE $BINDIR/ocamlbuild.opt$EXE
++#installbestbin ocamlbuild/ocamlbuild.native$EXE ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE
+ 
+ installlibdir \
+   ocamlbuild/ocamlbuildlib.$A ocamlbuild/ocamlbuildlib.p.$A \

Propchange: trunk/packages/ocaml/branches/ocaml-3.10.0~beta/debian/patches/install_ocamlbuild.dpatch
------------------------------------------------------------------------------
    svn:executable = *