removed patch applied upstream

diff --git a/debian/changelog b/debian/changelog
index 9feb9e72c035864f4d3be1262e6c3944b177d5af..40ea60b2270613427091247cc3b6f8da89119320 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ ocaml (3.10.0-1) UNRELEASED; urgency=low
   * New upstream (stable) release
   * 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@debian.org>  Wed, 13 Jun 2007 14:34:32 +0200
+ -- Stefano Zacchiroli <zack@debian.org>  Wed, 13 Jun 2007 14:37:10 +0200
 
 ocaml (3.10.0~beta-1) experimental; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 446e4a301c53d2892b5b4e7a61687d024f9038d2..b6b87c9d39e6cd68a88fc9964d07be4a5c7523ed 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -7,6 +7,5 @@ call_ld_with_proper_flags.dpatch
 no_rpath.dpatch
 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/ocaml-interp_manpage.dpatch b/debian/patches/ocaml-interp_manpage.dpatch
deleted file mode 100755 (executable)
index 411b817..0000000
--- a/debian/patches/ocaml-interp_manpage.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ocaml-interp_manpage.dpatch by Ralf Treinen <treinen@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: typo in ocaml manpage. <treinen@debian.org>
-
-@DPATCH@
-diff -urNad ocaml-3.10.0~beta~/man/ocaml.m ocaml-3.10.0~beta/man/ocaml.m
---- ocaml-3.10.0~beta~/man/ocaml.m     2002-02-08 11:16:10.000000000 +0100
-+++ ocaml-3.10.0~beta/man/ocaml.m      2007-04-11 17:51:50.000000000 +0200
-@@ -25,7 +25,7 @@
- command is the toplevel system for Objective Caml,
- that permits interactive use of the Objective Caml system through a
- read-eval-print loop. In this mode, the system repeatedly reads Caml
--phrases from the input, then typechecks, compile and evaluate
-+phrases from the input, then typechecks, compiles and evaluates
- them, then prints the inferred type and result value, if any. The
- system prints a # (sharp) prompt before reading each phrase.
-