[Pkg-ocaml-maint-commits] [SCM] tyxml packaging branch, master, updated. debian/2.0-1
The following commit has been merged in the master branch: commit 9f3e0e0ffd7b0e5a9b0698820aec5456c058ece2 Author: Stephane Glondu st...@glondu.net Date: Thu Sep 22 21:06:39 2011 +0200 Update debian/watch diff --git a/debian/watch b/debian/watch index e6d23ad..637140e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 opts=uversionmangle=s/-rc/~rc/ \ -http://ocsigen.org/tyxml/install ../download/tyxml-(.*)\.tar\.gz +http://ocsigen.org/tyxml/install .*/tyxml-(.*)\.tar\.gz -- tyxml packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] tyxml packaging branch, master, updated. debian/2.0-1
The following commit has been merged in the master branch: commit 62aac5e1bc0939aed51da0ec7313b61af4589844 Merge: 9f3e0e0ffd7b0e5a9b0698820aec5456c058ece2 e5e6564e60afb908ce69c50a4f3a0b8ff9b83bed Author: Stephane Glondu st...@glondu.net Date: Thu Sep 22 21:07:37 2011 +0200 Merge commit 'upstream/2.0' -- tyxml packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] tyxml packaging branch, master, updated. debian/2.0-1
The following commit has been merged in the master branch: commit c7e4557b981a413ce18973a2125dec8a5f2f2b9a Author: Stephane Glondu st...@glondu.net Date: Thu Sep 22 21:09:49 2011 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index a24c345..5a33098 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +tyxml (2.0-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Thu, 22 Sep 2011 21:09:33 +0200 + tyxml (2.0~rc1-1) unstable; urgency=low * New upstream release -- tyxml packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] tyxml packaging branch, master, updated. debian/2.0-1
The following commit has been merged in the master branch:
commit e7ac969897954ccd68fd1d31a1aa7c3ca3a3fc6c
Author: Stephane Glondu st...@glondu.net
Date: Thu Sep 22 21:18:58 2011 +0200
Remove obsolete patch
diff --git a/debian/patches/0001-Missing-files-in-makefiles.patch
b/debian/patches/0001-Missing-files-in-makefiles.patch
deleted file mode 100644
index 30ff130..000
--- a/debian/patches/0001-Missing-files-in-makefiles.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Stephane Glondu st...@glondu.net
-Date: Fri, 15 Jul 2011 13:21:26 +0200
-Subject: Missing files in makefiles
-
- Makefile |7 ---
- Makefile.filelist |4 +++-
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 32bca00..6fbd04b 100644
a/Makefile
-+++ b/Makefile
-@@ -24,7 +24,7 @@ distclean:
- $(MAKE) -C syntax distclean
- $(MAKE) -C lib distclean
- $(MAKE) -C doc distclean
-- -rm -f *~ \#* .\#*
-+ -rm -f *~ \#* .\#* META
-
- .PHONY: doc
- doc:
-@@ -46,16 +46,17 @@ install:
- $(OCAMLFIND) install ${PACKAGENAME} \
- -patch-version ${VERSION} \
- META ${INTF} ${IMPL} ${NATIMPL} \
-+${MLI_TO_INSTALL}
-
- install-byte:
- $(OCAMLFIND) install ${PACKAGENAME} \
- -patch-version ${VERSION} \
--META ${INTF} ${IMPL}
-+META ${INTF} ${IMPL} ${MLI_TO_INSTALL}
-
- install-opt:
- $(OCAMLFIND) install ${PACKAGENAME} \
- -patch-version ${VERSION} \
--META ${INTF} ${NATIMPL}
-+META ${INTF} ${NATIMPL} ${MLI_TO_INSTALL}
-
- uninstall:
- $(OCAMLFIND) remove ${PACKAGENAME}
-diff --git a/Makefile.filelist b/Makefile.filelist
-index f99f27d..a5b7b58 100644
a/Makefile.filelist
-+++ b/Makefile.filelist
-@@ -55,7 +55,7 @@ DUCE_INTF := lib/XML_sigs_duce.cmi\
- lib/XHTML_duce.cmi \
-
- DUCE_IMPL:= lib/${LIBNAME}_duce.cma
--DUCE_NATIMPL := lib/${LIBNAME}_duce.cmxa
-+DUCE_NATIMPL := lib/${LIBNAME}_duce.cmxa lib/${LIBNAME}_duce.a
-
- ifeq ${NATDYNLINK} YES
- DUCE_NATIMPL += lib/${LIBNAME}_duce.cmxs
-@@ -71,3 +71,5 @@ IMPL+= ${DUCE_IMPL}
- NATIMPL += ${DUCE_NATIMPL}
- DOC += ${DUCE_DOC}
- endif
-+
-+MLI_TO_INSTALL := $(foreach X,$(INTF:.cmi=.ml),$(if $(wildcard
$(X)i),$(X)i,$(X)))
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8bf7332..000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Missing-files-in-makefiles.patch
--
tyxml packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] tyxml packaging branch, master, updated. debian/2.0-1
The following commit has been merged in the master branch: commit 3fca75bac39db76ab2a5cdf54188398479cc9f74 Author: Stephane Glondu st...@glondu.net Date: Thu Sep 22 21:11:12 2011 +0200 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 5a33098..25b6176 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -tyxml (2.0-1) UNRELEASED; urgency=low +tyxml (2.0-1) unstable; urgency=low * New upstream release - -- Stéphane Glondu glo...@debian.org Thu, 22 Sep 2011 21:09:33 +0200 + -- Stéphane Glondu glo...@debian.org Thu, 22 Sep 2011 21:11:08 +0200 tyxml (2.0~rc1-1) unstable; urgency=low -- tyxml packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] tyxml packaging branch, pristine-tar, updated. c4ce652745d114e504fd43ced9a582be11e5e9b9
The following commit has been merged in the pristine-tar branch: commit c4ce652745d114e504fd43ced9a582be11e5e9b9 Author: Stephane Glondu st...@glondu.net Date: Thu Sep 22 21:07:37 2011 +0200 pristine-tar data for tyxml_2.0.orig.tar.gz diff --git a/tyxml_2.0.orig.tar.gz.delta b/tyxml_2.0.orig.tar.gz.delta new file mode 100644 index 000..c2ddf33 Binary files /dev/null and b/tyxml_2.0.orig.tar.gz.delta differ diff --git a/tyxml_2.0.orig.tar.gz.id b/tyxml_2.0.orig.tar.gz.id new file mode 100644 index 000..df6dcfa --- /dev/null +++ b/tyxml_2.0.orig.tar.gz.id @@ -0,0 +1 @@ +e5e6564e60afb908ce69c50a4f3a0b8ff9b83bed -- tyxml packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch: commit 3b7b401567babcf76963a500a8ac858c5f3e7e04 Author: Stephane Glondu st...@glondu.net Date: Wed Nov 16 16:47:26 2011 +0100 Update debian/watch diff --git a/debian/watch b/debian/watch index 4d50c56..833e756 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://ocaml.janestreet.com/?q=node/13 .*/core-(.*)\.tgz +http://ocaml.janestreet.com/?q=node/13 .*/core-(.*)\.t(?:ar\.)gz -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch: commit e36cc14449e9f574a99a0b526c7679bf5766dfd9 Merge: 3b7b401567babcf76963a500a8ac858c5f3e7e04 3b7ad25d5956eec0e50c8aa07040b8fcd5aa606c Author: Stephane Glondu st...@glondu.net Date: Wed Nov 16 16:48:12 2011 +0100 Merge commit 'upstream/107.01' -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch: commit 87033b5cb626063a8aba222974fa5c154f6c2ab0 Author: Stephane Glondu st...@glondu.net Date: Wed Nov 16 16:48:42 2011 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index 6496520..298f17d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,7 @@ -janest-core (0.6.0-4) UNRELEASED; urgency=low +janest-core (107.01-4) UNRELEASED; urgency=low + + [ Stéphane Glondu ] + * New upstream release [ Stefano Zacchiroli ] * remove myself from Uploaders -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch: commit fff437cac080311f6828a09d04510296fea5f847 Author: Stephane Glondu st...@glondu.net Date: Wed Nov 16 17:20:50 2011 +0100 Remove obsolete debian/README.* files diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index b14ccce..000 --- a/debian/README.Debian +++ /dev/null @@ -1,130 +0,0 @@ - -ocamldoc API reference -== - -The -dev packages of Core contains ocamldoc API reference in HTML format as -usual. Additionally, Jane Street Capital have made available an integrated API -reference with Core and all its other libraries on the web at: - - http://www.janestreet.com/ocaml/janestreet-ocamldocs/ - - -- Stefano Zacchiroli z...@debian.org, Thu, 12 Nov 2009 16:39:07 +0100 - -Thread support with ocamlc and ocaml - - -Both Core and Core_extended require thread support. To enable it for programs -you're building you can use findlib and pass -thread to ocamlc, e.g.: - - $ ocamlfind ocamlc -thread -package core -libkpkg foo.ml - -To experiment with Core in the top-level you can use the #thread directive just -before #require-ing Core, e.g.: - - zack@usha:~$ ledit ocaml -init /dev/null - Objective Caml version 3.11.1 - - # #use topfind;; - - : unit = () - Findlib has been successfully loaded. Additional directives: -#require package;; to load a package -#list;; to list the available packages -#camlp4o;;to load camlp4 (standard syntax) -#camlp4r;;to load camlp4 (revised syntax) -#predicates p,q,...;; to set these predicates -Topfind.reset();; to force that packages will be reloaded -#thread;; to enable threads - - - : unit = () - # #thread;; - /usr/lib/ocaml/threads: added to search path - /usr/lib/ocaml/unix.cma: loaded - /usr/lib/ocaml/threads/threads.cma: loaded - # #require core;; - /usr/lib/ocaml/bigarray.cma: loaded - /usr/lib/ocaml/res: added to search path - /usr/lib/ocaml/res/res.cma: loaded - /usr/lib/ocaml/nums.cma: loaded - /usr/lib/ocaml/num-top: added to search path - /usr/lib/ocaml/num-top/num_top.cma: loaded - /usr/lib/ocaml/sexplib: added to search path - /usr/lib/ocaml/sexplib/sexplib.cma: loaded - /usr/lib/ocaml/sexplib/sexplib_top.cma: loaded - /usr/lib/ocaml/bin_prot: added to search path - /usr/lib/ocaml/bin_prot/bin_prot.cma: loaded - /usr/lib/ocaml/fieldslib: added to search path - /usr/lib/ocaml/fieldslib/fieldslib.cma: loaded - /usr/lib/ocaml/core: added to search path - /usr/lib/ocaml/core/core.cma: loaded - # open Core.Std;; - # - - -- Stefano Zacchiroli z...@debian.org, Thu, 12 Nov 2009 11:29:21 +0100 - - -bin_opt support not fully functional on all architectures -= - -One of the dependencies of the core library is bin_opt (Debian package: -libbin-opt-camlp4-dev). It is known, also according to upstream, to be working -properly only on: - - i386 amd64 - -On other architectures you do get proper marshalling and umarshalling, but you -loose architecture independence in the resulting binary format. As such, you -might get segfault when transferring data among machines having different -architectures. - -Some more details on this issue are available at -http://caml.inria.fr/pub/ml-archives/caml-list/2008/05/56cf55b101f21b608feb64c75b92c679.en.html -and, more generally, in the thread starting at -http://caml.inria.fr/pub/ml-archives/caml-list/2008/05/296bd8cda27c408a793b3ec1669f2f76.en.html - - -- Stefano Zacchiroli z...@debian.org Sat, 19 Jul 2008 19:24:56 +0200 - - - -Summary of Core functionalities -=== - -- Bag (set type with duplicates) -- Bigbuffer (unlimited Buffer type) -- Bigstring (unlimited String type) -- 8/16/32/64-bit signed/unsigned binary packing functions -- Bool type -- Safe finalization for reading/writing files -- Function composition operators -- Enhanced versions of stdlib modules such as Arg, Array, Printf, etc. -- Mutexes -- CRC functions -- Dequeue type -- Doubly-linked list type -- Enhanced exception module -- Fast hash table -- Force once (thunk that can be forced only once) -- Functional queue type -- Min-heap type -- Enhanced input/output channels -- Closed interval type -- Interval set type -- Read files as lines -- Linux-specific syscalls such as sendfile, get/set TCP options, epoll, splice -- Memoization -- Piece-wise linear interpolation of floats -- Polymorphic map and set -- Find size of OCaml structures -- Space-efficient tuples -- Synchronized queues -- Thread-safe queues -- Convenience functions for Unix times -- Timed events -- Tuple convenience functions -- Extended Unix module filling in some missing syscalls such as sync, - getrusage, initgroups, etc. - -[ list courtesy of Richard Jones, see - http://groups.google.com/group/fa.caml/msg/2e324f40ecd309bb ] - - --
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch: commit eedb2f129e276f2ee6ce3162aee6e99437cd6805 Author: Stephane Glondu st...@glondu.net Date: Mon Jun 27 16:17:26 2011 +0200 Remove obsolete patches diff --git a/debian/patches/0001-bug-fix-libinstall-b-c-should-not-depend-on-native-c.patch b/debian/patches/0001-bug-fix-libinstall-b-c-should-not-depend-on-native-c.patch deleted file mode 100644 index 89d2a52..000 --- a/debian/patches/0001-bug-fix-libinstall-b-c-should-not-depend-on-native-c.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Stefano Zacchiroli z...@upsilon.cc -Date: Sat, 3 May 2008 22:39:14 +0200 -Subject: [PATCH] bug fix: libinstall-b-c should not depend on native code - -Signed-off-by: Stefano Zacchiroli z...@upsilon.cc - OCamlMakefile |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/OCamlMakefile b/OCamlMakefile -index b0b9252..b51c452 100644 a/OCamlMakefile -+++ b/OCamlMakefile -@@ -1170,7 +1170,7 @@ libinstall: all - $(QUIET)printf \nInstallation successful.\n - - .PHONY: libinstall-byte-code --libinstall-byte-code: all -+libinstall-byte-code: byte-code-library - $(QUIET)printf \nInstalling byte-code library with ocamlfind\n - $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \ - $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES)) --- diff --git a/debian/patches/0002-make-targets-to-enable-bytecode-only-compilation.patch b/debian/patches/0002-make-targets-to-enable-bytecode-only-compilation.patch deleted file mode 100644 index 56a5683..000 --- a/debian/patches/0002-make-targets-to-enable-bytecode-only-compilation.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Stefano Zacchiroli z...@upsilon.cc -Date: Sat, 3 May 2008 22:39:34 +0200 -Subject: [PATCH] make targets to enable bytecode only compilation - -Signed-off-by: Stefano Zacchiroli z...@upsilon.cc - Makefile | 12 - extended/Makefile |1 + - lib/Makefile |1 + - 3 files changed, 14 insertions(+), 0 deletions(-) - -diff --git a/Makefile b/Makefile -index 04a3d60..746dca2 100644 a/Makefile -+++ b/Makefile -@@ -17,3 +17,15 @@ uninstall: - clean: - @cd lib $(MAKE) clean - @cd extended $(MAKE) clean -+ -+.PHONY: byte -+byte: -+ @cd lib $(MAKE) $@ -+ @cd lib_test make -+ @cd extended $(MAKE) $@ -+ -+.PHONY: libinstall-byte-code -+libinstall-byte-code: -+ @cd lib $(MAKE) $@ -+ @cd extended $(MAKE) $@ -+ -diff --git a/extended/Makefile b/extended/Makefile -index b044c16..dc777ee 100644 a/extended/Makefile -+++ b/extended/Makefile -@@ -114,6 +114,7 @@ THREADS = yes - ANNOTATE = true - - all: byte-code-library native-code-library -+byte: byte-code-library - - LIBINSTALL_FILES = \ - core_extended.cmi core_extended.cma core_extended.cmxa core_extended.a libcore_extended_stubs.a dllcore_extended_stubs.so -diff --git a/lib/Makefile b/lib/Makefile -index ab1c8d8..d2af679 100644 a/lib/Makefile -+++ b/lib/Makefile -@@ -210,6 +210,7 @@ THREADS = yes - ANNOTATE = true - - all: byte-code-library native-code-library -+byte: byte-code-library - - LIBINSTALL_FILES = \ - core.cmi core.cma core.cmxa core.a libcore_stubs.a dllcore_stubs.so --- diff --git a/debian/patches/0003-add-missing-META-dep-on-unix.patch b/debian/patches/0003-add-missing-META-dep-on-unix.patch deleted file mode 100644 index 6b7b4a6..000 --- a/debian/patches/0003-add-missing-META-dep-on-unix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Stefano Zacchiroli z...@upsilon.cc -Date: Sat, 3 May 2008 22:57:15 +0200 -Subject: [PATCH] add missing META dep on unix - -Signed-off-by: Stefano Zacchiroli z...@upsilon.cc -Signed-off-by: Stephane Glondu st...@glondu.net - lib/META |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lib/META b/lib/META -index 60ca7f9..63258b5 100644 a/lib/META -+++ b/lib/META -@@ -2,7 +2,7 @@ name = core - version = 0.6.0 - description = Core - Jane Street Capital's standard library overlay - --requires = bigarray, res, sexplib, bin_prot, threads, fieldslib -+requires = bigarray, unix, res, sexplib, bin_prot, threads, fieldslib - - archive(byte) = core.cma - archive(native) = core.cmxa --- diff --git a/debian/patches/0004-fix-build-on-kfreebsd.patch b/debian/patches/0004-fix-build-on-kfreebsd.patch deleted file mode 100644 index 009759c..000 --- a/debian/patches/0004-fix-build-on-kfreebsd.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Stefano Zacchiroli z...@upsilon.cc -Date: Mon, 9 Nov 2009 13:23:05 +0100 -Subject: [PATCH] fix build on kfreebsd - - lib/Makefile |6 +- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/lib/Makefile b/lib/Makefile -index d2af679..40eabae 100644 a/lib/Makefile -+++ b/lib/Makefile -@@ -1,9 +1,13 @@ - OCAMLMAKEFILE = ../OCamlMakefile - --ifeq ($(shell uname -s), Linux) -+SYSTEM := $(shell uname -s) -+ -+ifeq ($(SYSTEM), Linux) -
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch: commit 499bcd83b4e3a4cbdae7d353de789be2da78192c Author: Stephane Glondu st...@glondu.net Date: Mon Jun 27 16:19:40 2011 +0200 Switch source package format to 3.0 (quilt) diff --git a/debian/control b/debian/control index 745a834..6aefe2b 100644 --- a/debian/control +++ b/debian/control @@ -6,9 +6,7 @@ Uploaders: Mehdi Dogguy me...@debian.org, Stéphane Glondu glo...@debian.org Build-Depends: - cdbs, debhelper (= 7), - quilt, ocaml-nox, dh-ocaml, camlp4, diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 000..c4cf480 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ +abort-on-upstream-changes +unapply-patches -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch:
commit 2e5a427ebbb7d6ddf7f178e9ca333890edb70813
Author: Stephane Glondu st...@glondu.net
Date: Wed Nov 16 17:06:43 2011 +0100
Remove references to core-extended
It is now distributed separately.
diff --git a/debian/control b/debian/control
index 6aefe2b..457e896 100644
--- a/debian/control
+++ b/debian/control
@@ -51,12 +51,10 @@ Description: Jane Street's standard library for OCaml
with the legacy standard library has not to be expected.
.
The code of Core is routinely reviewed within Jane Street Capital
- according to their quality assurance requirements. The extra library
- called Core_extended adds new functionalities on top of Core, but is
- only reviewed on an ad-hoc basis.
+ according to their quality assurance requirements.
.
- This package contains the development stuff you need to use Core (but
- not Core_extended) in your programs.
+ This package contains the development stuff you need to use Core in
+ your programs.
Package: libcore-ocaml
Architecture: any
@@ -84,87 +82,16 @@ Description: Jane Street's standard library for OCaml
(runtime)
library, and outright changes or replaces other; backward compatibility
.
The code of Core is routinely reviewed within Jane Street Capital
- according to their quality assurance requirements. The extra library
- called Core_extended adds new functionalities on top of Core, but is
- only reviewed on an ad-hoc basis.
+ according to their quality assurance requirements.
.
This package contains the runtime stuff you need to run programs using
- Core (but not Core_extended).
-
-Package: libcore-extended-ocaml-dev
-Architecture: any
-Depends:
- ocaml-findlib,
- ${ocaml:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Recommends: libcore-ocaml-doc
-Provides: ${ocaml:Provides}
-Description: Jane Street's standard library for OCaml - extensions
- Core is an alternative to the OCaml standard library developed by
- Jane Street Capital.
- .
- Core does a number of things:
- .
- * provides tail recursive versions of non tail recursive functions in
-the standard library;
- * changes the signature of many of the standard modules to enforce
-consistent naming conventions;
- * includes generic serialization for most types;
- * adds some new modules as well as new functionality to existing
-modules.
- .
- Beware that Core extends some functionality of the legacy standard
- library, and outright changes or replaces other; backward compatibility
- with the legacy standard library has not to be expected.
- .
- The code of Core is routinely reviewed within Jane Street Capital
- according to their quality assurance requirements. The extra library
- called Core_extended adds new functionalities on top of Core, but is
- only reviewed on an ad-hoc basis.
- .
- This package contains the development stuff you need to use
- Core_extended in your programs.
-
-Package: libcore-extended-ocaml
-Architecture: any
-Depends:
- ocaml-findlib,
- ${ocaml:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Provides: ${ocaml:Provides}
-Description: Jane Street's standard library for OCaml - extensions (runtime)
- Core is an alternative to the OCaml standard library developed by
- Jane Street Capital.
- .
- Core does a number of things:
- .
- * provides tail recursive versions of non tail recursive functions in
-the standard library;
- * changes the signature of many of the standard modules to enforce
-consistent naming conventions;
- * includes generic serialization for most types;
- * adds some new modules as well as new functionality to existing
-modules.
- .
- Beware that Core extends some functionality of the legacy standard
- library, and outright changes or replaces other; backward compatibility
- .
- The code of Core is routinely reviewed within Jane Street Capital
- according to their quality assurance requirements. The extra library
- called Core_extended adds new functionalities on top of Core, but is
- only reviewed on an ad-hoc basis.
- .
- This package contains the runtime stuff you need to run programs using
- Core_extended.
+ Core.
Package: libcore-ocaml-doc
Section: doc
Architecture: all
Enhances:
libcore-ocaml-dev,
- libcore-extended-ocaml-dev,
${misc:Depends}
Description: Jane Street's standard library for OCaml - documentation
Core is an alternative to the OCaml standard library developed by
@@ -184,9 +111,7 @@ Description: Jane Street's standard library for OCaml -
documentation
library, and outright changes or replaces other; backward compatibility
.
The code of Core is routinely reviewed within Jane Street Capital
- according to their quality assurance requirements. The extra library
- called Core_extended adds new functionalities on top of Core, but is
- only reviewed on an ad-hoc basis.
+ according to their quality assurance requirements.
.
- This package contains the ocamldoc API reference in HTML format for both
- Core and
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch: commit 31ba47034bbf0a64dd81512328a82d5af9b044bf Author: Stephane Glondu st...@glondu.net Date: Mon Jun 27 16:19:13 2011 +0200 New debian/rules with dh with overrides diff --git a/debian/rules b/debian/rules index 3a223da..7d78076 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,36 @@ #!/usr/bin/make -f -DEST_DIR = $(CURDIR)/debian/tmp -DOC_PKG = libcore-ocaml-doc -DEV_PKG = libcore-ocaml-dev -EXT_PKG = libcore-extended-ocaml-dev - -# Ensure -dev packages are installed when dh_ocamldoc is invoked on the -doc -# package. Rationale: to avoid dup interface errors we should invoke -# ocamldoc on the actually installed .mli-s (and not on lib/,extended/). The -# dep should be binary to install (instead of build to install) to ensure when -# arch packages are installed we are under fakeroot. -binary/$(DOC_PKG):: install-arch common-binary-post-install-arch - -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/makefile.mk -include /usr/share/cdbs/1/rules/ocaml.mk - -ifeq ($(OCAML_HAVE_OCAMLOPT),yes) -DEB_MAKE_BUILD_TARGET = all -DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEST_DIR) OCAMLFIND_INSTFLAGS=-destdir $(DEST_DIR) -ldconf ignore -else -DEB_MAKE_BUILD_TARGET = byte -DEB_MAKE_INSTALL_TARGET = libinstall-byte-code DESTDIR=$(DEST_DIR) OCAMLFIND_INSTFLAGS=-destdir $(DEST_DIR) -ldconf ignore -endif + +DESTDIR=$(CURDIR)/debian/tmp + +include /usr/share/ocaml/ocamlvars.mk + +export OCAML_DLL_DIR +export OCAML_HAVE_OCAMLOPT +export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR) + +%: + dh $@ --with ocaml + +.PHONY: override_dh_auto_configure +override_dh_auto_configure: + ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libcore-ocaml-doc/html/api + +.PHONY: override_dh_auto_build +override_dh_auto_build: + ocaml setup.ml -build + ocaml setup.ml -doc + +.PHONY: override_dh_auto_test +override_dh_auto_test: + ocaml setup.ml -test + +.PHONY: override_dh_auto_install +override_dh_auto_install: + mkdir -p '$(OCAMLFIND_DESTDIR)' + mkdir -p '$(DESTDIR)$(OCAML_DLL_DIR)' + ocaml setup.ml -install + rm -f '$(DESTDIR)$(OCAML_DLL_DIR)'/*.so.owner + +.PHONY: override_dh_auto_clean +override_dh_auto_clean: + ocaml setup.ml -distclean -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch: commit 1f8763ec4bf09af62df7b8db7507b6d8e7bae5c6 Author: Stephane Glondu st...@glondu.net Date: Wed Nov 16 19:29:13 2011 +0100 Bump Standards-Version to 3.9.2 diff --git a/debian/control b/debian/control index d0c17c4..220d033 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: libfields-camlp4-dev, libpcre-ocaml-dev, libounit-ocaml-dev -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/janest-core.git Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/janest-core.git Homepage: http://www.janestcapital.com/ocaml/ -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch: commit 924cfe5a537f62076188950d4d6e36e90fb38192 Author: Stephane Glondu st...@glondu.net Date: Mon Jun 27 16:20:04 2011 +0200 Bump debhelper compat level to 8 diff --git a/debian/compat b/debian/compat index 7f8f011..45a4fb7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +8 diff --git a/debian/control b/debian/control index 457e896..d0c17c4 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Mehdi Dogguy me...@debian.org, Stéphane Glondu glo...@debian.org Build-Depends: - debhelper (= 7), + debhelper (= 8), ocaml-nox, dh-ocaml, camlp4, -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch:
commit 2a1822e11bb70717a3e96837748d90b7134e1bf2
Author: Stephane Glondu st...@glondu.net
Date: Wed Nov 16 19:29:54 2011 +0100
Add missing ${misc:Depends}
diff --git a/debian/control b/debian/control
index 220d033..5ee32e7 100644
--- a/debian/control
+++ b/debian/control
@@ -90,6 +90,7 @@ Description: Jane Street's standard library for OCaml
(runtime)
Package: libcore-ocaml-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Enhances:
libcore-ocaml-dev,
${misc:Depends}
--
janest-core packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch: commit 0ea2707d51fac566888c8b9fe83fe526ad08409b Author: Stephane Glondu st...@glondu.net Date: Wed Nov 16 19:36:32 2011 +0100 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 298f17d..98acbf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,19 @@ -janest-core (107.01-4) UNRELEASED; urgency=low +janest-core (107.01-4) unstable; urgency=low [ Stéphane Glondu ] - * New upstream release + * New upstream release (Closes: #588095, #630670, #634565) +- remove obsolete patches and debian/README.* files +- remove references to core-extended (it is now distributed + separately) + * Switch source package format to 3.0 (quilt) + * Switch to dh with overrides, bump debhelper compat level to 8 + * Bump Standards-Version to 3.9.2 + * Update debian/watch [ Stefano Zacchiroli ] * remove myself from Uploaders - -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 17:27:50 +0200 + -- Stéphane Glondu glo...@debian.org Wed, 16 Nov 2011 20:39:20 +0100 janest-core (0.6.0-3) unstable; urgency=low -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707
The following commit has been merged in the master branch: commit fb20b05f6d4a9e7214cfe552636b16029f832c32 Author: Stephane Glondu st...@glondu.net Date: Wed Nov 16 17:13:43 2011 +0100 Use upstream install/doc targets diff --git a/debian/docs b/debian/docs deleted file mode 100644 index e845566..000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/debian/libcore-ocaml-dev.install.in b/debian/libcore-ocaml-dev.install.in index f92ca81..68f4b4e 100644 --- a/debian/libcore-ocaml-dev.install.in +++ b/debian/libcore-ocaml-dev.install.in @@ -1,8 +1,5 @@ -debian/tmp/core/*.a@OCamlStdlibDir@/core/ -debian/tmp/core/*.cma @OCamlStdlibDir@/core/ -debian/tmp/core/*.cmi @OCamlStdlibDir@/core/ -OPT: debian/tmp/core/*.cmxa@OCamlStdlibDir@/core/ -debian/tmp/core/META @OCamlStdlibDir@/core/ - -lib/*.mli @OCamlStdlibDir@/core/ -lib/*able.ml @OCamlStdlibDir@/core/ +@OCamlStdlibDir@/core/META +@OCamlStdlibDir@/core/*.a +@OCamlStdlibDir@/core/*.cma +@OCamlStdlibDir@/core/*.cmi +OPT: @OCamlStdlibDir@/core/*.cmxa diff --git a/debian/libcore-ocaml-doc.dirs b/debian/libcore-ocaml-doc.dirs deleted file mode 100644 index ba07e04..000 --- a/debian/libcore-ocaml-doc.dirs +++ /dev/null @@ -1,3 +0,0 @@ -/usr/share/doc-base -/usr/share/doc/libcore-ocaml-dev/html -/usr/share/doc/libcore-ocaml-doc/html diff --git a/debian/libcore-ocaml-doc.doc-base b/debian/libcore-ocaml-doc.doc-base new file mode 100644 index 000..6619563 --- /dev/null +++ b/debian/libcore-ocaml-doc.doc-base @@ -0,0 +1,9 @@ +Document: libcore-ocaml-doc-apiref +Title: Documentation of Jane Street's Core library +Author: Jane Stree +Abstract: Documentation of Jane Street's Core library +Section: Programming/OCaml + +Format: HTML +Index: /usr/share/doc/libcore-ocaml-doc/html/api/index.html +Files: /usr/share/doc/libcore-ocaml-doc/html/api/*.html diff --git a/debian/libcore-ocaml-doc.install b/debian/libcore-ocaml-doc.install new file mode 100644 index 000..99046ce --- /dev/null +++ b/debian/libcore-ocaml-doc.install @@ -0,0 +1 @@ +usr/share/doc/libcore-ocaml-doc diff --git a/debian/libcore-ocaml-doc.links b/debian/libcore-ocaml-doc.links index 0954f32..f04b0d7 100644 --- a/debian/libcore-ocaml-doc.links +++ b/debian/libcore-ocaml-doc.links @@ -1 +1 @@ -/usr/share/doc/libcore-ocaml-doc/html/core-api /usr/share/doc/libcore-ocaml-dev/html/api +/usr/share/doc/libcore-ocaml-doc/html /usr/share/doc/libcore-ocaml-dev/html diff --git a/debian/libcore-ocaml-doc.ocamldoc-core.in b/debian/libcore-ocaml-doc.ocamldoc-core.in deleted file mode 100644 index 381c5f4..000 --- a/debian/libcore-ocaml-doc.ocamldoc-core.in +++ /dev/null @@ -1,5 +0,0 @@ ---include debian/libcore-ocaml-dev@OCamlStdlibDir@/core - -pp sh debian/dpp.sh - -d html/core-api - -I lib - -I +threads diff --git a/debian/libcore-ocaml.install.in b/debian/libcore-ocaml.install.in index 8fa4daa..1d5ce78 100644 --- a/debian/libcore-ocaml.install.in +++ b/debian/libcore-ocaml.install.in @@ -1 +1 @@ -debian/tmp/core/*.so @OCamlDllDir@ +@OCamlDllDir@/*.so -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, pristine-tar, updated. 7be9a2f4a17462141e4af34f9863cbd856eb7d27
The following commit has been merged in the pristine-tar branch: commit 9d05b90e546b1809110c9e44e764a6f22f990e63 Author: Stephane Glondu st...@glondu.net Date: Mon Jun 27 16:14:35 2011 +0200 pristine-tar data for janest-core_0.7.0.orig.tar.gz diff --git a/janest-core_0.7.0.orig.tar.gz.delta b/janest-core_0.7.0.orig.tar.gz.delta new file mode 100644 index 000..8136b33 Binary files /dev/null and b/janest-core_0.7.0.orig.tar.gz.delta differ diff --git a/janest-core_0.7.0.orig.tar.gz.id b/janest-core_0.7.0.orig.tar.gz.id new file mode 100644 index 000..aa5bb9d --- /dev/null +++ b/janest-core_0.7.0.orig.tar.gz.id @@ -0,0 +1 @@ +af5c975c5e9fbece7c73f22fa35921a42fc38ec5 -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging annotated tag, debian/107.01-4, created. debian/107.01-4
The annotated tag, debian/107.01-4 has been created
at cf2dc3f24f9160c40230aea9636eff855c8d836f (tag)
tagging 0ea2707d51fac566888c8b9fe83fe526ad08409b (commit)
replaces debian/0.6.0-3
tagged by Stephane Glondu
on Wed Nov 16 20:55:42 2011 +0100
- Shortlog
Debian release 107.01-4
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABCgAGBQJOxBU+AAoJEHhT2k1JiBrTPlcP/00a6p5d9u3xnuOLNVwd2xMT
mrl2hsMLolPpuSVOrBjYe/a5Z2j6wGFOXHKj2+AFw2/Lf+q6snQRJ6mzbT+lOeh4
JqlW1K7vmkaDtevEGL6LS+QayLFfIc+Uu7kH3mO32JRGwVXkpngxAx3R2fA/iRUB
R5nQI6khs/mDKXF7YN8wxp+T9XiTk22PcW31bWYgo4oJGGUsMgn2m3w7NLZF0EFf
vmEgiq9dwrgsa2iO19cUQZ7bkuL7nail7g9MHD8DSLiiyacAeHdyZhjaxCI/ma6A
qcufI5tseRlsJo62QBC81N1tGiZeGyfI39Bsdj1E02llPWL1m6Di3W5+XyV0FWqR
/k38ASwj0qfpGCcQOI1AUVHx1RAITodyuP8hYGwb4Oe1smKJzoixx6HWJeuOR+cz
2z61p6ZZC469eehfn3wnNxdINpTy7BcPXx8+nBwgw+iDdK8DJgrzjS5DsbeeQ3Jf
lx5MSICpqQx1O1ybJk1Ji2gnvZ/nDfk7VTbSPAUyhFvppWlKPZGl67Oth2h8LJhE
PDFa1Vos8hYbHIlMCKVFnWNRfJgB1YKwgMNsMRnpeIAA7I1ZcToY1mMD4AgPtkyE
E+i2EhnYp5X3VQePgU9rlXSBXIHgB/qzA+7N6u4xRqAvmqmLGFkjEcwA1hXjfeLb
NXNGgD07LzS1ONEsCLtL
=alsU
-END PGP SIGNATURE-
Stefano Zacchiroli (1):
remove myself from Uploaders
Stephane Glondu (15):
Update debian/watch
Imported Upstream version 107.01
Merge commit 'upstream/107.01'
New upstream release
Remove obsolete debian/README.* files
Remove obsolete patches
Switch source package format to 3.0 (quilt)
Remove references to core-extended
New debian/rules with dh with overrides
Use upstream install/doc targets
Bump debhelper compat level to 8
Call dh_install with --fail-missing
Bump Standards-Version to 3.9.2
Add missing ${misc:Depends}
Update changelog and prepare upload to unstable
---
--
janest-core packaging
___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging annotated tag, upstream/107.01, created. upstream/107.01
The annotated tag, upstream/107.01 has been created at ca95102eff443daebc4956099d9057af7aee9903 (tag) tagging 3b7ad25d5956eec0e50c8aa07040b8fcd5aa606c (commit) replaces upstream/0.5.3 tagged by Stephane Glondu on Wed Nov 16 16:48:12 2011 +0100 - Shortlog Upstream version 107.01 Stefano Zacchiroli (1): Imported Upstream version 0.6.0 Stephane Glondu (1): Imported Upstream version 107.01 --- -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, pristine-tar, updated. 7be9a2f4a17462141e4af34f9863cbd856eb7d27
The following commit has been merged in the pristine-tar branch: commit 7be9a2f4a17462141e4af34f9863cbd856eb7d27 Author: Stephane Glondu st...@glondu.net Date: Wed Nov 16 16:48:12 2011 +0100 pristine-tar data for janest-core_107.01.orig.tar.gz diff --git a/janest-core_107.01.orig.tar.gz.delta b/janest-core_107.01.orig.tar.gz.delta new file mode 100644 index 000..30afdfd Binary files /dev/null and b/janest-core_107.01.orig.tar.gz.delta differ diff --git a/janest-core_107.01.orig.tar.gz.id b/janest-core_107.01.orig.tar.gz.id new file mode 100644 index 000..b23d7ee --- /dev/null +++ b/janest-core_107.01.orig.tar.gz.id @@ -0,0 +1 @@ +3b7ad25d5956eec0e50c8aa07040b8fcd5aa606c -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/107.01-4-2-gf0a04a7
The following commit has been merged in the master branch: commit b0fac3ee112267ce2e0ce531b9a46067716b4975 Author: Stephane Glondu st...@glondu.net Date: Thu Nov 17 07:45:17 2011 +0100 Force linking with -lrt diff --git a/debian/patches/0001-Force-linking-with-lrt.patch b/debian/patches/0001-Force-linking-with-lrt.patch new file mode 100644 index 000..19332bf --- /dev/null +++ b/debian/patches/0001-Force-linking-with-lrt.patch @@ -0,0 +1,28 @@ +From: Stephane Glondu st...@glondu.net +Date: Thu, 17 Nov 2011 07:45:05 +0100 +Subject: Force linking with -lrt + +It is needed for clock_* functions, but its need is misdetected on (at +least) hurd, kfreebsd-*, mips*, powerpc and s390, causing FTBFS. +--- + myocamlbuild.ml |4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/myocamlbuild.ml b/myocamlbuild.ml +index 233a58c..c88a61d 100644 +--- a/myocamlbuild.ml b/myocamlbuild.ml +@@ -403,10 +403,10 @@ module MyOCamlbuildBase = struct + (fun (lib, dir, headers) - +(* Handle C part of library *) +flag [link; library; ocaml; byte; use_lib^lib] +- (S[A-dllib; A(-l^lib); A-cclib; A(-l^lib)]); ++ (S[A-dllib; A(-l^lib); A-cclib; A(-l^lib); A-cclib; A-lrt]); + +flag [link; library; ocaml; native; use_lib^lib] +- (S[A-cclib; A(-l^lib)]); ++ (S[A-cclib; A(-l^lib); A-cclib; A-lrt]); + +flag [link; program; ocaml; byte; use_lib^lib] + (S[A-dllib; A(dll^lib)]); +-- diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..bcf0809 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Force-linking-with-lrt.patch -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/107.01-4-2-gf0a04a7
The following commit has been merged in the master branch: commit f0a04a7d877506f2989e39aedb3a7d2bef51a9d7 Author: Stephane Glondu st...@glondu.net Date: Thu Nov 17 08:02:27 2011 +0100 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 98acbf1..e69c450 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +janest-core (107.01-5) unstable; urgency=low + + * Fix FTBFS on some architectures by forcing link with -lrt + + -- Stéphane Glondu glo...@debian.org Thu, 17 Nov 2011 08:02:17 +0100 + janest-core (107.01-4) unstable; urgency=low [ Stéphane Glondu ] -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging annotated tag, debian/107.01-5, created. debian/107.01-5
The annotated tag, debian/107.01-5 has been created at f92ed4027d43a73527aca56433a66023183705ca (tag) tagging f0a04a7d877506f2989e39aedb3a7d2bef51a9d7 (commit) replaces debian/107.01-4 tagged by Stephane Glondu on Thu Nov 17 08:20:44 2011 +0100 - Shortlog Debian release 107.01-5 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOxLXMAAoJEHhT2k1JiBrTcWkQAIsDfmxck9GqlD7ze1FcsI4M vmJ03uuS04Vznkw8yD82KsenfAsTdZ24hHUOhVoSWIz3U3LThFc/YuVU0FOq6AQw zL9fECVpWsL6obcyTs58DhlV4iLy8m+ahoBQrLvqi4difuJUDVrz7pKc+dfT6OCX 855LVgHLA8z1MsgNmKJyF75jjUWS0Nc+BB7Ou3NHu7LGxGjIvZl4lLjJaWRVKccg +sXGFiunC90buUHP8jXXxG+8hZnLI9l+Fcntrk+qxmniNZRWa8mTIdt5xoQbfO3r EaPrg9Iyb/xe4iSR3iSLUpECjy37W28dqqc0iq4rJta1wdOxMlcAJbtKmp9do4eQ 63L3JEzUulzMWmcDO8Rt+FKyCGJVwGnGG3mS61NWwQQeGo191XLP1zNW3CkepNyb goQFlE4+0Yp1GQlLVXRsmoKDNu3ZBxYnFMrZIYM4Dl0Di92/AA6S1b7cxbDJnH7p IZB3ZXeqhdqgy56qdex7bBb5M1FXD8GNDRLp9PwgIVZ8U6gQIYQrjGBkoQaqVJc0 TBNuYxpLb5Rrq7bwkpC4s96vKAbDR5whwG9WxY3RZz9IInHddsWJ7jR1V6EaKXgd 5vJ7hB6cFmCiHP70Xy3y7BC5MMDhmhVuWPuHVcufYyq1soARkj+C8T13sUskE4WL XHPty/WTjazaofjGboQg =B/yd -END PGP SIGNATURE- Stephane Glondu (2): Force linking with -lrt Update changelog and prepare upload to unstable --- -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
