Now objinfo get actually installed.

Test for unsupported emacsen flavors at start of the script.

diff --git a/debian/changelog b/debian/changelog
index de71b0020c9b5ebe4b7d292dfdc487c77e393c47..c8f72f43f7a1fecaec21d96eb6c44f183be19c4e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
+ocaml (3.07-5) unstable; urgency=low
+
+  * Somehow the objinfo patch forgot to install objinfo, fixed now.
+  * Test for emacsen flavor early one and abort if unsupported.
+    (Closes: #213862)
+
+ -- Sven Luther <luther@debian.org>  Fri,  3 Oct 2003 17:08:29 +0200
+
 ocaml (3.07-4) unstable; urgency=low
 
   * Arg, dh_gencontrol seems to not support putting stuff after the
     substitution variable, which seems somewhat broken to me, anyway, let's
     put the substitution variable last.
   * Forgot to add the camlp4_optional.dpatch to the list of patches to be
-    applied :(. (Closes: #213881)
+    applied. (Closes: #213881)
 
  -- Sven Luther <luther@debian.org>  Fri,  3 Oct 2003 10:54:26 +0200
 

diff --git a/debian/emacsen-install b/debian/emacsen-install
index 34c09674b2701d6b8426db2d87ed79a49ce1a975..1984fb9bf2481f3c5bf68845757c34ad795e7308 100644 (file)
--- a/debian/emacsen-install
+++ b/debian/emacsen-install
@@ -8,7 +8,14 @@
 FLAVOR=$1
 PACKAGE=ocaml
 
-if [ ${FLAVOR} = emacs ]; then exit 0; fi
+case ${FLAVOR} in
+    emacs20|emacs21|xemacs21)
+       ;;
+    *)
+       echo install/${PACKAGE}: Ignoring emacsen flavor ${FLAVOR}
+       exit 0
+       ;;
+esac
 
 echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
 

diff --git a/debian/patches/objinfo.dpatch b/debian/patches/objinfo.dpatch
index 148463d45d93af34d3f3899e972a24cbe168ee00..5ff13b001ace99cb98913aa841128b8b0fa26195 100755 (executable)
--- a/debian/patches/objinfo.dpatch
+++ b/debian/patches/objinfo.dpatch
@@ -19,45 +19,9 @@ esac
 
 exit 0
 @DPATCH@
-diff -ur ocaml-3.07beta1.orig/tools/Makefile ocaml-3.07beta1/tools/Makefile
---- ocaml-3.07beta1.orig/tools/Makefile        2003-04-02 03:17:58.000000000 +0200
-+++ ocaml-3.07beta1/tools/Makefile     2003-08-06 13:15:53.000000000 +0200
-@@ -23,7 +23,8 @@
- COMPFLAGS= -warn-error A $(INCLUDES)
- LINKFLAGS=$(INCLUDES)
- 
--all: ocamldep ocamlprof ocamlcp ocamlmktop ocamlmklib scrapelabels addlabels
-+all: ocamldep ocamlprof ocamlcp ocamlmktop ocamlmklib scrapelabels addlabels \
-+      objinfo
- 
- opt.opt: ocamldep.opt
- 
---- ocaml-3.07-3.06.99.2003.07.05.orig/man/ocamlc.m
-+++ ocaml-3.07-3.06.99.2003.07.05/man/ocamlc.m
-@@ -241,7 +241,8 @@
- 
- .SH SEE ALSO
- .BR ocaml (1),
--.BR ocamlrun (1).
-+.BR ocamlrun (1),
-+.BR objinfo (1).
- .br
- .I The Objective Caml user's manual,
- chapter "Batch compilation".
---- ocaml-3.07-3.06.99.2003.07.05.orig/man/ocamlopt.m
-+++ ocaml-3.07-3.06.99.2003.07.05/man/ocamlopt.m
-@@ -224,7 +224,8 @@
- array or string outside of its bounds.
- 
- .SH SEE ALSO
--.BR ocamlc (1).
-+.BR ocamlc (1),
-+.BR objinfo (1).
- .br
- .I The Objective Caml user's manual,
- chapter "Native-code compilation".
---- ocaml-3.07-3.06.99.2003.07.05.orig/man/objinfo.m
-+++ ocaml-3.07-3.06.99.2003.07.05/man/objinfo.m
+diff -urN ocaml-3.07.orig/man/objinfo.m ocaml-3.07/man/objinfo.m
+--- ocaml-3.07.orig/man/objinfo.m      1970-01-01 01:00:00.000000000 +0100
++++ ocaml-3.07/man/objinfo.m   2003-10-03 17:00:19.000000000 +0200
 @@ -0,0 +1,40 @@
 +.TH OCAML-SOAP 1 "October 26, 2002"
 +.SH NAME
@@ -99,3 +63,50 @@ diff -ur ocaml-3.07beta1.orig/tools/Makefile ocaml-3.07beta1/tools/Makefile
 +.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.07.orig/man/ocamlc.m ocaml-3.07/man/ocamlc.m
+--- ocaml-3.07.orig/man/ocamlc.m       2001-12-20 05:18:10.000000000 +0100
++++ ocaml-3.07/man/ocamlc.m    2003-10-03 17:00:19.000000000 +0200
+@@ -241,7 +241,8 @@
+ 
+ .SH SEE ALSO
+ .BR ocaml (1),
+-.BR ocamlrun (1).
++.BR ocamlrun (1),
++.BR objinfo (1).
+ .br
+ .I The Objective Caml user's manual,
+ chapter "Batch compilation".
+diff -urN ocaml-3.07.orig/man/ocamlopt.m ocaml-3.07/man/ocamlopt.m
+--- ocaml-3.07.orig/man/ocamlopt.m     2002-08-06 10:22:45.000000000 +0200
++++ ocaml-3.07/man/ocamlopt.m  2003-10-03 17:00:19.000000000 +0200
+@@ -224,7 +224,8 @@
+ array or string outside of its bounds.
+ 
+ .SH SEE ALSO
+-.BR ocamlc (1).
++.BR ocamlc (1),
++.BR objinfo (1).
+ .br
+ .I The Objective Caml user's manual,
+ chapter "Native-code compilation".
+diff -urN ocaml-3.07.orig/tools/Makefile ocaml-3.07/tools/Makefile
+--- ocaml-3.07.orig/tools/Makefile     2003-04-02 03:17:58.000000000 +0200
++++ ocaml-3.07/tools/Makefile  2003-10-03 17:01:04.000000000 +0200
+@@ -23,7 +23,8 @@
+ COMPFLAGS= -warn-error A $(INCLUDES)
+ LINKFLAGS=$(INCLUDES)
+ 
+-all: ocamldep ocamlprof ocamlcp ocamlmktop ocamlmklib scrapelabels addlabels
++all: ocamldep ocamlprof ocamlcp ocamlmktop ocamlmklib scrapelabels addlabels \
++      objinfo
+ 
+ opt.opt: ocamldep.opt
+ 
+@@ -69,6 +70,7 @@
+       cp ocamlprof $(BINDIR)/ocamlprof$(EXE)
+       cp ocamlcp $(BINDIR)/ocamlcp$(EXE)
+       cp profiling.cmi profiling.cmo $(LIBDIR)
++      cp objinfo $(BINDIR)/objinfo$(EXE)
+ 
+ clean::
+       rm -f ocamlprof ocamlcp