From f8d80491ee3048aee2a6864c09d2b9bbd2f2fee9 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Tue, 21 Oct 2014 12:04:53 +0200 Subject: [PATCH] Update packaging --- debian/control | 3 ++- debian/control.in | 4 ++- debian/ocaml-compiler-libs.install.in | 36 +++++++++++++++++++++++++++ debian/ocaml-nox.install.in | 27 +++++++++++++++++++- debian/rules | 3 +-- 5 files changed, 68 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 9787abeb..6263ac5e 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,8 @@ Build-Depends: binutils-dev, libiberty-dev, libncurses5-dev, - bzip2, + libx11-dev, + zlib1g-dev, dh-ocaml (>= 1.0.0~) Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocaml.git diff --git a/debian/control.in b/debian/control.in index f11feec9..339e529d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -13,8 +13,10 @@ Build-Depends: quilt, autotools-dev, binutils-dev, + libiberty-dev, libncurses5-dev, - bzip2, + libx11-dev, + zlib1g-dev, dh-ocaml (>= 1.0.0~) Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocaml.git diff --git a/debian/ocaml-compiler-libs.install.in b/debian/ocaml-compiler-libs.install.in index 5a8d0407..c4a9ac20 100644 --- a/debian/ocaml-compiler-libs.install.in +++ b/debian/ocaml-compiler-libs.install.in @@ -1,2 +1,38 @@ @OCamlStdlibDir@/compiler-libs @OCamlStdlibDir@/topdirs.cmi +usr/share/man/man3/Ast_helper.3o +usr/share/man/man3/Ast_helper.Cf.3o +usr/share/man/man3/Ast_helper.Ci.3o +usr/share/man/man3/Ast_helper.Cl.3o +usr/share/man/man3/Ast_helper.Csig.3o +usr/share/man/man3/Ast_helper.Cstr.3o +usr/share/man/man3/Ast_helper.Ctf.3o +usr/share/man/man3/Ast_helper.Cty.3o +usr/share/man/man3/Ast_helper.Exp.3o +usr/share/man/man3/Ast_helper.Incl.3o +usr/share/man/man3/Ast_helper.Mb.3o +usr/share/man/man3/Ast_helper.Md.3o +usr/share/man/man3/Ast_helper.Mod.3o +usr/share/man/man3/Ast_helper.Mtd.3o +usr/share/man/man3/Ast_helper.Mty.3o +usr/share/man/man3/Ast_helper.Opn.3o +usr/share/man/man3/Ast_helper.Pat.3o +usr/share/man/man3/Ast_helper.Sig.3o +usr/share/man/man3/Ast_helper.Str.3o +usr/share/man/man3/Ast_helper.Te.3o +usr/share/man/man3/Ast_helper.Typ.3o +usr/share/man/man3/Ast_helper.Type.3o +usr/share/man/man3/Ast_helper.Val.3o +usr/share/man/man3/Ast_helper.Vb.3o +usr/share/man/man3/Ast_mapper.3o +usr/share/man/man3/Asttypes.3o +usr/share/man/man3/Lexer.3o +usr/share/man/man3/Location.3o +usr/share/man/man3/Longident.3o +usr/share/man/man3/Parse.3o +usr/share/man/man3/Parser.3o +usr/share/man/man3/Parsetree.3o +usr/share/man/man3/Pprintast.3o +usr/share/man/man3/Pprintast.printer.3o +usr/share/man/man3/Printast.3o +usr/share/man/man3/Syntaxerr.3o diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in index 8bfabd98..ab5a7aee 100644 --- a/debian/ocaml-nox.install.in +++ b/debian/ocaml-nox.install.in @@ -50,10 +50,15 @@ OPT: @OCamlStdlibDir@/libthreadsnat.a usr/share/man/man3/Bigarray.Array3.3o usr/share/man/man3/Bigarray.Genarray.3o usr/share/man/man3/Buffer.3o + usr/share/man/man3/Bytes.3o + usr/share/man/man3/BytesLabels.3o usr/share/man/man3/Callback.3o + usr/share/man/man3/CamlinternalFormat.3o + usr/share/man/man3/CamlinternalFormatBasics.3o usr/share/man/man3/CamlinternalLazy.3o usr/share/man/man3/CamlinternalMod.3o usr/share/man/man3/CamlinternalOO.3o + usr/share/man/man3/Char.3o usr/share/man/man3/Complex.3o usr/share/man/man3/Digest.3o usr/share/man/man3/Filename.3o @@ -69,6 +74,7 @@ OPT: @OCamlStdlibDir@/libthreadsnat.a usr/share/man/man3/Hashtbl.SeededS.3o usr/share/man/man3/Int32.3o usr/share/man/man3/Int64.3o + usr/share/man/man3/Lazy.3o usr/share/man/man3/Lexing.3o usr/share/man/man3/List.3o usr/share/man/man3/ListLabels.3o @@ -101,12 +107,14 @@ OPT: @OCamlStdlibDir@/libthreadsnat.a usr/share/man/man3/Pervasives.3o usr/share/man/man3/Pervasives.LargeFile.3o usr/share/man/man3/Printexc.3o + usr/share/man/man3/Printexc.Slot.3o usr/share/man/man3/Printf.3o usr/share/man/man3/Queue.3o usr/share/man/man3/Random.3o usr/share/man/man3/Random.State.3o usr/share/man/man3/Scanf.3o usr/share/man/man3/Scanf.Scanning.3o + usr/share/man/man3/Set.3o usr/share/man/man3/Set.Make.3o usr/share/man/man3/Set.OrderedType.3o usr/share/man/man3/Set.S.3o @@ -114,10 +122,12 @@ OPT: @OCamlStdlibDir@/libthreadsnat.a usr/share/man/man3/Stack.3o usr/share/man/man3/StdLabels.3o usr/share/man/man3/StdLabels.Array.3o + usr/share/man/man3/StdLabels.Bytes.3o usr/share/man/man3/StdLabels.List.3o usr/share/man/man3/StdLabels.String.3o usr/share/man/man3/Str.3o usr/share/man/man3/Stream.3o + usr/share/man/man3/String.3o usr/share/man/man3/StringLabels.3o usr/share/man/man3/Sys.3o usr/share/man/man3/Unix.3o @@ -134,7 +144,6 @@ OPT: usr/share/man/man1/ocamloptp.1 usr/share/man/man1/ocamlmktop.1 usr/share/man/man1/ocamldoc.1 usr/share/man/man1/ocamlyacc.1 - usr/share/man/man1/ocamlbuild.1 usr/share/man/man1/ocamldebug.1 usr/share/man/man1/ocamllex.1 STD: arg.ml @@ -157,9 +166,25 @@ STD: bigarray.mli STD: buffer.ml STD: buffer.mli STD: buffer.cmx +STD: bytes.cmi +STD: bytes.cmx +STD: bytes.ml +STD: bytes.mli +STD: bytesLabels.cmi +STD: bytesLabels.cmx +STD: bytesLabels.ml +STD: bytesLabels.mli STD: callback.ml STD: callback.mli STD: callback.cmx +STD: camlinternalFormat.cmi +STD: camlinternalFormat.cmx +STD: camlinternalFormat.ml +STD: camlinternalFormat.mli +STD: camlinternalFormatBasics.cmi +STD: camlinternalFormatBasics.cmx +STD: camlinternalFormatBasics.ml +STD: camlinternalFormatBasics.mli STD: camlinternalLazy.cmi STD: camlinternalLazy.cmx STD: camlinternalLazy.ml diff --git a/debian/rules b/debian/rules index 07dd75e9..4bbb865f 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,7 @@ MD5SUMSDIR = /var/lib/ocaml/md5sums INSTDIR = $(CURDIR)/debian/tmp/usr DISTDIR = $(PACKAGE)-$(OCAML_ABI) UPSTREAM_VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/{print $$2}' | { read u; echo $${u%-*}; }) -UPSTREAM_TARBALL = ../$(PACKAGE)_$(UPSTREAM_VERSION).orig.tar.bz2 +UPSTREAM_TARBALL = ../$(PACKAGE)_$(UPSTREAM_VERSION).orig.tar.xz SRCTARBALL = $(PACKAGE)-source-$(OCAML_ABI).tar TESTDIR := debian/test-build @@ -187,7 +187,6 @@ ifneq (,$(findstring ocaml-mode,$(ALL_PACKAGES))) $(MAKE) -C emacs SCRIPTDIR=$(CURDIR)/debian/ocaml-mode/usr/bin install-ocamltags endif # Install OCaml - sed -e 's|PREFIX=\"/.*\"|PREFIX=\"$(INSTDIR)"|' < config/config.sh > config/config.debian.install.sh $(MAKE) install PREFIX=$(INSTDIR) ifeq (,$(DEB_TEST_BUILD_PREFIX)) # Remove empty directory -- 2.30.2