[Pkg-ocaml-maint-commits] [alt-ergo] branch upstream updated (e8667c8 -> 5dc7ee9)
This is an automated email from the git hooks/post-receive script. treinen pushed a change to branch upstream in repository alt-ergo. from e8667c8 Imported Upstream version 0.95.1 adds 5dc7ee9 Imported Upstream version 0.95.2 No new revisions were added by this update. Summary of changes: .depend| 263 CHANGES| 11 + COPYING| 17 +- INSTALL| 35 +- CeCILL-C => LICENSE|0 Makefile.in| 473 --- README | 36 - existantial.mli => README.md | 48 +- arith.ml | 592 - cc.ml | 719 -- cnf.ml | 422 -- common.ml | 257 configure | 82 +- configure.in | 66 +- doc/ergoheader.txt | 16 + {util => doc}/gtk-lang/alt-ergo.lang |0 doc/headache_config.txt| 14 + examples/invalid/arith1.why|5 + examples/invalid/arith2.why|4 + examples/invalid/arrays.why| 12 + examples/invalid/bitv.why |7 + examples/valid/ac_arith.why|3 + examples/valid/arith1.why |9 + examples/valid/arith2.why | 10 + examples/valid/arith3.why |7 + examples/valid/arith4.why |2 + examples/valid/arrays.why | 12 + examples/valid/bitv.why|5 + examples/valid/congruence.why | 10 + examples/valid/enum_arrays.why | 11 + examples/valid/quantifiers.why | 14 + explanation.ml | 155 --- fm.ml | 1011 -- gui_replay.mli |4 - instantiation.ml | 470 --- instantiation.mli | 54 - matching.ml| 341 - options.ml | 150 --- parseoptions.ml| 124 -- preoptions.ml | 116 -- preoptions.mli | 96 -- pretty.ml | 66 - pretty.mli | 25 - print_color.ml | 208 --- print_color.mli| 102 -- revision.sh| 31 - smtlib2_util.ml| 31 - src/Makefile |9 + src/gui/Makefile |9 + gui_replay.ml => src/gui/gui_replay.ml | 22 +- combine.mli => src/gui/gui_replay.mli | 38 +- gui_session.ml => src/gui/gui_session.ml | 33 +- gui_session.mli => src/gui/gui_session.mli | 33 +- why_annoted.ml => src/gui/why_annoted.ml | 896 +++-- why_annoted.mli => src/gui/why_annoted.mli | 45 +- why_connected.ml => src/gui/why_connected.ml | 720 +- why_connected.mli => src/gui/why_connected.mli | 33 +- src/instances/Makefile |9 + src/instances/matching.ml | 381 ++ matching.mli => src/instances/matching.mli | 36 +- src/main/Makefile |9 + frontend.ml => src/main/frontend.ml| 177 ++- frontend.mli => src/main/frontend.mli | 42 +- gui.ml => src/main/main_gui.ml | 939 ++--- combine.mli => src/main/main_gui.mli | 35 +- main.ml => src/main/main_text.ml | 58 +- combine.mli => src/main/main_text.mli | 35 +- src/parsing/Makefile |9 + src/parsing/errors.ml | 137 ++ common.mli => src/parsing/errors.mli | 59 +- smt_lex.mll => src/parsing/smt_lex.mll | 33 +- smt_parser.mly => src/parsing/smt_parser.mly | 33 +- smtlib2_lex.mll => src/parsing/smtlib2_lex.mll | 38 +- smtlib2_parse.mly => src/parsing/smtlib2_parse.mly | 33 +- why_lexer.mll => src/parsing/why_lexer.mll
[Pkg-ocaml-maint-commits] [alt-ergo] 01/01: pristine-tar data for alt-ergo_0.95.2.orig.tar.gz
This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch pristine-tar in repository alt-ergo. commit 16c07c91a64b941f70fb6774f24f5700c55750bb Author: Ralf Treinen Date: Tue Nov 5 14:07:05 2013 +0100 pristine-tar data for alt-ergo_0.95.2.orig.tar.gz --- alt-ergo_0.95.2.orig.tar.gz.delta | Bin 0 -> 5048 bytes alt-ergo_0.95.2.orig.tar.gz.id|1 + 2 files changed, 1 insertion(+) diff --git a/alt-ergo_0.95.2.orig.tar.gz.delta b/alt-ergo_0.95.2.orig.tar.gz.delta new file mode 100644 index 000..a0597e8 Binary files /dev/null and b/alt-ergo_0.95.2.orig.tar.gz.delta differ diff --git a/alt-ergo_0.95.2.orig.tar.gz.id b/alt-ergo_0.95.2.orig.tar.gz.id new file mode 100644 index 000..e41c771 --- /dev/null +++ b/alt-ergo_0.95.2.orig.tar.gz.id @@ -0,0 +1 @@ +de6c0fa4adc5a2e6018e42f670ff418aabe28545 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git ___ 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] [alt-ergo] branch pristine-tar updated (8a57385 -> 16c07c9)
This is an automated email from the git hooks/post-receive script. treinen pushed a change to branch pristine-tar in repository alt-ergo. from 8a57385 pristine-tar data for alt-ergo_0.95.1.orig.tar.gz new 16c07c9 pristine-tar data for alt-ergo_0.95.2.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: alt-ergo_0.95.2.orig.tar.gz.delta | Bin 0 -> 5048 bytes alt-ergo_0.95.2.orig.tar.gz.id|1 + 2 files changed, 1 insertion(+) create mode 100644 alt-ergo_0.95.2.orig.tar.gz.delta create mode 100644 alt-ergo_0.95.2.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git ___ 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] [ocaml] 03/10: New upstream release
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch experimental/master in repository ocaml. commit 358289d860a9bcc1d7631dc995ca0cda5903a144 Author: Stephane Glondu Date: Thu Oct 17 11:40:54 2013 +0200 New upstream release --- debian/changelog |6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9438c4b..495dc61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml (4.01.0-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu Thu, 17 Oct 2013 11:40:49 +0200 + ocaml (4.00.1-2) experimental; urgency=low * debian/patches: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git ___ 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] [ocaml] 07/10: Fix upstream typos and bad wordings
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch experimental/master in repository ocaml. commit 18fbdd2910cc08f2357c941961244303f5b1d8d1 Author: Stephane Glondu Date: Mon Oct 21 16:34:24 2013 +0200 Fix upstream typos and bad wordings --- .../0009-Fix-typos-and-other-wording-issues.patch | 82 debian/patches/series |1 + 2 files changed, 83 insertions(+) diff --git a/debian/patches/0009-Fix-typos-and-other-wording-issues.patch b/debian/patches/0009-Fix-typos-and-other-wording-issues.patch new file mode 100644 index 000..8747f7d --- /dev/null +++ b/debian/patches/0009-Fix-typos-and-other-wording-issues.patch @@ -0,0 +1,82 @@ +From: Stephane Glondu +Date: Mon, 21 Oct 2013 16:34:12 +0200 +Subject: Fix typos and other wording issues + +--- + man/ocaml.m | 2 +- + man/ocamlc.m| 2 +- + man/ocamldoc.m | 2 +- + man/ocamlopt.m | 2 +- + stdlib/printexc.mli | 6 +++--- + 5 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/man/ocaml.m b/man/ocaml.m +index 39baf7b..cd3fb0d 100644 +--- a/man/ocaml.m b/man/ocaml.m +@@ -136,7 +136,7 @@ directories searched for source and compiled files. + .BI \-ppx \ command + After parsing, pipe the abstract syntax tree through the preprocessor + .IR command . +-The format of the input and ouput of the preprocessor ++The format of the input and output of the preprocessor + are not yet documented. + .TP + .B \-principal +diff --git a/man/ocamlc.m b/man/ocamlc.m +index fb3902a..1cdd9bd 100644 +--- a/man/ocamlc.m b/man/ocamlc.m +@@ -478,7 +478,7 @@ implementation (.ml) file. + .BI \-ppx \ command + After parsing, pipe the abstract syntax tree through the preprocessor + .IR command . +-The format of the input and ouput of the preprocessor ++The format of the input and output of the preprocessor + are not yet documented. + .TP + .B \-principal +diff --git a/man/ocamldoc.m b/man/ocamldoc.m +index 73ca3a6..b25833a 100644 +--- a/man/ocamldoc.m b/man/ocamldoc.m +@@ -170,7 +170,7 @@ the comments in implementation files. + Always keep the source code for values, methods and instance variables, when + available. The source code is always kept when a .ml + file is given, but is by default discarded when a .mli +-is given. This option allows to always keep the source code. ++is given. This option allows the source code to be always kept. + .TP + .BI \-load \ file + Load information from +diff --git a/man/ocamlopt.m b/man/ocamlopt.m +index 998651b..dea2249 100644 +--- a/man/ocamlopt.m b/man/ocamlopt.m +@@ -431,7 +431,7 @@ errors, the intermediate file is deleted afterwards. + .BI \-ppx \ command + After parsing, pipe the abstract syntax tree through the preprocessor + .IR command . +-The format of the input and ouput of the preprocessor ++The format of the input and output of the preprocessor + are not yet documented. + .TP + .B \-principal +diff --git a/stdlib/printexc.mli b/stdlib/printexc.mli +index 773fed8..fca086d 100644 +--- a/stdlib/printexc.mli b/stdlib/printexc.mli +@@ -91,9 +91,9 @@ type raw_backtrace + a low-level format, instead of directly exposing them as string as + the [get_backtrace()] function does. + +-This allows to pay the performance overhead of representation +-conversion and formatting only at printing time, which is useful +-if you want to record more backtrace than you actually print. ++This allows delaying the formatting of backtraces to when they are ++actually printed, which might be useful if you record more ++backtraces than you print. + *) + + val get_raw_backtrace: unit -> raw_backtrace +-- diff --git a/debian/patches/series b/debian/patches/series index be80a2c..bfb7eca 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch 0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch 0008-Embed-bytecode-in-C-object-when-using-custom.patch +0009-Fix-typos-and-other-wording-issues.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git ___ 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] [ocaml] branch pristine-tar updated (8d2196e -> e118ebc)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to branch pristine-tar in repository ocaml. from 8d2196e pristine-tar data for ocaml_4.00.1.orig.tar.bz2 new e118ebc pristine-tar data for ocaml_4.01.0.orig.tar.bz2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: ocaml_4.01.0.orig.tar.bz2.delta | Bin 0 -> 76306 bytes ocaml_4.01.0.orig.tar.bz2.id|1 + 2 files changed, 1 insertion(+) create mode 100644 ocaml_4.01.0.orig.tar.bz2.delta create mode 100644 ocaml_4.01.0.orig.tar.bz2.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git ___ 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] [ocaml] 08/10: Remove testsuite special casing for now
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch experimental/master in repository ocaml. commit bff1027f4fc9fcfb5ec52ad2da36f9e4842c62d6 Author: Stephane Glondu Date: Mon Oct 21 16:57:01 2013 +0200 Remove testsuite special casing for now --- debian/rules | 32 +--- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/debian/rules b/debian/rules index 4da6678..3940b25 100755 --- a/debian/rules +++ b/debian/rules @@ -286,37 +286,7 @@ SLOW_ARCHITECTURES := hurd-i386 mips mipsel powerpc sparc armel .PHONY: override_dh_auto_test override_dh_auto_test: ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) -# The test suite needs the just-compiled ocaml to be installed, so we -# rebuild a version with a local prefix and install it to run the -# tests; see: -# http://caml.inria.fr/mantis/view.php?id=5483 ifeq (,$(DEB_TEST_BUILD_PREFIX)) - rm -rf $(TESTDIR) - mkdir $(TESTDIR) - tar -C $(TESTDIR) -xf $(UPSTREAM_TARBALL) - tar -c --files-from=debian/MANIFEST | tar -C $(TESTDIR)/ocaml-* -x - cp -a debian/patches $(TESTDIR)/ocaml-*/debian - cd $(TESTDIR)/ocaml-* \ - && QUILT_PATCHES=debian/patches quilt push -a \ - && $(TESTRULES) build \ - && dh_installdirs \ - && $(TESTRULES) install-stamp \ - && cp -a debian/tmp/* .. -# Broken test (see http://caml.inria.fr/mantis/view.php?id=5648) - rm -f $(TESTDIR)/ocaml-*/testsuite/tests/lib-threads/test4.ml -# Thread tests seem to hang on buildds, but cannot reproduce elsewhere -ifneq (,$(findstring kfreebsd,$(DEB_BUILD_ARCH))) - rm -rf $(TESTDIR)/ocaml-*/testsuite/tests/lib-threads -endif -# Tests that take too much time -ifneq (,$(filter $(DEB_BUILD_ARCH),$(SLOW_ARCHITECTURES))) - for t in \ - misc/nucleic.ml \ - misc-unsafe/almabench.ml \ - misc-unsafe/fft.ml \ - ; do rm -rf $(TESTDIR)/ocaml-*/testsuite/tests/$$t; done -endif - cd $(TESTDIR)/ocaml-*/testsuite \ - && make all + cd testsuite && make all endif endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git ___ 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] [ocaml] 06/10: More tests need upstream behaviour of -custom
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch experimental/master in repository ocaml. commit ed651dd403ce3c68b340cdcfa3e46719712acbff Author: Stephane Glondu Date: Mon Oct 21 15:53:53 2013 +0200 More tests need upstream behaviour of -custom --- ...ed-bytecode-in-C-object-when-using-custom.patch | 66 ++-- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch b/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch index d8366b6..ac8ce15 100644 --- a/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch +++ b/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch @@ -12,10 +12,14 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627761 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678577 Signed-off-by: Stephane Glondu --- - bytecomp/bytelink.ml | 42 - testsuite/tests/embedded/Makefile| 4 - testsuite/tests/lib-marshal/Makefile | 3 +++ - 3 files changed, 45 insertions(+), 4 deletions(-) + bytecomp/bytelink.ml | 42 --- + testsuite/tests/basic-manyargs/Makefile | 3 ++ + testsuite/tests/callback/Makefile | 3 ++ + testsuite/tests/embedded/Makefile | 4 +++ + testsuite/tests/gc-roots/Makefile | 3 ++ + testsuite/tests/lib-dynlink-bytecode/Makefile | 3 ++ + testsuite/tests/lib-marshal/Makefile | 3 ++ + 7 files changed, 57 insertions(+), 4 deletions(-) diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml index 87a58ab..72678fa 100644 @@ -104,6 +108,33 @@ index 87a58ab..72678fa 100644 if not (Filename.check_suffix output_name ".c") then begin temps := c_file :: !temps; if Ccomp.compile_file c_file <> 0 then raise(Error Custom_runtime); +diff --git a/testsuite/tests/basic-manyargs/Makefile b/testsuite/tests/basic-manyargs/Makefile +index 3cf4a15..d1ad48c 100644 +--- a/testsuite/tests/basic-manyargs/Makefile b/testsuite/tests/basic-manyargs/Makefile +@@ -15,5 +15,8 @@ BASEDIR=../.. + MAIN_MODULE=manyargs + C_FILES=manyargsprim + ++# This test relies on the upstream behaviour of -custom ++export OCAML_CUSTOM_EMBED=n ++ + include $(BASEDIR)/makefiles/Makefile.one + include $(BASEDIR)/makefiles/Makefile.common +diff --git a/testsuite/tests/callback/Makefile b/testsuite/tests/callback/Makefile +index 26d02ea..2069815 100644 +--- a/testsuite/tests/callback/Makefile b/testsuite/tests/callback/Makefile +@@ -16,6 +16,9 @@ CC=$(NATIVECC) -I $(CTOPDIR)/byterun + COMPFLAGS=-I $(OTOPDIR)/otherlibs/unix + LD_PATH=$(TOPDIR)/otherlibs/unix + ++# This test relies on the upstream behaviour of -custom ++export OCAML_CUSTOM_EMBED=n ++ + .PHONY: default + default: + @case " $(OTHERLIBRARIES) " in \ diff --git a/testsuite/tests/embedded/Makefile b/testsuite/tests/embedded/Makefile index 2a01c20..dfd999c 100644 --- a/testsuite/tests/embedded/Makefile @@ -119,6 +150,33 @@ index 2a01c20..dfd999c 100644 default: compile run .PHONY: compile +diff --git a/testsuite/tests/gc-roots/Makefile b/testsuite/tests/gc-roots/Makefile +index a108953..9c1ff43 100644 +--- a/testsuite/tests/gc-roots/Makefile b/testsuite/tests/gc-roots/Makefile +@@ -16,5 +16,8 @@ MAIN_MODULE=globroots + C_FILES=globrootsprim + ADD_COMPFLAGS=-w a + ++# This test relies on the upstream behaviour of -custom ++export OCAML_CUSTOM_EMBED=n ++ + include $(BASEDIR)/makefiles/Makefile.one + include $(BASEDIR)/makefiles/Makefile.common +diff --git a/testsuite/tests/lib-dynlink-bytecode/Makefile b/testsuite/tests/lib-dynlink-bytecode/Makefile +index 74f27b9..14cb816 100644 +--- a/testsuite/tests/lib-dynlink-bytecode/Makefile b/testsuite/tests/lib-dynlink-bytecode/Makefile +@@ -15,6 +15,9 @@ BASEDIR=../.. + COMPFLAGS=-I $(OTOPDIR)/otherlibs/dynlink + LD_PATH=.:$(TOPDIR)/otherlibs/dynlink + ++# This test relies on the upstream behaviour of -custom ++export OCAML_CUSTOM_EMBED=n ++ + .PHONY: default + default: + @$(SET_LD_PATH) $(MAKE) compile run diff --git a/testsuite/tests/lib-marshal/Makefile b/testsuite/tests/lib-marshal/Makefile index 34b67dc..e8928e6 100644 --- a/testsuite/tests/lib-marshal/Makefile -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git ___ 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] [ocaml] 05/10: Refresh patches
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch experimental/master in repository ocaml. commit dca89912c6aa6e87dddaa0fcf0e5417b8879fa53 Author: Stephane Glondu Date: Thu Oct 17 11:43:54 2013 +0200 Refresh patches --- .../0001-Pass-no-relax-to-ld-on-alpha.patch|8 ++--- .../patches/0002-Call-ld-with-proper-flags.patch |6 ++-- debian/patches/0003-Don-t-use-rpath.patch |6 ++-- ...4-Put-manpages-in-section-3o-instead-of-3.patch |6 ++-- .../0005-Patch-config.sh-for-installation.patch| 12 ...mlbuild-as-a-link-on-either-.native-or-.b.patch |8 ++--- ...ple-declarations-in-generated-.c-files-in.patch | 22 +++--- ...ed-bytecode-in-C-object-when-using-custom.patch | 32 +++- .../0009-Fix-code-generation-bug-with-mod-1.patch | 25 --- debian/patches/series |1 - 10 files changed, 51 insertions(+), 75 deletions(-) diff --git a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch index f9ef8a2..b8b0e0b 100644 --- a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch +++ b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch @@ -5,14 +5,14 @@ Subject: Pass --no-relax to ld on alpha Pass the --no-relax option to ld to fix a segfault in initialization code (bug#338437) --- - configure |4 +++- + configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure -index e08bbce..c95424e 100755 +index 07b1c35..0b0554f 100755 --- a/configure +++ b/configure -@@ -299,7 +299,8 @@ case "$bytecc,$host" in +@@ -304,7 +304,8 @@ case "$bytecc,$host" in gcc,alpha*-*-linux*) if cc="$bytecc" sh ./hasgot -mieee; then bytecccompopts="-mieee $bytecccompopts"; @@ -22,7 +22,7 @@ index e08bbce..c95424e 100755 cc,mips-*-irix6*) # Add -n32 flag to ensure compatibility with native-code compiler bytecccompopts="-n32" -@@ -734,6 +735,7 @@ case "$arch,$nativecc,$system,$host_type" in +@@ -746,6 +747,7 @@ case "$arch,$nativecc,$system,$host_type" in nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; *,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs" if $arch64; then partialld="ld -r -arch ppc64"; fi;; diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch index 90cae41..903f218 100644 --- a/debian/patches/0002-Call-ld-with-proper-flags.patch +++ b/debian/patches/0002-Call-ld-with-proper-flags.patch @@ -6,14 +6,14 @@ Filter linkflags passed to ld by ocamlopt -pack and -output-obj to remove the "-Wl," parts, which are only used when ocamlopt calls gcc. --- - configure |2 +- + configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure -index c95424e..20f7977 100755 +index 0b0554f..1294fad 100755 --- a/configure +++ b/configure -@@ -1619,7 +1619,7 @@ echo "DEBUGGER=$debugger" >> Makefile +@@ -1655,7 +1655,7 @@ echo "DEBUGGER=$debugger" >> Makefile echo "CC_PROFILE=$cc_profile" >> Makefile echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile echo "PARTIALLD=$partialld" >> Makefile diff --git a/debian/patches/0003-Don-t-use-rpath.patch b/debian/patches/0003-Don-t-use-rpath.patch index 02855e5..0061437 100644 --- a/debian/patches/0003-Don-t-use-rpath.patch +++ b/debian/patches/0003-Don-t-use-rpath.patch @@ -3,14 +3,14 @@ Date: Tue, 19 May 2009 17:24:14 +0200 Subject: Don't use rpath --- - tools/ocamlmklib.mlp |5 + + tools/ocamlmklib.mlp | 5 + 1 file changed, 5 insertions(+) diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp -index b6c236e..b491fdd 100644 +index 9a47d1b..729145f 100644 --- a/tools/ocamlmklib.mlp +++ b/tools/ocamlmklib.mlp -@@ -38,6 +38,11 @@ and output_c = ref "" (* Output name for C part of library *) +@@ -37,6 +37,11 @@ and output_c = ref "" (* Output name for C part of library *) and rpath = ref [] (* rpath options *) and verbose = ref false diff --git a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch index 17ede18..35832b5 100644 --- a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch +++ b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch @@ -3,14 +3,14 @@ Date: Tue, 19 May 2009 17:24:52 +0200 Subject: Put manpages in section 3o instead of 3 --- - ocamldoc/Makefile |2 +- + ocamldoc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile -index 74c82d3..1ef43b3 100644 +index 144b95d..4d4f3f2 100644 --- a/ocamldoc/Makefile +++ b/ocamldoc/Makefile -@@ -344,7 +344,7 @@ test_texi: dummy +@@ -345,7 +345,7 @@ test_texi: dummy stdlib_man/Pervasi
[Pkg-ocaml-maint-commits] [ocaml] 09/10: Add const qualifiers in Tcl/Tk bindings
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch experimental/master in repository ocaml. commit b1ca5e9f0f3f456f0d5826a0792e192c864b9168 Author: Stephane Glondu Date: Thu Nov 7 16:09:23 2013 +0100 Add const qualifiers in Tcl/Tk bindings --- ...0-Add-const-qualifiers-in-Tcl-Tk-bindings.patch | 85 debian/patches/series |1 + 2 files changed, 86 insertions(+) diff --git a/debian/patches/0010-Add-const-qualifiers-in-Tcl-Tk-bindings.patch b/debian/patches/0010-Add-const-qualifiers-in-Tcl-Tk-bindings.patch new file mode 100644 index 000..21dd515 --- /dev/null +++ b/debian/patches/0010-Add-const-qualifiers-in-Tcl-Tk-bindings.patch @@ -0,0 +1,85 @@ +From: Stephane Glondu +Date: Thu, 7 Nov 2013 15:45:50 +0100 +Subject: Add const qualifiers in Tcl/Tk bindings + +--- + otherlibs/labltk/support/camltk.h | 4 ++-- + otherlibs/labltk/support/cltkCaml.c | 2 +- + otherlibs/labltk/support/cltkUtf.c | 8 + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/otherlibs/labltk/support/camltk.h b/otherlibs/labltk/support/camltk.h +index 9efbbea..6ee6558 100644 +--- a/otherlibs/labltk/support/camltk.h b/otherlibs/labltk/support/camltk.h +@@ -40,7 +40,7 @@ + extern char *string_to_c(value s); + + /* cltkUtf.c */ +-extern value tcl_string_to_caml( char * ); ++extern value tcl_string_to_caml( CONST84 char * ); + extern char * caml_string_to_tcl( value ); + + /* cltkEval.c */ +@@ -53,7 +53,7 @@ extern value *tkerror_exn; + extern value *handler_code; + extern int CamlCBCmd(ClientData clientdata, Tcl_Interp *interp, + int argc, CONST84 char *argv[]); +-CAMLTKextern void tk_error(char * errmsg) Noreturn; ++CAMLTKextern void tk_error(CONST84 char * errmsg) Noreturn; + + /* cltkMain.c */ + extern int signal_events; +diff --git a/otherlibs/labltk/support/cltkCaml.c b/otherlibs/labltk/support/cltkCaml.c +index 9a3d38a..5c6aae0 100644 +--- a/otherlibs/labltk/support/cltkCaml.c b/otherlibs/labltk/support/cltkCaml.c +@@ -63,7 +63,7 @@ CAMLprim value camltk_return (value v) + } + + /* Note: raise_with_string WILL copy the error message */ +-CAMLprim void tk_error(char *errmsg) ++CAMLprim void tk_error(CONST84 char *errmsg) + { + raise_with_string(*tkerror_exn, errmsg); + } +diff --git a/otherlibs/labltk/support/cltkUtf.c b/otherlibs/labltk/support/cltkUtf.c +index 61dbfb2..faaf303 100644 +--- a/otherlibs/labltk/support/cltkUtf.c b/otherlibs/labltk/support/cltkUtf.c +@@ -36,7 +36,7 @@ + + #ifdef UTFCONVERSION + +-char *external_to_utf( char *str ){ ++char *external_to_utf( CONST84 char *str ){ + char *res; + Tcl_DString dstr; + int length; +@@ -50,7 +50,7 @@ char *external_to_utf( char *str ){ + return res; + } + +-char *utf_to_external( char *str ){ ++char *utf_to_external( CONST84 char *str ){ + char *res; + Tcl_DString dstr; + int length; +@@ -69,7 +69,7 @@ char *caml_string_to_tcl( value s ) + return external_to_utf( String_val(s) ); + } + +-value tcl_string_to_caml( char *s ) ++value tcl_string_to_caml( CONST84 char *s ) + { + CAMLparam0(); + CAMLlocal1(res); +@@ -84,6 +84,6 @@ value tcl_string_to_caml( char *s ) + #else + + char *caml_string_to_tcl(value s){ return string_to_c(s); } +-value tcl_string_to_caml(char *s){ return copy_string(s); } ++value tcl_string_to_caml(CONST84 char *s){ return copy_string(s); } + + #endif +-- diff --git a/debian/patches/series b/debian/patches/series index bfb7eca..ac2d26f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch 0008-Embed-bytecode-in-C-object-when-using-custom.patch 0009-Fix-typos-and-other-wording-issues.patch +0010-Add-const-qualifiers-in-Tcl-Tk-bindings.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git ___ 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] [ocaml] 04/10: Update ABI
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch experimental/master in repository ocaml. commit f1f6a5b299eaf470425534e7cfbb1daed82b3ed9 Author: Stephane Glondu Date: Thu Oct 17 11:41:29 2013 +0200 Update ABI --- debian/rules |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index d7dffd8..4da6678 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,8 @@ PACKAGE := ocaml ALL_PACKAGES := $(shell dh_listpackages) -OCAMLMAJOR := 4.00 -OCAMLMINOR := 1 +OCAMLMAJOR := 4.01 +OCAMLMINOR := 0 # Build cache (for Debian debugging) BUILDCACHE := $(wildcard ../ocaml.cache) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git ___ 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] [ocaml] 10/10: Enable mkstemp in yacc
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch experimental/master in repository ocaml. commit 4210ec5374cfa49f85e39de705aef4f538003780 Author: Stephane Glondu Date: Thu Nov 7 16:09:38 2013 +0100 Enable mkstemp in yacc --- debian/patches/0011-Enable-mkstemp-in-yacc.patch | 26 ++ debian/patches/series|1 + 2 files changed, 27 insertions(+) diff --git a/debian/patches/0011-Enable-mkstemp-in-yacc.patch b/debian/patches/0011-Enable-mkstemp-in-yacc.patch new file mode 100644 index 000..c2919e7 --- /dev/null +++ b/debian/patches/0011-Enable-mkstemp-in-yacc.patch @@ -0,0 +1,26 @@ +From: Stephane Glondu +Date: Thu, 7 Nov 2013 16:06:57 +0100 +Subject: Enable mkstemp in yacc + +Use the feature test macro found in the mkstemp(3) manpage. +--- + yacc/main.c | 5 + + 1 file changed, 5 insertions(+) + +diff --git a/yacc/main.c b/yacc/main.c +index f6cac60..66b63ec 100644 +--- a/yacc/main.c b/yacc/main.c +@@ -57,6 +57,11 @@ char *verbose_file_name; + #define HAVE_MKSTEMP + #endif + ++#if _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE >= 500 \ ++ || _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED || _POSIX_C_SOURCE >= 200112L ++#define HAVE_MKSTEMP ++#endif ++ + #ifdef HAVE_MKSTEMP + int action_fd = -1, entry_fd = -1, text_fd = -1, union_fd = -1; + #endif +-- diff --git a/debian/patches/series b/debian/patches/series index ac2d26f..a47d64c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ 0008-Embed-bytecode-in-C-object-when-using-custom.patch 0009-Fix-typos-and-other-wording-issues.patch 0010-Add-const-qualifiers-in-Tcl-Tk-bindings.patch +0011-Enable-mkstemp-in-yacc.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git ___ 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] [ocaml] 01/01: pristine-tar data for ocaml_4.01.0.orig.tar.bz2
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch pristine-tar in repository ocaml. commit e118ebcd7c9947479c3ec8cd22ee2f477648d897 Author: Stephane Glondu Date: Thu Oct 17 11:40:06 2013 +0200 pristine-tar data for ocaml_4.01.0.orig.tar.bz2 --- ocaml_4.01.0.orig.tar.bz2.delta | Bin 0 -> 76306 bytes ocaml_4.01.0.orig.tar.bz2.id|1 + 2 files changed, 1 insertion(+) diff --git a/ocaml_4.01.0.orig.tar.bz2.delta b/ocaml_4.01.0.orig.tar.bz2.delta new file mode 100644 index 000..7d6b0d5 Binary files /dev/null and b/ocaml_4.01.0.orig.tar.bz2.delta differ diff --git a/ocaml_4.01.0.orig.tar.bz2.id b/ocaml_4.01.0.orig.tar.bz2.id new file mode 100644 index 000..f4be277 --- /dev/null +++ b/ocaml_4.01.0.orig.tar.bz2.id @@ -0,0 +1 @@ +a05172a71f111228f9d211f25c8023e342317ced -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git ___ 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] [ocaml] annotated tag upstream/4.01.0 created (now 56ad737)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to annotated tag upstream/4.01.0 in repository ocaml. at 56ad737 (tag) tagging df912e4b5d45ea9f8b9b54909bfdfb80fc9a0824 (commit) replaces upstream/4.00.1 tagged by Stephane Glondu on Thu Oct 17 11:40:06 2013 +0200 - Log - Upstream version 4.01.0 Stephane Glondu (1): Imported Upstream version 4.01.0 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git ___ 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] [alt-ergo] 01/02: update debian/copyright
This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository alt-ergo. commit 0413dbdbe0b7b9942856b9ba3987979e36d40c29 Author: Ralf Treinen Date: Thu Nov 7 17:16:57 2013 +0100 update debian/copyright --- debian/changelog | 14 ++ debian/copyright | 18 ++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7146a79..4a8b43c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,11 +13,17 @@ alt-ergo (0.95.2-1) UNRELEASED; urgency=low - 0008-Split-install-pack-into-two-separate-targets-opt-and.patch - 0009-clean-remove-META.patch * Add build-dependency on libzarith-ocaml-dev - * debian/rules: drop backup of .depend which is no longer needed - * debian/rules: drop setting of mandir in configure - * debian/rules: in dh_auto_build target, drop touching of configure + * debian/rules: +- drop backup of .depend which is no longer needed +- drop setting of mandir in configure +- in dh_auto_build target, drop touching of configure + * debian/copyright: +- update Download field to ocamlpro +- Upstream Contact : add alt-ergo-bugs mailing list +- Update copyright holder and year for files * +- Put paragraphs into the right order - -- Ralf Treinen Tue, 05 Nov 2013 16:16:03 +0100 + -- Ralf Treinen Thu, 07 Nov 2013 17:15:55 +0100 alt-ergo (0.95.1-3) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index e517f80..ee9fb55 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,27 +2,21 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: alt-ergo Upstream-Contact: Sylvain Conchon Évelyne Contejean -Source: http://alt-ergo.lri.fr/#download + alt-ergo-b...@lists.ocaml.pro +Source: http://alt-ergo.ocamlpro.com/download.php + +Files: * +Copyright: Copyright (C) 2006-2013 CNRS - INRIA - Universite Paris Sud +License: CeCILL-C Files: configure.in Makefile.in Copyright: © 2001 Jean-Christophe FILLIÂTRE License: LGPL-2 -Files: *.ml *.mll *.mly *.mli -Copyright: © 2006-2011 Sylvain Conchon - © 2006-2011 Evelyne Contejean - © 2006-2011 Francois Bobot - © 2006-2011 Mohamed Iguernelala - © 2006-2011 Stephane Lescuyer - © 2006-2011 Alain Mebsout - © 2006-2011 CNRS-LRI-Universite Paris Sud -License: CeCILL-C - Files: debian/* Copyright: © 2008, Mehdi Dogguy License: GPL-2 - License: CeCILL-C CeCILL-C FREE SOFTWARE LICENSE AGREEMENT . -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git ___ 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] [alt-ergo] branch master updated (b5daf76 -> 5dff4ab)
This is an automated email from the git hooks/post-receive script. treinen pushed a change to branch master in repository alt-ergo. from b5daf76 fix filenamemangle in debian/watch new 0413dbd update debian/copyright new 5dff4ab install examples The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/alt-ergo.examples |1 + debian/changelog | 15 +++ debian/copyright | 18 ++ 3 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 debian/alt-ergo.examples -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git ___ 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] [alt-ergo] 02/02: install examples
This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository alt-ergo. commit 5dff4abb5ae93834d34bb19452c3dc9606c91565 Author: Ralf Treinen Date: Thu Nov 7 17:20:22 2013 +0100 install examples --- debian/alt-ergo.examples |1 + debian/changelog |1 + 2 files changed, 2 insertions(+) diff --git a/debian/alt-ergo.examples b/debian/alt-ergo.examples new file mode 100644 index 000..e39721e --- /dev/null +++ b/debian/alt-ergo.examples @@ -0,0 +1 @@ +examples/* diff --git a/debian/changelog b/debian/changelog index 4a8b43c..25be692 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ alt-ergo (0.95.2-1) UNRELEASED; urgency=low - Upstream Contact : add alt-ergo-bugs mailing list - Update copyright holder and year for files * - Put paragraphs into the right order + * install examples/ into /usr/share/doc/alt-ergo -- Ralf Treinen Thu, 07 Nov 2013 17:15:55 +0100 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git ___ 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] [alt-ergo] branch master updated (5dff4ab -> 8524fde)
This is an automated email from the git hooks/post-receive script. treinen pushed a change to branch master in repository alt-ergo. from 5dff4ab install examples new 8524fde drop overwrite of dh_auto_configure The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog |2 +- debian/rules |6 -- 2 files changed, 1 insertion(+), 7 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git ___ 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] [alt-ergo] 01/01: drop overwrite of dh_auto_configure
This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch master in repository alt-ergo. commit 8524fde1a0489bd11f10df35f137e478fec02551 Author: Ralf Treinen Date: Thu Nov 7 18:33:17 2013 +0100 drop overwrite of dh_auto_configure --- debian/changelog |2 +- debian/rules |6 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25be692..03afab2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,7 @@ alt-ergo (0.95.2-1) UNRELEASED; urgency=low * Add build-dependency on libzarith-ocaml-dev * debian/rules: - drop backup of .depend which is no longer needed -- drop setting of mandir in configure +- drop overwrite for dh_auto_configure - in dh_auto_build target, drop touching of configure * debian/copyright: - update Download field to ocamlpro diff --git a/debian/rules b/debian/rules index f17e9eb..4c34b64 100755 --- a/debian/rules +++ b/debian/rules @@ -5,12 +5,6 @@ include /usr/share/ocaml/ocamlvars.mk -override_dh_auto_configure: - ./configure --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr \ - --libdir=$(OCAML_STDLIB_DIR) - override_dh_auto_build: $(MAKE) all gui -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git ___ 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