[Pkg-ocaml-maint-commits] [SCM] ocaml-zarith packaging branch, master, updated. upstream/1.0-1-g662233d

Mehdi Dogguy mehdi at debian.org
Thu Sep 29 17:21:57 UTC 2011


The following commit has been merged in the master branch:
commit 662233d15f4628f09a39cfb2717718fe01a4f62b
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Sep 29 08:02:39 2011 +0200

    Initial packaging

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..377d8ce
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+ocaml-zarith (1.0-1) UNRELEASED; urgency=low
+
+  * Initial release. (Closes: #643736)
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 29 Sep 2011 07:54:35 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..57a7be6
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,56 @@
+Source: ocaml-zarith
+Section: ocaml
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Mehdi Dogguy <mehdi at debian.org>
+Build-Depends:
+  debhelper (>= 8),
+  ocaml-nox (>= 3.12),
+  dh-ocaml (>= 0.9.1),
+  libgmp3-dev,
+  ocaml-findlib
+Standards-Version: 3.9.2
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-zarith.git
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-zarith.git
+Homepage: https://forge.ocamlcore.org/projects/zarith/
+
+Package: libzarith-ocaml-dev
+Architecture: any
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Suggests: ocaml-findlib
+Description: arithmetic and logical operations over arbitrary-precision integers (dev)
+ The Zarith library implements arithmetic and logical operations over
+ arbitrary-precision integers. It uses GMP to efficiently implement
+ arithmetic over big integers. Small integers are represented as Caml
+ unboxed integers, for speed and space economy.
+ .
+ This package provides the static library, OCaml library and interface
+ for developing applications to use libzarith-ocaml.
+
+Package: libzarith-ocaml
+Architecture: any
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: arithmetic and logical operations over arbitrary-precision integers (runtime)
+ The Zarith library implements arithmetic and logical operations over
+ arbitrary-precision integers. It uses GMP to efficiently implement
+ arithmetic over big integers. Small integers are represented as Caml
+ unboxed integers, for speed and space economy.
+ .
+ This package provides the shared library for running applications linked
+ against libzarith-ocaml.
+
+Package: libzarith-ocaml-doc
+Section: doc
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: libzarith-ocaml-dev
+Description: arithmetic and logical operations over arbitrary-precision integers (doc)
+ The Zarith library implements arithmetic and logical operations over
+ arbitrary-precision integers. It uses GMP to efficiently implement
+ arithmetic over big integers. Small integers are represented as Caml
+ unboxed integers, for speed and space economy.
+ .
+ This package provides the ocamldoc generated html files.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..1a43ec2
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,33 @@
+Packaged-By: Mehdi Dogguy <mehdi at debian.org>
+Packaged-Date: Thu, 29 Sept 2011 07:46:21 +0200
+Original-Source-Location: https://forge.ocamlcore.org/projects/zarith/
+Upstream-Author: Xavier Leroy and Antoine Miné
+
+Files: *
+Copyright: © 2010-2011 Antoine Miné, Abstraction project.
+License: LGPL-2 + static linking exception
+
+  As a special exception to the GNU Library General Public License, you
+  may link, statically or dynamically, a "work that uses the Library"
+  with a publicly distributed version of the Library to produce an
+  executable file containing portions of the Library, and distribute
+  that executable file under terms of your choice, without any of the
+  additional requirements listed in clause 6 of the GNU Library General
+  Public License.  By "a publicly distributed version of the Library",
+  we mean either the unmodified Library as distributed by INRIA, or a
+  modified version of the Library that is distributed under the
+  conditions defined in clause 3 of the GNU Library General Public
+  License.  This exception does not however invalidate any other reasons
+  why the executable file might be covered by the GNU Library General
+  Public License.
+
+  See also `/usr/share/common-licenses/LGPL-2'.
+
+Files: debian/*
+Copyright: © 2011 Mehdi Dogguy <mehdi at debian.org>
+License: LGPL-2
+
+  See `/usr/share/common-licenses/LGPL-2'.
+
+
+
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..e69de29
diff --git a/debian/libzarith-ocaml-dev.install.in b/debian/libzarith-ocaml-dev.install.in
new file mode 100644
index 0000000..b327a1c
--- /dev/null
+++ b/debian/libzarith-ocaml-dev.install.in
@@ -0,0 +1,4 @@
+ at OCamlStdlibDir@/zarith/*.mli
+ at OCamlStdlibDir@/zarith/*.cmi
+ at OCamlStdlibDir@/zarith/*.a
+OPT: @OCamlStdlibDir@/zarith/*.cmxa
diff --git a/debian/libzarith-ocaml-doc.dirs b/debian/libzarith-ocaml-doc.dirs
new file mode 100644
index 0000000..060382e
--- /dev/null
+++ b/debian/libzarith-ocaml-doc.dirs
@@ -0,0 +1 @@
+usr/share/doc/libzarith-ocaml-dev/doc
diff --git a/debian/libzarith-ocaml-doc.doc-base b/debian/libzarith-ocaml-doc.doc-base
new file mode 100644
index 0000000..17f661c
--- /dev/null
+++ b/debian/libzarith-ocaml-doc.doc-base
@@ -0,0 +1,8 @@
+Document: libzarith-ocaml-dev-ocamldoc-api-reference
+Title: libzarith-ocaml-dev OCamldoc API Reference
+Abstract: API reference manual for libzarith-ocaml-dev (generated via OCamldoc)
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libzarith-ocaml-dev/doc/html/index.html
+Files: /usr/share/doc/libzarith-ocaml-dev/doc/html/*
diff --git a/debian/libzarith-ocaml-doc.install.in b/debian/libzarith-ocaml-doc.install.in
new file mode 100644
index 0000000..a0a413a
--- /dev/null
+++ b/debian/libzarith-ocaml-doc.install.in
@@ -0,0 +1 @@
+html		usr/share/doc/libzarith-ocaml-dev/doc
diff --git a/debian/libzarith-ocaml-doc.links b/debian/libzarith-ocaml-doc.links
new file mode 100644
index 0000000..b469eaa
--- /dev/null
+++ b/debian/libzarith-ocaml-doc.links
@@ -0,0 +1 @@
+usr/share/doc/libzarith-ocaml-dev/doc usr/share/doc/libzarith-ocaml-doc/doc
diff --git a/debian/libzarith-ocaml.install.in b/debian/libzarith-ocaml.install.in
new file mode 100644
index 0000000..2bbe6ee
--- /dev/null
+++ b/debian/libzarith-ocaml.install.in
@@ -0,0 +1,4 @@
+ at OCamlStdlibDir@/stublibs/*.so			@OCamlDllDir@/
+ at OCamlStdlibDir@/zarith/*.cma
+ at OCamlStdlibDir@/zarith/META
+DYN: @OCamlStdlibDir@/zarith/*.cmxs
diff --git a/debian/patches/0001-added-failsafe-flag-to-ocamkmklib-seems-to-make-buil.patch b/debian/patches/0001-added-failsafe-flag-to-ocamkmklib-seems-to-make-buil.patch
new file mode 100644
index 0000000..3de4dab
--- /dev/null
+++ b/debian/patches/0001-added-failsafe-flag-to-ocamkmklib-seems-to-make-buil.patch
@@ -0,0 +1,43 @@
+From: antoinemine <antoinemine at 198b03b0-60d5-47cb-a09e-f81db6e26457>
+Date: Thu, 1 Sep 2011 14:01:50 +0000
+Subject: [PATCH] added -failsafe flag to ocamkmklib seems to make building with static libgmp work (bug #1034)
+
+git-svn-id: svn://scm.ocamlcore.org/svn/zarith/trunk@36 198b03b0-60d5-47cb-a09e-f81db6e26457
+---
+ project.mak |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/project.mak b/project.mak
+index 111de08..470c8a1 100644
+--- a/project.mak
++++ b/project.mak
+@@ -31,16 +31,16 @@ TOINSTALL = zarith.a zarith.cma zarith.cmxa zarith.cmxs libzarith.a $(MLISRC) $(
+ all: $(TOINSTALL) test
+ 
+ zarith.cma: $(MLSRC:%.ml=%.cmo)
+-	$(OCAMLMKLIB) -o zarith $+ $(LIBS)
++	$(OCAMLMKLIB) -failsafe -o zarith $+ $(LIBS)
+ 
+ zarith.cmxa zarith.a: $(MLSRC:%.ml=%.cmx)
+-	$(OCAMLMKLIB) -o zarith $+ $(LIBS)
++	$(OCAMLMKLIB) -failsafe -o zarith $+ $(LIBS)
+ 
+ zarith.cmxs: zarith.cmxa libzarith.a
+ 	$(OCAMLOPT) -shared -o $@ -I . zarith.cmxa
+ 
+ libzarith.a dllzarith.so: $(SSRC:%.S=%.o) $(CSRC:%.c=%.o) 
+-	$(OCAMLMKLIB) -o zarith $+ $(LIBS)
++	$(OCAMLMKLIB) -failsafe -o zarith $+ $(LIBS)
+ 
+ test: zarith.cmxa test.cmx
+ 	$(OCAMLOPT) $(OCAMLOPTFLAGS) $(OCAMLINC) -cclib "-L." $+ -o $@
+@@ -109,7 +109,7 @@ $(AUTOGEN): z.mlp z.mlip $(SSRC) z_pp.pl
+ 	$(OCAMLOPT) $(OCAMLOPTFLAGS) $(OCAMLINC) -c $<
+ 
+ %.o: %.c
+-	$(OCAMLC) -verbose -ccopt "$(CFLAGS)" -c $<
++	$(OCAMLC) -ccopt "$(CFLAGS)" -c $<
+ 
+ clean:
+ 	/bin/rm -rf *.o *.a *.so *.cmi *.cmo *.cmx *.cmxa *.cmxs *.cma *.dll *~ \#* depend test $(AUTOGEN) tmp.c depend
+-- 
diff --git a/debian/patches/0002-Fix-install-target.patch b/debian/patches/0002-Fix-install-target.patch
new file mode 100644
index 0000000..e16b741
--- /dev/null
+++ b/debian/patches/0002-Fix-install-target.patch
@@ -0,0 +1,28 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Thu, 29 Sep 2011 09:05:18 +0200
+Subject: [PATCH] Fix install target
+
+---
+ project.mak |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/project.mak b/project.mak
+index 470c8a1..2e3e9f7 100644
+--- a/project.mak
++++ b/project.mak
+@@ -80,10 +80,13 @@ endif
+ 
+ ifeq ($(INSTMETH),findlib)
+ install:
+-	$(OCAMLFIND) install -destdir $(INSTALLDIR) zarith META $(TOINSTALL) dllzarith.so
++	mkdir -p $(INSTALLDIR)/stublibs/
++	$(OCAMLFIND) install -destdir $(INSTALLDIR) zarith META $(TOINSTALL)
++	cp dllzarith.so $(INSTALLDIR)/stublibs/
+ 
+ uninstall:
+ 	$(OCAMLFIND) remove -destdir $(INSTALLDIR) zarith
++	rm -f $(INSTALLDIR)/stublibs/dllzarith.so
+ endif
+ 
+ 
+-- 
diff --git a/debian/patches/0003-Make-it-byte-arch-aware.patch b/debian/patches/0003-Make-it-byte-arch-aware.patch
new file mode 100644
index 0000000..85c5886
--- /dev/null
+++ b/debian/patches/0003-Make-it-byte-arch-aware.patch
@@ -0,0 +1,40 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Thu, 29 Sep 2011 18:27:09 +0200
+Subject: [PATCH] Make it byte-arch aware
+
+---
+ project.mak |   16 +++++++++++++---
+ 1 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/project.mak b/project.mak
+index 2e3e9f7..f6417d1 100644
+--- a/project.mak
++++ b/project.mak
+@@ -22,13 +22,23 @@ MLISRC = z.mli q.mli big_int_Z.mli
+ AUTOGEN = z.ml z.mli
+ 
+ CMIOBJ = $(MLISRC:%.mli=%.cmi)
+-TOINSTALL = zarith.a zarith.cma zarith.cmxa zarith.cmxs libzarith.a $(MLISRC) $(CMIOBJ)
+-
++TOINSTALL = zarith.a zarith.cma libzarith.a $(MLISRC) $(CMIOBJ)
++ifneq (,$(wildcard /usr/bin/$(OCAMLOPT)))
++TOINSTALL += zarith.cmxa
++ifneq (,$(wildcard $(shell $(OCAMLC) -where)/dynlink.cmxa))
++TOINSTALL += zarith.cmxs
++endif
++endif
+ 
+ # build targets
+ ###############
+ 
+-all: $(TOINSTALL) test
++all:: $(TOINSTALL)
++ifneq (,$(wildcard /usr/bin/$(OCAMLOPT)))
++all:: test
++else
++all:: test.b
++endif
+ 
+ zarith.cma: $(MLSRC:%.ml=%.cmo)
+ 	$(OCAMLMKLIB) -failsafe -o zarith $+ $(LIBS)
+-- 
diff --git a/debian/patches/0004-Disable-charset-when-calling-ocamldoc.patch b/debian/patches/0004-Disable-charset-when-calling-ocamldoc.patch
new file mode 100644
index 0000000..bdcc3b1
--- /dev/null
+++ b/debian/patches/0004-Disable-charset-when-calling-ocamldoc.patch
@@ -0,0 +1,24 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Thu, 29 Sep 2011 09:52:39 +0200
+Subject: [PATCH] Disable -charset when calling ocamldoc
+
+This command line option comes with OCaml 3.12.1, which is not in
+Debian yet. We should drop this patch as soon as it enters in.
+---
+ project.mak |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/project.mak b/project.mak
+index f6417d1..ecaded5 100644
+--- a/project.mak
++++ b/project.mak
+@@ -66,7 +66,7 @@ bitest: zarith.cmxa  bitest.cmx
+ 
+ doc: $(MLISRC)
+ 	mkdir -p html
+-	$(OCAMLDOC) -html -d html -charset utf8 $+
++	$(OCAMLDOC) -html -d html $+
+ 
+ 
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..eb369c2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+0001-added-failsafe-flag-to-ocamkmklib-seems-to-make-buil.patch
+0002-Fix-install-target.patch
+0003-Make-it-byte-arch-aware.patch
+0004-Disable-charset-when-calling-ocamldoc.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..a1cef2c
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+
+include /usr/share/ocaml/ocamlvars.mk
+
+Z_INSTALL_DIR=$(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
+
+override_dh_auto_install:
+ifneq (,$(findstring libzarith-ocaml-doc,$(shell dh_listpackages)))
+	$(MAKE) doc
+endif
+	$(MAKE) install
+
+override_dh_auto_test:
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+	./test
+else
+	./test.b
+endif
+
+override_dh_auto_configure:
+	./configure --installdir $(Z_INSTALL_DIR) \
+                    --host $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+%:
+	dh $@ --with ocaml
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..f5df355
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://forge.ocamlcore.org/frs/?group_id=243 \
+	/frs/download.php/.*/zarith-(.*).tgz

-- 
ocaml-zarith packaging



More information about the Pkg-ocaml-maint-commits mailing list