Added bug closing changelog entries.

# Cleaned up overrides.
# Added amd64 native code built support.
# Fixed non native code supporting arches build.

diff --git a/debian/changelog b/debian/changelog
index c25894698e86ae96669a3323269feb0865b25104..968792e3c66e17e2fd45850474b87dba4d6c1fd9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
 ocaml (3.08.0-1) unstable; urgency=low
 
   * New upstream release.
+  * Do not install the emacs files, until upstream gives a response about the
+    licencing issue. (Closes: #227159, #227163)
+  * Fix non-native compiler supporting arches build. (Closes: #259261)
+  * Added amd64 native code compilers build. (Closes: #248334)
+  * Now include the nums package again, since 3.08 include the new free
+    version. (Clsoes: #240902)
+  * Now include ocamldoc manpage. (Clsoes: #255239)
 
- -- Sven Luther <luther@debian.org>  Wed, 14 Jul 2004 15:09:32 +0200
+ -- Sven Luther <luther@debian.org>  Thu, 15 Jul 2004 09:21:55 +0200
 
 ocaml (3.07.2a-5) unstable; urgency=low
 
-  * Added amd64 native code compilers build.
 
  -- Sven Luther <luther@debian.org>  Mon, 12 Jul 2004 12:06:33 +0200
 
@@ -299,7 +305,7 @@ ocaml (3.06-4) unstable; urgency=high
 ocaml (3.06-3) unstable; urgency=high
 
   * Added a Provide: ocaml-source-3.06 to the ocaml-source control file.
-    (Asked by Jérôme Marant)
+    (Asked by Jerome Marant)
 
  -- Sven Luther <luther@debian.org>  Fri, 30 Aug 2002 09:39:25 +0200
 

diff --git a/debian/control b/debian/control
index 50e56bee3c343f3d1ea4161b3c7f95f4c2d812a7..4cbff0030492dd1eb713b1bb80643cee9c4430a2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Sven Luther <luther@debian.org>
 Build-Depends: debhelper (>> 4.0.2), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2
-Standards-Version: 3.6.0
+Standards-Version: 3.6.1
 
 Package: ocaml-nox
 Architecture: any

diff --git a/debian/ocaml-base-nox.dirs b/debian/ocaml-base-nox.dirs
index 0e5f2e6bcfd65825ca431583e7aab3f31d075bc8..36ad867e7c2e3a08dab38e590526aa9c89e20e5a 100644 (file)
--- a/debian/ocaml-base-nox.dirs
+++ b/debian/ocaml-base-nox.dirs
@@ -2,4 +2,3 @@ usr/bin
 usr/share/man/man1
 usr/lib/ocaml/3.08
 usr/lib/ocaml/3.08/stublibs
-usr/share/lintian/overrides

diff --git a/debian/ocaml-base.dirs b/debian/ocaml-base.dirs
index 92e833015f2357f05ac412396d59bcc612d03831..95024d80722bc04e53b42782b342d3de28af5903 100644 (file)
--- a/debian/ocaml-base.dirs
+++ b/debian/ocaml-base.dirs
@@ -1,2 +1,2 @@
 usr/lib/ocaml/3.08/stublibs
-
+usr/share/lintian/overrides

diff --git a/debian/ocaml-base.override b/debian/ocaml-base.override
new file mode 100644 (file)
index 0000000..0936771
--- /dev/null
+++ b/debian/ocaml-base.override
@@ -0,0 +1,3 @@
+binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.08/stublibs/dllgraphics.so /usr/X11R6/lib
+binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.08/stublibs/dlllabltk.so /usr/lib:/usr/X11R6/lib
+binary-or-shlib-defines-rpath ./usr/lib/ocaml/3.08/stublibs/dlltkanim.so /usr/lib:/usr/X11R6/lib

diff --git a/debian/ocaml-base.postinst b/debian/ocaml-base.postinst
index a24f94fb3c21dd2a3b6c8a595121721b40084694..8c606d9b420f4ff04db076614de85bc4b8abfe09 100644 (file)
--- a/debian/ocaml-base.postinst
+++ b/debian/ocaml-base.postinst
@@ -3,3 +3,5 @@
 ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml-base
 ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml-base
 ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz /usr/share/doc/ocaml-base
+
+#DEBHELPER#

diff --git a/debian/ocaml-base.prerm b/debian/ocaml-base.prerm
index 1c54991d4177d3c7bb3b9f0fa645a4b35bc93f3c..af5b9e97fb866730955b506ce4ef3bbdb918f496 100644 (file)
--- a/debian/ocaml-base.prerm
+++ b/debian/ocaml-base.prerm
@@ -4,4 +4,4 @@ rm -f /usr/share/doc/ocaml-base/Changes.gz
 rm -f /usr/share/doc/ocaml-base/README.gz
 rm -f /usr/share/doc/ocaml-base/ocaml_packaging_policy.gz
 
-
+#DEBHELPER#

diff --git a/debian/ocaml-native-compilers.dirs b/debian/ocaml-native-compilers.dirs
index 277c20b1ce680722dfb8b376ac113045a1f70739..98d15831b4c595219d8284ae176a23d8860cce9e 100644 (file)
--- a/debian/ocaml-native-compilers.dirs
+++ b/debian/ocaml-native-compilers.dirs
@@ -1,3 +1,2 @@
 usr/bin
 usr/share/man/man1
-usr/share/lintian/overrides

diff --git a/debian/ocaml-native-compilers.override b/debian/ocaml-native-compilers.override
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/ocaml-nox.override b/debian/ocaml-nox.override
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6947cc4977d0da6359431e4123dc56e51bde9d88 100644 (file)
--- a/debian/ocaml-nox.override
+++ b/debian/ocaml-nox.override
@@ -0,0 +1,81 @@
+manpage-section-mismatch usr/share/man/man3/ArrayLabels.3o.gz:1 3o != ArrayLabels
+manpage-section-mismatch usr/share/man/man3/Bigarray.3o.gz:1 3o != Bigarray
+manpage-section-mismatch usr/share/man/man3/Bigarray.Array2.3o.gz:1 3o != Bigarray.Array2
+manpage-section-mismatch usr/share/man/man3/Bigarray.Array3.3o.gz:1 3o != Bigarray.Array3
+manpage-section-mismatch usr/share/man/man3/Bigarray.Genarray.3o.gz:1 3o != Bigarray.Genarray
+manpage-section-mismatch usr/share/man/man3/Buffer.3o.gz:1 3o != Buffer
+manpage-section-mismatch usr/share/man/man3/Callback.3o.gz:1 3o != Callback
+manpage-section-mismatch usr/share/man/man3/CamlinternalOO.3o.gz:1 3o != CamlinternalOO
+manpage-section-mismatch usr/share/man/man3/Char.3o.gz:1 3o != Char
+manpage-section-mismatch usr/share/man/man3/Complex.3o.gz:1 3o != Complex
+manpage-section-mismatch usr/share/man/man3/Digest.3o.gz:1 3o != Digest
+manpage-section-mismatch usr/share/man/man3/Filename.3o.gz:1 3o != Filename
+manpage-section-mismatch usr/share/man/man3/Format.3o.gz:1 3o != Format
+manpage-section-mismatch usr/share/man/man3/Gc.3o.gz:1 3o != Gc
+manpage-section-mismatch usr/share/man/man3/Genlex.3o.gz:1 3o != Genlex
+manpage-section-mismatch usr/share/man/man3/Hashtbl.3o.gz:1 3o != Hashtbl
+manpage-section-mismatch usr/share/man/man3/Hashtbl.Make.3o.gz:1 3o != Hashtbl.Make
+manpage-section-mismatch usr/share/man/man3/Hashtbl.S.3o.gz:1 3o != Hashtbl.S
+manpage-section-mismatch usr/share/man/man3/Int32.3o.gz:1 3o != Int32
+manpage-section-mismatch usr/share/man/man3/Int64.3o.gz:1 3o != Int64
+manpage-section-mismatch usr/share/man/man3/Lazy.3o.gz:1 3o != Lazy
+manpage-section-mismatch usr/share/man/man3/Lexing.3o.gz:1 3o != Lexing
+manpage-section-mismatch usr/share/man/man3/List.3o.gz:1 3o != List
+manpage-section-mismatch usr/share/man/man3/ListLabels.3o.gz:1 3o != ListLabels
+manpage-section-mismatch usr/share/man/man3/Map.3o.gz:1 3o != Map
+manpage-section-mismatch usr/share/man/man3/Map.Make.3o.gz:1 3o != Map.Make
+manpage-section-mismatch usr/share/man/man3/Map.S.3o.gz:1 3o != Map.S
+manpage-section-mismatch usr/share/man/man3/Marshal.3o.gz:1 3o != Marshal
+manpage-section-mismatch usr/share/man/man3/MoreLabels.3o.gz:1 3o != MoreLabels
+manpage-section-mismatch usr/share/man/man3/MoreLabels.Hashtbl.3o.gz:1 3o != MoreLabels.Hashtbl
+manpage-section-mismatch usr/share/man/man3/MoreLabels.Hashtbl.Make.3o.gz:1 3o != MoreLabels.Hashtbl.Make
+manpage-section-mismatch usr/share/man/man3/MoreLabels.Hashtbl.S.3o.gz:1 3o != MoreLabels.Hashtbl.S
+manpage-section-mismatch usr/share/man/man3/MoreLabels.Map.3o.gz:1 3o != MoreLabels.Map
+manpage-section-mismatch usr/share/man/man3/MoreLabels.Map.Make.3o.gz:1 3o != MoreLabels.Map.Make
+manpage-section-mismatch usr/share/man/man3/MoreLabels.Map.OrderedType.3o.gz:1 3o != MoreLabels.Map.OrderedType
+manpage-section-mismatch usr/share/man/man3/MoreLabels.Map.S.3o.gz:1 3o != MoreLabels.Map.S
+manpage-section-mismatch usr/share/man/man3/MoreLabels.Set.3o.gz:1 3o != MoreLabels.Set
+manpage-section-mismatch usr/share/man/man3/MoreLabels.Set.Make.3o.gz:1 3o != MoreLabels.Set.Make
+manpage-section-mismatch usr/share/man/man3/MoreLabels.Set.OrderedType.3o.gz:1 3o != MoreLabels.Set.OrderedType
+manpage-section-mismatch usr/share/man/man3/MoreLabels.Set.S.3o.gz:1 3o != MoreLabels.Set.S
+manpage-section-mismatch usr/share/man/man3/Nativeint.3o.gz:1 3o != Nativeint
+manpage-section-mismatch usr/share/man/man3/Num.3o.gz:1 3o != Num
+manpage-section-mismatch usr/share/man/man3/Obj.3o.gz:1 3o != Obj
+manpage-section-mismatch usr/share/man/man3/Oo.3o.gz:1 3o != Oo
+manpage-section-mismatch usr/share/man/man3/Parsing.3o.gz:1 3o != Parsing
+manpage-section-mismatch usr/share/man/man3/Pervasives.3o.gz:1 3o != Pervasives
+manpage-section-mismatch usr/share/man/man3/Pervasives.LargeFile.3o.gz:1 3o != Pervasives.LargeFile
+manpage-section-mismatch usr/share/man/man3/Printexc.3o.gz:1 3o != Printexc
+manpage-section-mismatch usr/share/man/man3/Printf.3o.gz:1 3o != Printf
+manpage-section-mismatch usr/share/man/man3/Queue.3o.gz:1 3o != Queue
+manpage-section-mismatch usr/share/man/man3/Random.3o.gz:1 3o != Random
+manpage-section-mismatch usr/share/man/man3/Random.State.3o.gz:1 3o != Random.State
+manpage-section-mismatch usr/share/man/man3/Scanf.3o.gz:1 3o != Scanf
+manpage-section-mismatch usr/share/man/man3/Set.3o.gz:1 3o != Set
+manpage-section-mismatch usr/share/man/man3/Set.Make.3o.gz:1 3o != Set.Make
+manpage-section-mismatch usr/share/man/man3/Set.OrderedType.3o.gz:1 3o != Set.OrderedType
+manpage-section-mismatch usr/share/man/man3/Set.S.3o.gz:1 3o != Set.S
+manpage-section-mismatch usr/share/man/man3/Sort.3o.gz:1 3o != Sort
+manpage-section-mismatch usr/share/man/man3/Stack.3o.gz:1 3o != Stack
+manpage-section-mismatch usr/share/man/man3/StdLabels.3o.gz:1 3o != StdLabels
+manpage-section-mismatch usr/share/man/man3/StdLabels.List.3o.gz:1 3o != StdLabels.List
+manpage-section-mismatch usr/share/man/man3/StdLabels.String.3o.gz:1 3o != StdLabels.String
+manpage-section-mismatch usr/share/man/man3/Str.3o.gz:1 3o != Str
+manpage-section-mismatch usr/share/man/man3/Stream.3o.gz:1 3o != Stream
+manpage-section-mismatch usr/share/man/man3/String.3o.gz:1 3o != String
+manpage-section-mismatch usr/share/man/man3/StringLabels.3o.gz:1 3o != StringLabels
+manpage-section-mismatch usr/share/man/man3/Sys.3o.gz:1 3o != Sys
+manpage-section-mismatch usr/share/man/man3/Unix.3o.gz:1 3o != Unix
+manpage-section-mismatch usr/share/man/man3/Unix.LargeFile.3o.gz:1 3o != Unix.LargeFile
+manpage-section-mismatch usr/share/man/man3/Weak.3o.gz:1 3o != Weak
+manpage-section-mismatch usr/share/man/man3/Weak.Make.3o.gz:1 3o != Weak.Make
+manpage-section-mismatch usr/share/man/man3/Weak.S.3o.gz:1 3o != Weak.S
+manpage-section-mismatch usr/share/man/man3/Arg.3o.gz:1 3o != Arg
+manpage-section-mismatch usr/share/man/man3/Array.3o.gz:1 3o != Array
+manpage-section-mismatch usr/share/man/man3/Bigarray.Array1.3o.gz:1 3o != Bigarray.Array1
+manpage-section-mismatch usr/share/man/man3/Hashtbl.HashedType.3o.gz:1 3o != Hashtbl.HashedType
+manpage-section-mismatch usr/share/man/man3/Map.OrderedType.3o.gz:1 3o != Map.OrderedType
+manpage-section-mismatch usr/share/man/man3/MoreLabels.Hashtbl.HashedType.3o.gz:1 3o != MoreLabels.Hashtbl.HashedType
+manpage-section-mismatch usr/share/man/man3/Scanf.Scanning.3o.gz:1 3o != Scanf.Scanning
+manpage-section-mismatch usr/share/man/man3/StdLabels.Array.3o.gz:1 3o != StdLabels.Array
+script-not-executable ./usr/lib/ocaml/3.08/camlheader

diff --git a/debian/ocaml-nox.prerm b/debian/ocaml-nox.prerm
index 0fa967a235b797cd33610c91c242fb8cf38a16e7..648ab8e38f470185f38c2597dc428801218600e0 100644 (file)
--- a/debian/ocaml-nox.prerm
+++ b/debian/ocaml-nox.prerm
@@ -4,4 +4,4 @@ rm -f /usr/share/doc/ocaml-nox/Changes.gz
 rm -f /usr/share/doc/ocaml-nox/README.gz
 rm -f /usr/share/doc/ocaml-nox/ocaml_packaging_policy.gz
 
-
+#DEBHELPER#

diff --git a/debian/ocaml-opt.files b/debian/ocaml-opt.files
new file mode 100644 (file)
index 0000000..0d17945
--- /dev/null
+++ b/debian/ocaml-opt.files
@@ -0,0 +1,11 @@
+usr/bin/labltk
+usr/lib/ocaml/3.08/libgraphics.a
+usr/lib/ocaml/3.08/graphics.cma
+usr/lib/ocaml/3.08/graphics.cmi
+usr/lib/ocaml/3.08/graphicsX11.cmi
+usr/lib/ocaml/3.08/graphics.mli
+usr/lib/ocaml/3.08/graphicsX11.mli
+usr/lib/ocaml/3.08/labltk
+usr/lib/ocaml/3.08/graphics.cmx
+usr/lib/ocaml/3.08/graphics.cmxa
+usr/lib/ocaml/3.08/graphics.a

diff --git a/debian/ocaml-source.dirs b/debian/ocaml-source.dirs
index 0429ce6836b1564901487335970664a6c8ceeb65..1abb1ad602b9cd19cd7153544120a5cf9768ca3a 100644 (file)
--- a/debian/ocaml-source.dirs
+++ b/debian/ocaml-source.dirs
@@ -1,2 +1 @@
 usr/src/ocaml/ocaml-3.08
-usr/share/lintian/overrides

diff --git a/debian/ocaml-source.override b/debian/ocaml-source.override
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/ocaml.override b/debian/ocaml.override
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/ocaml.postinst b/debian/ocaml.postinst
index a24f94fb3c21dd2a3b6c8a595121721b40084694..8c606d9b420f4ff04db076614de85bc4b8abfe09 100644 (file)
--- a/debian/ocaml.postinst
+++ b/debian/ocaml.postinst
@@ -3,3 +3,5 @@
 ln -sf ../ocaml-base-nox/Changes.gz /usr/share/doc/ocaml-base
 ln -sf ../ocaml-base-nox/README.gz /usr/share/doc/ocaml-base
 ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz /usr/share/doc/ocaml-base
+
+#DEBHELPER#

diff --git a/debian/ocaml.prerm b/debian/ocaml.prerm
index ed58b545bd77970efefc89b89c7799f62f7d316a..d0819f3fc7483e8e33e7cbc2d557be8023c82b20 100644 (file)
--- a/debian/ocaml.prerm
+++ b/debian/ocaml.prerm
@@ -4,4 +4,4 @@ rm -f /usr/share/doc/ocaml/Changes.gz
 rm -f /usr/share/doc/ocaml/README.gz
 rm -f /usr/share/doc/ocaml/ocaml_packaging_policy.gz
 
-
+#DEBHELPER#

diff --git a/debian/rules b/debian/rules
index bd430b24cc626a929682db52fda29c669f81927f..518667b5a073f1c0cf75ba00b4f0517731e55517 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -87,7 +87,7 @@ clean: unpatch
                rm -rf boot;            \
                mv boot.debian boot;    \
        fi
-       -$(MAKE) -C emacs clean
+       #-$(MAKE) -C emacs clean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config/gnu/config.sub
 endif
@@ -128,15 +128,15 @@ install-arch:
 
        # Let's install ocaml first.
        $(MAKE) install PREFIX=$(CURDIR)/debian/ocaml-nox/usr
-       $(MAKE) -C emacs EMACSDIR=$(CURDIR)/debian/ocaml-nox/usr/share/emacs/site-lisp/ocaml \
+       #$(MAKE) -C emacs EMACSDIR=$(CURDIR)/debian/ocaml-nox/usr/share/emacs/site-lisp/ocaml \
                NOCOMPILE=true simple-install
-       $(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-nox/usr/bin install-ocamltags
+       #$(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-nox/usr/bin install-ocamltags
        install -m 644 debian/JoeCaml.xpm \
                $(CURDIR)/debian/ocaml-nox/usr/X11R6/include/X11/pixmaps
        install -m 644 debian/ocaml-nox.override \
                $(CURDIR)/debian/ocaml-nox/usr/share/lintian/overrides/ocaml-nox
-       install -m 644 debian/ocaml.override \
-               $(CURDIR)/debian/ocaml-nox/usr/share/lintian/overrides/ocaml
+       install -m 644 debian/ocaml-base.override \
+               $(CURDIR)/debian/ocaml-nox/usr/share/lintian/overrides/ocaml-base
        install -m 644 otherlibs/labltk/README \
                $(CURDIR)/debian/README.labltk
        install -m 644 config/Makefile \
@@ -145,11 +145,11 @@ install-arch:
        # now move the graphics files over
        if [ -e opt-built-stamp ]; then                                 \
                dh_movefiles -pocaml                                    \
-                       --sourcedir=debian/ocaml-nox;                   \
+                       --sourcedir=debian/ocaml-nox                    \
+                       `cat ocaml-opt.files`;
        else                                                            \
                dh_movefiles -pocaml                                    \
-                       --sourcedir=debian/ocaml-nox                    \
-                       --exclude=*.cmx --exclude=*.cmxa;               \
+                       --sourcedir=debian/ocaml-nox;                   \
        fi
 
 
@@ -165,8 +165,6 @@ install-arch:
        if [ -e opt-built-stamp ]; then                                 \
                dh_movefiles -pocaml-native-compilers                   \
                        --sourcedir=debian/ocaml-nox;                   \
-               install -m 644 debian/ocaml-native-compilers.override   \
-                       $(CURDIR)/debian/ocaml-native-compilers/usr/share/lintian/overrides/ocaml-native-compilers; \
        fi
 
        # The interpreter files
@@ -194,7 +192,7 @@ binary-common:
 #      dh_installmenu
 #      dh_installdebconf       
 #      dh_installlogrotate     
-       dh_installemacsen
+#      dh_installemacsen
 #      dh_installpam
 #      dh_installmime
 #      dh_installinit