Updated objinfo.dpatch.

diff --git a/debian/changelog b/debian/changelog
index 52919e22886bd7953ca029d6be90c5d1de14ad15..35b31997f91163ac82bb71fd0e66457a994efd33 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ocaml (3.09.1-1) UNRELEASED; urgency=low
   [ Samuel Mimram ]
   * Removing possibly leftover /usr/lib/ocaml/ld.conf, closes: #300846.
   * Added a watch file.
+  * Updated objinfo.dpatch.
 
   [ Julien Cristau ]
   * New upstream release
@@ -10,7 +11,7 @@ ocaml (3.09.1-1) UNRELEASED; urgency=low
       double-word boundaries is forced (Closes: #344615).
   * Remove Suggests on xlibs-dev which doesn't exist anymore.
 
- -- Julien Cristau <julien.cristau@ens-lyon.org>  Wed,  4 Jan 2006 16:06:34 +0100
+ -- Samuel Mimram <smimram@debian.org>  Wed,  4 Jan 2006 20:32:13 +0100
 
 ocaml (3.09.0-4) unstable; urgency=low
 

diff --git a/debian/patches/objinfo.dpatch b/debian/patches/objinfo.dpatch
index 4e91dd77a34d0a8933f62198841c330be0688053..d56b8e9e5a20d7feec55d30dd1c660e5b31613a5 100755 (executable)
--- a/debian/patches/objinfo.dpatch
+++ b/debian/patches/objinfo.dpatch
@@ -18,9 +18,9 @@ esac
 
 exit 0
 @DPATCH@
-diff -urN ocaml-3.08.0.orig/man/ocamlc.m ocaml-3.08.0/man/ocamlc.m
---- ocaml-3.08.0.orig/man/ocamlc.m     2004-06-24 16:53:42.000000000 +0200
-+++ ocaml-3.08.0/man/ocamlc.m  2004-07-26 14:28:30.816216392 +0200
+diff -urNad ocaml-3.09.1~/man/ocamlc.m ocaml-3.09.1/man/ocamlc.m
+--- ocaml-3.09.1~/man/ocamlc.m 2004-07-13 14:25:10.000000000 +0200
++++ ocaml-3.09.1/man/ocamlc.m  2006-01-04 20:29:18.000000000 +0100
 @@ -242,7 +242,8 @@
  
  .SH SEE ALSO
@@ -31,9 +31,9 @@ diff -urN ocaml-3.08.0.orig/man/ocamlc.m ocaml-3.08.0/man/ocamlc.m
  .br
  .I The Objective Caml user's manual,
  chapter "Batch compilation".
-diff -urN ocaml-3.08.0.orig/man/ocamlobjinfo.m ocaml-3.08.0/man/ocamlobjinfo.m
---- ocaml-3.08.0.orig/man/ocamlobjinfo.m       1970-01-01 01:00:00.000000000 +0100
-+++ ocaml-3.08.0/man/ocamlobjinfo.m    2004-07-26 14:30:06.561660872 +0200
+diff -urNad ocaml-3.09.1~/man/ocamlobjinfo.m ocaml-3.09.1/man/ocamlobjinfo.m
+--- ocaml-3.09.1~/man/ocamlobjinfo.m   1970-01-01 01:00:00.000000000 +0100
++++ ocaml-3.09.1/man/ocamlobjinfo.m    2006-01-04 20:29:18.000000000 +0100
 @@ -0,0 +1,40 @@
 +.TH OCAML-SOAP 1 "October 26, 2002"
 +.SH NAME
@@ -75,9 +75,9 @@ diff -urN ocaml-3.08.0.orig/man/ocamlobjinfo.m ocaml-3.08.0/man/ocamlobjinfo.m
 +.SH AUTHOR
 +This manual page was written by Stefano Zacchiroli <zack@debian.org>,
 +for the Debian GNU/Linux system (but may be used by others).
-diff -urN ocaml-3.08.0.orig/man/ocamlopt.m ocaml-3.08.0/man/ocamlopt.m
---- ocaml-3.08.0.orig/man/ocamlopt.m   2004-06-24 15:55:21.000000000 +0200
-+++ ocaml-3.08.0/man/ocamlopt.m        2004-07-26 14:28:50.160275648 +0200
+diff -urNad ocaml-3.09.1~/man/ocamlopt.m ocaml-3.09.1/man/ocamlopt.m
+--- ocaml-3.09.1~/man/ocamlopt.m       2004-07-13 14:25:10.000000000 +0200
++++ ocaml-3.09.1/man/ocamlopt.m        2006-01-04 20:29:18.000000000 +0100
 @@ -225,7 +225,8 @@
  array or string outside of its bounds.
  
@@ -88,20 +88,19 @@ diff -urN ocaml-3.08.0.orig/man/ocamlopt.m ocaml-3.08.0/man/ocamlopt.m
  .br
  .I The Objective Caml user's manual,
  chapter "Native-code compilation".
-diff -urN ocaml-3.08.0.orig/tools/Makefile ocaml-3.08.0/tools/Makefile
---- ocaml-3.08.0.orig/tools/Makefile   2004-06-20 17:26:06.000000000 +0200
-+++ ocaml-3.08.0/tools/Makefile        2004-07-26 14:27:54.000000000 +0200
-@@ -23,7 +23,8 @@
- COMPFLAGS= -warn-error A $(INCLUDES)
+diff -urNad ocaml-3.09.1~/tools/Makefile ocaml-3.09.1/tools/Makefile
+--- ocaml-3.09.1~/tools/Makefile       2005-11-17 15:26:37.000000000 +0100
++++ ocaml-3.09.1/tools/Makefile        2006-01-04 20:30:02.000000000 +0100
+@@ -24,7 +24,7 @@
  LINKFLAGS=$(INCLUDES)
  
--all: ocamldep ocamlprof ocamlcp ocamlmktop ocamlmklib scrapelabels addlabels 
-+all: ocamldep ocamlprof ocamlcp ocamlmktop ocamlmklib scrapelabels addlabels \
-+      objinfo
+ all: ocamldep ocamlprof ocamlcp ocamlmktop ocamlmklib scrapelabels addlabels \
+-     dumpobj
++     dumpobj objinfo
  
  opt.opt: ocamldep.opt
  
-@@ -69,6 +70,7 @@
+@@ -70,6 +70,7 @@
        cp ocamlprof $(BINDIR)/ocamlprof$(EXE)
        cp ocamlcp $(BINDIR)/ocamlcp$(EXE)
        cp profiling.cmi profiling.cmo $(LIBDIR)