[Pkg-ocaml-maint-commits] [ocamlbuild] 01/01: Add an explicit versioned dependency on ocaml-nox
This is an automated email from the git hooks/post-receive script. infinity0 pushed a commit to branch master in repository ocamlbuild. commit 2f9296e29e3fbeee991f1796265a1b9eaa10d942 Author: Ximin LuoDate: Sun Nov 6 21:26:55 2016 +0100 Add an explicit versioned dependency on ocaml-nox --- debian/changelog | 7 +++ debian/control | 6 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 06fa691..9f2467d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ocamlbuild (0.9.3-4) UNRELEASED; urgency=medium + + * Add an explicit versioned dependency on ocaml-nox to work around +bug involving Debian build dependency parsing. + + -- Ximin Luo Sun, 06 Nov 2016 21:26:25 +0100 + ocamlbuild (0.9.3-3) experimental; urgency=medium * Force a rebuild against OCaml 4.03.0 on all architectures. diff --git a/debian/control b/debian/control index d0e589f..f53c478 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,11 @@ Section: ocaml Priority: optional Maintainer: Debian OCaml Maintainers Uploaders: Ximin Luo -Build-Depends: debhelper (>= 9), dh-ocaml, ocaml-best-compilers (>= 4.03.0) +Build-Depends: debhelper (>= 9), dh-ocaml, + ocaml-best-compilers (>= 4.03.0), +# TODO: the below ought not to be necessary; it is needed at the moment to +# work around an apt-cudf bug / ambiguity in Debian build-dep specs. + ocaml-nox (>= 4.03.0) Standards-Version: 3.9.8 Homepage: https://github.com/ocaml/ocamlbuild/ Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocamlbuild.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbuild.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] [ocamlbuild] branch master updated (9aec751 -> 2f9296e)
This is an automated email from the git hooks/post-receive script. infinity0 pushed a change to branch master in repository ocamlbuild. from 9aec751 Release 0.9.3-3 to Debian experimental. new 2f9296e Add an explicit versioned dependency on ocaml-nox 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 | 7 +++ debian/control | 6 +- 2 files changed, 12 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbuild.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/02: Update patches, versions, and changelog
This is an automated email from the git hooks/post-receive script. infinity0 pushed a commit to branch debian/experimental in repository ocaml. commit 69faf34ba60a10cd9d459c9fe2128bf2b84ef995 Author: Ximin LuoDate: Sun Nov 6 19:59:28 2016 +0100 Update patches, versions, and changelog --- debian/changelog| 8 ++-- debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch | 4 ++-- debian/patches/0002-Call-ld-with-proper-flags.patch | 2 +- .../0004-Put-manpages-in-section-3o-instead-of-3.patch | 2 +- ...multiple-declarations-in-generated-.c-files-in.patch | 6 +++--- ...6-Embed-bytecode-in-C-object-when-using-custom.patch | 10 +- ...ive-backtraces-don-t-work-on-powerpc-and-sparc.patch | 2 +- debian/patches/0009-Skip-native-tests.patch | 17 + debian/patches/0010-arm-default-PIC.patch | 4 ++-- debian/rules| 2 +- 10 files changed, 31 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index db2880e..e90f8d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -ocaml (4.03.0-6) UNRELEASED; urgency=medium +ocaml (4.04.0-1) UNRELEASED; urgency=medium + [ Mehdi Dogguy ] * Use secure and canonical URIs for Vcs-* fields - -- Mehdi Dogguy Sun, 06 Nov 2016 11:01:52 +0100 + [ Ximin Luo ] + * New upstream release. + + -- Ximin Luo Sun, 06 Nov 2016 19:58:56 +0100 ocaml (4.03.0-5) experimental; urgency=medium 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 eca7bc2..63c6de4 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 @@ -10,7 +10,7 @@ code (bug#338437) --- a/configure +++ b/configure -@@ -374,7 +374,8 @@ +@@ -401,7 +401,8 @@ *gcc*,alpha*-*-linux*) if cc="$bytecc" sh ./hasgot -mieee; then bytecccompopts="-mieee $bytecccompopts"; @@ -20,7 +20,7 @@ code (bug#338437) *,mips-*-irix6*) # Turn off warning "unused library" bytecclinkopts="-n32 -Wl,-woff,84";; -@@ -893,6 +894,7 @@ +@@ -922,6 +923,7 @@ case "$arch,$nativecc,$system,$model" in *,*,nextstep,*) nativecclinkopts="-posix";; *,*,rhapsody,*) 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 3871b93..b965f8a 100644 --- a/debian/patches/0002-Call-ld-with-proper-flags.patch +++ b/debian/patches/0002-Call-ld-with-proper-flags.patch @@ -11,7 +11,7 @@ gcc. --- a/configure +++ b/configure -@@ -1782,7 +1782,7 @@ +@@ -1946,7 +1946,7 @@ echo "CC_PROFILE=$cc_profile" >> Makefile echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile echo "PARTIALLD=$partialld" >> Makefile 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 bdb2ae0..7cfffa6 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 @@ -8,7 +8,7 @@ Subject: Put manpages in section 3o instead of 3 --- a/ocamldoc/Makefile +++ b/ocamldoc/Makefile -@@ -328,7 +328,7 @@ +@@ -320,7 +320,7 @@ stdlib_man/Pervasives.3o: $(STDLIB_MLIS) $(MKDIR) stdlib_man $(OCAMLDOC_RUN) -man -d stdlib_man $(INCLUDES) \ diff --git a/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch b/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch index 511ddb7..537bb50 100644 --- a/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch +++ b/debian/patches/0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch @@ -20,7 +20,7 @@ Signed-off-by: Stephane Glondu --- a/bytecomp/bytelink.ml +++ b/bytecomp/bytelink.ml -@@ -440,6 +440,20 @@ +@@ -449,6 +449,20 @@ remove_file outfile; raise x @@ -41,7 +41,7 @@ Signed-off-by: Stephane Glondu (* Output a bytecode executable as a C file *) let link_bytecode_as_c ppf tolink outfile = -@@ -482,7 +496,7 @@ +@@ -491,7 +505,7 @@ (Marshal.to_string sections []); output_string outchan "\n};\n\n"; (* The table of primitives *) @@ -50,7 +50,7 @@ Signed-off-by: Stephane Glondu (* The entry point *) output_string outchan "\ \nvoid caml_startup(char ** argv)\ -@@ -563,7 +577,7 @@ +@@ -580,7 +594,7 @@ #else\n\ typedef long value;\n\ #endif\n"; diff --git a/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch b/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch index b1f5983..d29ef9a 100644 ---
[Pkg-ocaml-maint-commits] [ocaml] 02/02: Update install files with new libraries
This is an automated email from the git hooks/post-receive script. infinity0 pushed a commit to branch debian/experimental in repository ocaml. commit e5606fc84a89a28c9aa6d91174a05a89b95523e2 Author: Ximin LuoDate: Sun Nov 6 21:16:09 2016 +0100 Update install files with new libraries --- debian/ocaml-base-nox.install.in | 3 +++ debian/ocaml-compiler-libs.install.in | 4 +++- debian/ocaml-native-compilers.install | 6 ++ debian/ocaml-nox.install.in | 10 ++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/debian/ocaml-base-nox.install.in b/debian/ocaml-base-nox.install.in index 07ed3ff..2f5f531 100644 --- a/debian/ocaml-base-nox.install.in +++ b/debian/ocaml-base-nox.install.in @@ -50,6 +50,9 @@ DYN: @OCamlStdlibDir@/nums.cmxs @OCamlStdlibDir@/printf.cmi @OCamlStdlibDir@/queue.cmi @OCamlStdlibDir@/random.cmi + @OCamlStdlibDir@/raw_spacetime_lib.cmi + @OCamlStdlibDir@/raw_spacetime_lib.cma +DYN: @OCamlStdlibDir@/raw_spacetime_lib.cmxs @OCamlStdlibDir@/scanf.cmi @OCamlStdlibDir@/set.cmi @OCamlStdlibDir@/sort.cmi diff --git a/debian/ocaml-compiler-libs.install.in b/debian/ocaml-compiler-libs.install.in index 9682e90..591bc05 100644 --- a/debian/ocaml-compiler-libs.install.in +++ b/debian/ocaml-compiler-libs.install.in @@ -31,6 +31,9 @@ usr/share/man/man3/Ast_mapper.3o usr/share/man/man3/Asttypes.3o usr/share/man/man3/Attr_helper.3o usr/share/man/man3/Builtin_attributes.3o +usr/share/man/man3/Depend.3o +usr/share/man/man3/Depend.StringMap.3o +usr/share/man/man3/Depend.StringSet.3o usr/share/man/man3/Lexer.3o usr/share/man/man3/Location.3o usr/share/man/man3/Longident.3o @@ -38,6 +41,5 @@ usr/share/man/man3/Parse.3o usr/share/man/man3/Parser.3o usr/share/man/man3/Parsetree.3o usr/share/man/man3/Pprintast.3o -usr/share/man/man3/Pprintast.printer.3o usr/share/man/man3/Printast.3o usr/share/man/man3/Syntaxerr.3o diff --git a/debian/ocaml-native-compilers.install b/debian/ocaml-native-compilers.install index 1efe9bf..438b2f4 100644 --- a/debian/ocaml-native-compilers.install +++ b/debian/ocaml-native-compilers.install @@ -1,6 +1,12 @@ usr/bin/ocamlc.opt +usr/bin/ocamlcp.opt usr/bin/ocamldep.opt usr/bin/ocamldoc.opt usr/bin/ocamllex.opt usr/bin/ocamlopt.opt +usr/bin/ocamloptp.opt +usr/bin/ocamlmklib.opt +usr/bin/ocamlmktop.opt +usr/bin/ocamlprof.opt +usr/bin/ocamlobjinfo.opt debian/ocamlfind/ocaml-native-compilers.conf usr/share/ocaml-findlib/ diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in index 3f0bb22..46b820d 100644 --- a/debian/ocaml-nox.install.in +++ b/debian/ocaml-nox.install.in @@ -134,6 +134,9 @@ OPT: @OCamlStdlibDir@/libthreadsnat.a usr/share/man/man3/Set.OrderedType.3o usr/share/man/man3/Set.S.3o usr/share/man/man3/Sort.3o + usr/share/man/man3/Spacetime.3o + usr/share/man/man3/Spacetime.Series.3o + usr/share/man/man3/Spacetime.Snapshot.3o usr/share/man/man3/Stack.3o usr/share/man/man3/StdLabels.3o usr/share/man/man3/StdLabels.Array.3o @@ -309,6 +312,9 @@ STD: random.mli STD: random.cmx STD: ratio.cmx STD: ratio.mli +STD: raw_spacetime_lib.cmx +STD: raw_spacetime_lib.cmxa +STD: raw_spacetime_lib.mli STD: scanf.ml STD: scanf.mli STD: scanf.cmx @@ -318,6 +324,10 @@ STD: set.cmx STD: sort.ml STD: sort.mli STD: sort.cmx +STD: spacetime.ml +STD: spacetime.mli +STD: spacetime.cmi +STD: spacetime.cmx STD: stack.ml STD: stack.mli STD: stack.cmx -- 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.04.0 created (now de3f340)
This is an automated email from the git hooks/post-receive script. infinity0 pushed a change to annotated tag upstream/4.04.0 in repository ocaml. at de3f340 (tag) tagging 648a1457a7d1d9989f3df5e52902ee4e02f3052c (commit) replaces upstream/4.03.0 tagged by Ximin Luo on Sun Nov 6 19:47:59 2016 +0100 - Log - Upstream version 4.04.0 -BEGIN PGP SIGNATURE- iQIcBAABCgAGBQJYH3rfAAoJEIYN7zuPZQt5dEwQAIbI2U8wFm6T3y5NtPHJqif2 Y5XFZFzbHRoSFkBMMd+/bcf450P1HWzpXdAUlbiTSM/QVSKOuxGC+i7+aBrFN1Da kWDjIDaWToZcISc+iwVorlx8gqQv9sWwDOReeRjJZDldAXipgO/Hm2qXbV/XHo6D JkXSgcSs1dbswTnlXVpVqanV7zD8EuuIL6gWeazFNIum58Rgk75YVDfRDB4HCcFW +9Ekk4d7axhtnJeuIWBIjuxRb4O0uw+zy+zap7SaQfsMRL9tVDgcoCTZtguw5Vdj wUz+7ekSzw+2Ewce0Q5gGyD3b38wePctCKdNtQrjVOnng9G0+ySt5N1EqqXIix4u qTkm+zfFWqrnsqIp5Bx7MF+t1r7rR40vjkgSxCfpVzr2YS0LU+ZGinoskpGwVaNr XyKOpnCEBBgZPfRHGYU+OGAIj1BTqOk/H3MNBOuouiIEi4PSehO2vHCl+/hgtMDH 51vb0emXyd89+yuSKX9i5/ykq5dROxDywoGVtCG+wDEF/91CWrLb4orQ2fjqdnkz zzU+wI1r5WERw8851z76wPXhj822TOUpSEKek+bAsqExAkUuO8GK/ahvQygKpZsu 1FW17UaPg3w4wXPZ4fdNeBSSxlhLPqACEpUJCUJFEaltzxqp+kf+fi3U2d1+llmu rzYveM1KfF/1XMaR4NtO =B11U -END PGP SIGNATURE- Ximin Luo (1): New upstream version 4.04.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] [ocaml] branch debian/sid updated (c175386 -> 67d84b5)
This is an automated email from the git hooks/post-receive script. infinity0 pushed a change to branch debian/sid in repository ocaml. from c175386 Release to unstable new 67d84b5 Add correct branch to gbp.conf 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/gbp.conf | 2 ++ 1 file changed, 2 insertions(+) -- 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: Add correct branch to gbp.conf
This is an automated email from the git hooks/post-receive script. infinity0 pushed a commit to branch debian/sid in repository ocaml. commit 67d84b516cd63528abaa0f0fd418973b99f742d1 Author: Ximin LuoDate: Sun Nov 6 19:53:52 2016 +0100 Add correct branch to gbp.conf --- debian/gbp.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/gbp.conf b/debian/gbp.conf index cec628c..0626b57 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,4 @@ [DEFAULT] +debian-branch = debian/sid +upstream-branch = upstream/sid pristine-tar = True -- 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.04.0.orig.tar.xz
This is an automated email from the git hooks/post-receive script. infinity0 pushed a commit to branch pristine-tar in repository ocaml. commit 64c467dcfc0028ad09b6439a2be17495a1aaa10e Author: Ximin LuoDate: Sun Nov 6 19:47:59 2016 +0100 pristine-tar data for ocaml_4.04.0.orig.tar.xz --- ocaml_4.04.0.orig.tar.xz.delta | Bin 0 -> 71011 bytes ocaml_4.04.0.orig.tar.xz.id| 1 + 2 files changed, 1 insertion(+) diff --git a/ocaml_4.04.0.orig.tar.xz.delta b/ocaml_4.04.0.orig.tar.xz.delta new file mode 100644 index 000..e2bd748 Binary files /dev/null and b/ocaml_4.04.0.orig.tar.xz.delta differ diff --git a/ocaml_4.04.0.orig.tar.xz.id b/ocaml_4.04.0.orig.tar.xz.id new file mode 100644 index 000..3b8342a --- /dev/null +++ b/ocaml_4.04.0.orig.tar.xz.id @@ -0,0 +1 @@ +e4573a78e62ecdeeddb384a4cb5ed9e196bf1ffc -- 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 upstream/experimental created (now 648a145)
This is an automated email from the git hooks/post-receive script. infinity0 pushed a change to branch upstream/experimental in repository ocaml. at 648a145 New upstream version 4.04.0 This branch includes the following new commits: new 648a145 New upstream version 4.04.0 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. -- 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/03: Add correct branch to gbp.conf
This is an automated email from the git hooks/post-receive script. infinity0 pushed a commit to branch debian/experimental in repository ocaml. commit b439ff607d3192debcbab4e4de2cfca633cbf518 Author: Ximin LuoDate: Sun Nov 6 19:47:31 2016 +0100 Add correct branch to gbp.conf --- debian/gbp.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/gbp.conf b/debian/gbp.conf index cec628c..2cfcbbe 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,4 @@ [DEFAULT] +debian-branch = debian/experimental +upstream-branch = upstream/experimental pristine-tar = True -- 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 debian/sid created (now c175386)
This is an automated email from the git hooks/post-receive script. infinity0 pushed a change to branch debian/sid in repository ocaml. at c175386 Release to unstable 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] [ocaml] branch experimental/master deleted (was e0fe826)
This is an automated email from the git hooks/post-receive script. infinity0 pushed a change to branch experimental/master in repository ocaml. was e0fe826 Prepare upload to experimental The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- 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 debian/experimental created (now 091e8b9)
This is an automated email from the git hooks/post-receive script. infinity0 pushed a change to branch debian/experimental in repository ocaml. at 091e8b9 Merge tag 'upstream/4.04.0' into debian/experimental This branch includes the following new commits: new b439ff6 Add correct branch to gbp.conf new 648a145 New upstream version 4.04.0 new 091e8b9 Merge tag 'upstream/4.04.0' into debian/experimental The 3 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. -- 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 upstream deleted (was fd46c0a)
This is an automated email from the git hooks/post-receive script. infinity0 pushed a change to branch upstream in repository ocaml. was fd46c0a New upstream version 4.03.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- 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 debian/stretch updated (c175386 -> 393e477)
This is an automated email from the git hooks/post-receive script. mehdi pushed a change to branch debian/stretch in repository ocaml. from c175386 Release to unstable new 393e477 CVE-2015-8869 (Closes: #824139) 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 | 6 +++ debian/patches/0012-arm-default-PIC.patch | 9 ++-- debian/patches/0013-CVE-2015-8869.patch | 71 +++ debian/patches/series | 1 + 4 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 debian/patches/0013-CVE-2015-8869.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: CVE-2015-8869 (Closes: #824139)
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch debian/stretch in repository ocaml. commit 393e47728f6bb849b1395c20f4d482ec1f6fef52 Author: Mehdi DogguyDate: Sun Nov 6 14:02:15 2016 +0100 CVE-2015-8869 (Closes: #824139) --- debian/changelog | 6 +++ debian/patches/0012-arm-default-PIC.patch | 9 ++-- debian/patches/0013-CVE-2015-8869.patch | 71 +++ debian/patches/series | 1 + 4 files changed, 82 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index c336057..5775070 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml (4.02.3-9) UNRELEASED; urgency=medium + + * CVE-2015-8869 (Closes: #824139) + + -- Mehdi Dogguy Sun, 06 Nov 2016 14:01:46 +0100 + ocaml (4.02.3-8) unstable; urgency=medium * Default to PIC on arm, to fix failing armhf tests (Closes: #837359). diff --git a/debian/patches/0012-arm-default-PIC.patch b/debian/patches/0012-arm-default-PIC.patch index 23277cf..020e41d 100644 --- a/debian/patches/0012-arm-default-PIC.patch +++ b/debian/patches/0012-arm-default-PIC.patch @@ -1,9 +1,8 @@ -Description: Default to PIC on arm - Otherwise the armhf build fails now that PIE is enabled by default. -Author: Mehdi Dogguy -Date: Sun, 6 Nov 2016 10:36:00 +0100 +From: Mehdi Dogguy +Date: Sun, 6 Nov 2016 13:52:58 +0100 +Subject: arm-default-PIC + Bug-Debian: https://bugs.debian.org/837359 -Forwarded: TODO --- asmcomp/arm/arch.ml | 2 +- diff --git a/debian/patches/0013-CVE-2015-8869.patch b/debian/patches/0013-CVE-2015-8869.patch new file mode 100644 index 000..4604209 --- /dev/null +++ b/debian/patches/0013-CVE-2015-8869.patch @@ -0,0 +1,71 @@ +From: Mehdi Dogguy +Date: Sun, 6 Nov 2016 13:56:22 +0100 +Subject: CVE-2015-8869 + +Forwarded: not-needed +Bug-Upstream: http://caml.inria.fr/mantis/view.php?id=7003 +Bug-Debian: http://bugs.debian.org/824139 +Applied-Upstream: 4.03.0, https://github.com/ocaml/ocaml/commit/659615c7b100a89eafe6253e7a5b9d84d0e8df74#diff-a97df53e3ebc59bb457191b496c90762 +--- + byterun/alloc.c | 4 ++-- + byterun/intern.c | 2 +- + byterun/str.c| 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/byterun/alloc.c b/byterun/alloc.c +index b421cac..3d7dfc4 100644 +--- a/byterun/alloc.c b/byterun/alloc.c +@@ -147,7 +147,7 @@ CAMLexport int caml_convert_flag_list(value list, int *flags) + + CAMLprim value caml_alloc_dummy(value size) + { +- mlsize_t wosize = Int_val(size); ++ mlsize_t wosize = Long_val(size); + + if (wosize == 0) return Atom(0); + return caml_alloc (wosize, 0); +@@ -161,7 +161,7 @@ CAMLprim value caml_alloc_dummy_function(value size,value arity) + + CAMLprim value caml_alloc_dummy_float (value size) + { +- mlsize_t wosize = Int_val(size) * Double_wosize; ++ mlsize_t wosize = Long_val(size) * Double_wosize; + + if (wosize == 0) return Atom(0); + return caml_alloc (wosize, 0); +diff --git a/byterun/intern.c b/byterun/intern.c +index d2943af..e5cdeb4 100644 +--- a/byterun/intern.c b/byterun/intern.c +@@ -287,7 +287,7 @@ static void intern_rec(value *dest) + case OFreshOID: + /* Refresh the object ID */ + /* but do not do it for predefined exception slots */ +-if (Int_val(Field((value)dest, 1)) >= 0) ++if (Long_val(Field((value)dest, 1)) >= 0) + caml_set_oo_id((value)dest); + /* Pop item and iterate */ + sp--; +diff --git a/byterun/str.c b/byterun/str.c +index a72b34c..dc69624 100644 +--- a/byterun/str.c b/byterun/str.c +@@ -266,7 +266,7 @@ CAMLprim value caml_string_greaterequal(value s1, value s2) + CAMLprim value caml_blit_string(value s1, value ofs1, value s2, value ofs2, + value n) + { +- memmove((s2, Long_val(ofs2)), (s1, Long_val(ofs1)), Int_val(n)); ++ memmove((s2, Long_val(ofs2)), (s1, Long_val(ofs1)), Long_val(n)); + return Val_unit; + } + +@@ -293,7 +293,7 @@ CAMLprim value caml_is_printable(value chr) + + CAMLprim value caml_bitvect_test(value bv, value n) + { +- int pos = Int_val(n); ++ intnat pos = Long_val(n); + return Val_int(Byte_u(bv, pos >> 3) & (1 << (pos & 7))); + } + diff --git a/debian/patches/series b/debian/patches/series index 552c4d7..2f75dd0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ 0010-Add-a-.file-directive-to-generated-.s-files.patch 0011-Compatibility-with-x32-architecture.patch 0012-arm-default-PIC.patch +0013-CVE-2015-8869.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/04: Default to PIC on arm, to fix failing armhf tests (Closes: #837359).
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch debian/stretch in repository ocaml. commit cce1a5478ce79c3275329a7f8e15c8a4dd256f20 Author: Mehdi DogguyDate: Sun Nov 6 10:40:06 2016 +0100 Default to PIC on arm, to fix failing armhf tests (Closes: #837359). --- debian/changelog | 6 ++ debian/patches/0012-arm-default-PIC.patch | 24 debian/patches/series | 1 + 3 files changed, 31 insertions(+) diff --git a/debian/changelog b/debian/changelog index cb36a3e..a6a3660 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml (4.02.3-8) UNRELEASED; urgency=medium + + * Default to PIC on arm, to fix failing armhf tests (Closes: #837359). + + -- Mehdi Dogguy Sun, 06 Nov 2016 10:36:15 +0100 + ocaml (4.02.3-7) unstable; urgency=medium * d/rules: split install-stamp target into -arch and -indep, to allow diff --git a/debian/patches/0012-arm-default-PIC.patch b/debian/patches/0012-arm-default-PIC.patch new file mode 100644 index 000..23277cf --- /dev/null +++ b/debian/patches/0012-arm-default-PIC.patch @@ -0,0 +1,24 @@ +Description: Default to PIC on arm + Otherwise the armhf build fails now that PIE is enabled by default. +Author: Mehdi Dogguy +Date: Sun, 6 Nov 2016 10:36:00 +0100 +Bug-Debian: https://bugs.debian.org/837359 +Forwarded: TODO + +--- + asmcomp/arm/arch.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/asmcomp/arm/arch.ml b/asmcomp/arm/arch.ml +index d93c1e0..3541106 100644 +--- a/asmcomp/arm/arch.ml b/asmcomp/arm/arch.ml +@@ -56,7 +56,7 @@ let (arch, fpu, thumb) = + end in + (ref def_arch, ref def_fpu, ref def_thumb) + +-let pic_code = ref false ++let pic_code = ref true + + let farch spec = + arch := (match spec with diff --git a/debian/patches/series b/debian/patches/series index e375d30..552c4d7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ 0010-Enable-ocamldoc-to-build-reproducible-manpages.patch 0010-Add-a-.file-directive-to-generated-.s-files.patch 0011-Compatibility-with-x32-architecture.patch +0012-arm-default-PIC.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] 02/04: Use secure and canonical URIs for Vcs-* fields
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch debian/stretch in repository ocaml. commit 8142405ac1b408f3544a34d5b5240dedc50062a5 Author: Mehdi DogguyDate: Sun Nov 6 10:44:46 2016 +0100 Use secure and canonical URIs for Vcs-* fields --- debian/changelog | 1 + debian/control| 4 ++-- debian/control.in | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a6a3660..bf76351 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ocaml (4.02.3-8) UNRELEASED; urgency=medium * Default to PIC on arm, to fix failing armhf tests (Closes: #837359). + * Use secure and canonical URIs for Vcs-* fields -- Mehdi Dogguy Sun, 06 Nov 2016 10:36:15 +0100 diff --git a/debian/control b/debian/control index 89de269..ffc0346 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,8 @@ Build-Depends: zlib1g-dev, dh-ocaml (>= 1.0.0~) Standards-Version: 3.9.8 -Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocaml.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/ocaml.git +Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/ +Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/ Homepage: http://caml.inria.fr/ Package: ocaml-nox diff --git a/debian/control.in b/debian/control.in index 8185df7..1711add 100644 --- a/debian/control.in +++ b/debian/control.in @@ -19,8 +19,8 @@ Build-Depends: zlib1g-dev, dh-ocaml (>= 1.0.0~) Standards-Version: 3.9.4 -Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocaml.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/ocaml.git +Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/ +Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/ Homepage: http://caml.inria.fr/ Package: ocaml-nox -- 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 debian/4.02.3-8 updated (cf04431 -> 543c582)
This is an automated email from the git hooks/post-receive script. mehdi pushed a change to annotated tag debian/4.02.3-8 in repository ocaml. *** WARNING: tag debian/4.02.3-8 was modified! *** from cf04431 (tag) to 543c582 (tag) tagging c175386f0ddd7af95e5c09a3642713c6f616ddb1 (commit) replaces debian/4.02.3-7 tagged by Mehdi Dogguy on Sun Nov 6 11:29:46 2016 +0100 - Log - ocaml Debian release 4.02.3-8 -BEGIN PGP SIGNATURE- iQIcBAABCAAGBQJYHwYaAAoJEDO+GgqMLtj/ei8P/iR+7trYorU5QVuuoa1lWlRW GrqbYnwpbeAQDi8HUsMtuQS3zC5z4NVmIsTXVfVGTzjgXIh67zZn1enOz30keVFc UzhsOqbTM83INHdrMaD1qLo7VO0Q1sTsDUP4CL427EfUuYCgTPFXGuxJ+R+CpA5V NWYdWFZ+7NGmFM8Qm8+wYzGgdjef5ql1wdkHPlG03dS4uMB42ai2A6h1gjbPz9S4 XzaPEy2F7rHztcN+GQ8ram0C/Ql8BLFCvGRExbIOSKjvhrJW9o5FP+t4WFULeANP l3hL/VeyFF+E+8w7BOapadG3ih1KB89m0ldAOZdL2EYR/LOmMAUXVLbK16J2mTL3 oX0+PearxoZcCJ2TZeHz2hDibJlgH8jxs9b5fthJArIFkhQ05yRr/A3r6z6wetyJ ixQMu1P1N138fHii8dZNNzQXz5Jr+KN+YKRZeq3cX9w/iiXgzh7eRaRy384WEELV nCxSQQUWrP6zJN9U7y3o2pb3mkD++oCnZr8oq8Vy/+qSaGZwchIdVK9rLumKU4E/ ovzL4FPhMKf+XJ5H+DE1cpIJPPxcZSU/FRR0xyuRSu1JeBMfabQplkCXssCz8gyw PxC0i88xs+9gUg+o4ieryRav/doZkadnP+ZsaSnnYFMI3QRnty7hoU8yYFae5in1 erLl1BblpmF1JEEwzTwy =jNGu -END PGP SIGNATURE- Mehdi Dogguy (4): Default to PIC on arm, to fix failing armhf tests (Closes: #837359). Use secure and canonical URIs for Vcs-* fields Sync Standards-Version's value in debian/control.in Release to unstable --- discards a6fbc36 Release to unstable discards f374a53 Sync Standards-Version's value in debian/control.in discards a2bb9f8 Use secure and canonical URIs for Vcs-* fields discards 9f8cdd6 Set pic_code to true on ARM architectures (Closes: #837359). adds cce1a54 Default to PIC on arm, to fix failing armhf tests (Closes: #837359). adds 8142405 Use secure and canonical URIs for Vcs-* fields adds 00967ab Sync Standards-Version's value in debian/control.in adds c175386 Release to unstable This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the annotated tag are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cf04431) \ N -- N -- N refs/tags/debian/4.02.3-8 (543c582) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: debian/changelog | 4 ++-- ...2-Set-pic_code-true-on-Arm.patch => 0012-arm-default-PIC.patch} | 7 +-- debian/patches/series | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) rename debian/patches/{0012-Set-pic_code-true-on-Arm.patch => 0012-arm-default-PIC.patch} (69%) -- 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/04: Release to unstable
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch debian/stretch in repository ocaml. commit c175386f0ddd7af95e5c09a3642713c6f616ddb1 Author: Mehdi DogguyDate: Sun Nov 6 11:29:41 2016 +0100 Release to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d95810c..c336057 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -ocaml (4.02.3-8) UNRELEASED; urgency=medium +ocaml (4.02.3-8) unstable; urgency=medium * Default to PIC on arm, to fix failing armhf tests (Closes: #837359). * Use secure and canonical URIs for Vcs-* fields * Sync Standards-Version's value in debian/control.in - -- Mehdi Dogguy Sun, 06 Nov 2016 10:36:15 +0100 + -- Mehdi Dogguy Sun, 06 Nov 2016 11:29:41 +0100 ocaml (4.02.3-7) unstable; urgency=medium -- 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] 03/04: Sync Standards-Version's value in debian/control.in
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch debian/stretch in repository ocaml. commit 00967ab30f387a670cb32b7e2a02d6f9645f1549 Author: Mehdi DogguyDate: Sun Nov 6 10:47:13 2016 +0100 Sync Standards-Version's value in debian/control.in --- debian/changelog | 1 + debian/control.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bf76351..d95810c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ocaml (4.02.3-8) UNRELEASED; urgency=medium * Default to PIC on arm, to fix failing armhf tests (Closes: #837359). * Use secure and canonical URIs for Vcs-* fields + * Sync Standards-Version's value in debian/control.in -- Mehdi Dogguy Sun, 06 Nov 2016 10:36:15 +0100 diff --git a/debian/control.in b/debian/control.in index 1711add..5afa3f6 100644 --- a/debian/control.in +++ b/debian/control.in @@ -18,7 +18,7 @@ Build-Depends: libx11-dev, zlib1g-dev, dh-ocaml (>= 1.0.0~) -Standards-Version: 3.9.4 +Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/ Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/ Homepage: http://caml.inria.fr/ -- 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 debian/stretch deleted (was a6fbc36)
This is an automated email from the git hooks/post-receive script. mehdi pushed a change to branch debian/stretch in repository ocaml. was a6fbc36 Release to unstable The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- 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 debian/stretch created (now c175386)
This is an automated email from the git hooks/post-receive script. mehdi pushed a change to branch debian/stretch in repository ocaml. at c175386 Release to unstable This branch includes the following new commits: new cce1a54 Default to PIC on arm, to fix failing armhf tests (Closes: #837359). new 8142405 Use secure and canonical URIs for Vcs-* fields new 00967ab Sync Standards-Version's value in debian/control.in new c175386 Release to unstable The 4 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. -- 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/02: Use secure and canonical URIs for Vcs-* fields
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository ocaml. commit aadc4196708ffd3c8dd4b72067fae23a3541710e Author: Mehdi DogguyDate: Sun Nov 6 11:01:41 2016 +0100 Use secure and canonical URIs for Vcs-* fields --- debian/control| 4 ++-- debian/control.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index bf7f537..64902a0 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,8 @@ Build-Depends: zlib1g-dev, dh-ocaml (>= 1.0.0~) Standards-Version: 3.9.8 -Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocaml.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/ocaml.git +Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/ +Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/ Homepage: http://caml.inria.fr/ Package: ocaml-nox diff --git a/debian/control.in b/debian/control.in index 4a5b539..91de587 100644 --- a/debian/control.in +++ b/debian/control.in @@ -20,8 +20,8 @@ Build-Depends: zlib1g-dev, dh-ocaml (>= 1.0.0~) Standards-Version: 3.9.8 -Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocaml.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/ocaml.git +Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/ +Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/ Homepage: http://caml.inria.fr/ Package: ocaml-nox -- 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] 02/02: Use secure and canonical URIs for Vcs-* fields
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository ocaml. commit f4f3a93ccd18199c156fb6437e6bc443e87e9441 Author: Mehdi DogguyDate: Sun Nov 6 11:02:10 2016 +0100 Use secure and canonical URIs for Vcs-* fields --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 05d8388..db2880e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml (4.03.0-6) UNRELEASED; urgency=medium + + * Use secure and canonical URIs for Vcs-* fields + + -- Mehdi Dogguy Sun, 06 Nov 2016 11:01:52 +0100 + ocaml (4.03.0-5) experimental; urgency=medium * Fix variable substitution in Makefile syntax. -- 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 master updated (0194ebf -> f4f3a93)
This is an automated email from the git hooks/post-receive script. mehdi pushed a change to branch master in repository ocaml. from 0194ebf Release 4.03.0-5 to Debian experimental. new aadc419 Use secure and canonical URIs for Vcs-* fields new f4f3a93 Use secure and canonical URIs for Vcs-* fields 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/changelog | 6 ++ debian/control| 4 ++-- debian/control.in | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) -- 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/04: Set pic_code to true on ARM architectures (Closes: #837359).
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch debian/stretch in repository ocaml. commit 9f8cdd614033c7d05dababd4e7a403899a4e8652 Author: Mehdi DogguyDate: Sun Nov 6 10:40:06 2016 +0100 Set pic_code to true on ARM architectures (Closes: #837359). --- debian/changelog | 6 ++ debian/patches/0012-Set-pic_code-true-on-Arm.patch | 21 + debian/patches/series | 1 + 3 files changed, 28 insertions(+) diff --git a/debian/changelog b/debian/changelog index cb36a3e..e6ae7c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml (4.02.3-8) UNRELEASED; urgency=medium + + * Set pic_code to true on ARM architectures (Closes: #837359). + + -- Mehdi Dogguy Sun, 06 Nov 2016 10:36:15 +0100 + ocaml (4.02.3-7) unstable; urgency=medium * d/rules: split install-stamp target into -arch and -indep, to allow diff --git a/debian/patches/0012-Set-pic_code-true-on-Arm.patch b/debian/patches/0012-Set-pic_code-true-on-Arm.patch new file mode 100644 index 000..785f905 --- /dev/null +++ b/debian/patches/0012-Set-pic_code-true-on-Arm.patch @@ -0,0 +1,21 @@ +From: Mehdi Dogguy +Date: Sun, 6 Nov 2016 10:36:00 +0100 +Subject: Set pic_code=true on Arm* + +--- + asmcomp/arm/arch.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/asmcomp/arm/arch.ml b/asmcomp/arm/arch.ml +index d93c1e0..3541106 100644 +--- a/asmcomp/arm/arch.ml b/asmcomp/arm/arch.ml +@@ -56,7 +56,7 @@ let (arch, fpu, thumb) = + end in + (ref def_arch, ref def_fpu, ref def_thumb) + +-let pic_code = ref false ++let pic_code = ref true + + let farch spec = + arch := (match spec with diff --git a/debian/patches/series b/debian/patches/series index e375d30..5af0323 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ 0010-Enable-ocamldoc-to-build-reproducible-manpages.patch 0010-Add-a-.file-directive-to-generated-.s-files.patch 0011-Compatibility-with-x32-architecture.patch +0012-Set-pic_code-true-on-Arm.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] 03/04: Sync Standards-Version's value in debian/control.in
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch debian/stretch in repository ocaml. commit f374a5323990a69cd8c59d479ace426646b33cc1 Author: Mehdi DogguyDate: Sun Nov 6 10:47:13 2016 +0100 Sync Standards-Version's value in debian/control.in --- debian/changelog | 1 + debian/control.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 78b641c..99560af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ocaml (4.02.3-8) UNRELEASED; urgency=medium * Set pic_code to true on ARM architectures (Closes: #837359). * Use secure and canonical URIs for Vcs-* fields + * Sync Standards-Version's value in debian/control.in -- Mehdi Dogguy Sun, 06 Nov 2016 10:36:15 +0100 diff --git a/debian/control.in b/debian/control.in index 1711add..5afa3f6 100644 --- a/debian/control.in +++ b/debian/control.in @@ -18,7 +18,7 @@ Build-Depends: libx11-dev, zlib1g-dev, dh-ocaml (>= 1.0.0~) -Standards-Version: 3.9.4 +Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/ Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml.git/ Homepage: http://caml.inria.fr/ -- 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 debian/stretch created (now a6fbc36)
This is an automated email from the git hooks/post-receive script. mehdi pushed a change to branch debian/stretch in repository ocaml. at a6fbc36 Release to unstable This branch includes the following new commits: new 9f8cdd6 Set pic_code to true on ARM architectures (Closes: #837359). new a2bb9f8 Use secure and canonical URIs for Vcs-* fields new f374a53 Sync Standards-Version's value in debian/control.in new a6fbc36 Release to unstable The 4 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. -- 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] [ocamldsort] 02/04: Update Homepage field to set new upstream's location
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository ocamldsort. commit b498a5c3a94e529170e81cf89662a20a9dd41032 Author: Mehdi DogguyDate: Sun Nov 6 10:06:28 2016 +0100 Update Homepage field to set new upstream's location --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 94686ec..25402a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ocamldsort (0.16.0-5) UNRELEASED; urgency=medium * Team upload * Second try: Set DEB_BUILD_OPTIONS=parallel=1 in debian/rules + * Update Homepage field to set new upstream's location -- Mehdi Dogguy Sun, 06 Nov 2016 10:04:37 +0100 diff --git a/debian/control b/debian/control index a988fa0..3800c87 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Ralf Treinen Build-Depends: debhelper (>= 10), ocaml-nox (>= 3.09.0), camlp4, dh-ocaml (>= 0.9) Standards-Version: 3.9.8 -Homepage: http://dimitri.mutu.net/informatique.html +Homepage: http://iml.univ-mrs.fr/~ara/programmes.html.en Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ocaml-maint/packages/ocamldsort.git Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocamldsort.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamldsort.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] [ocamldsort] 03/04: Update watch file
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository ocamldsort. commit 0891d611d29e3466e07a1f799636028773fb20ff Author: Mehdi DogguyDate: Sun Nov 6 10:07:15 2016 +0100 Update watch file --- debian/changelog | 1 + debian/watch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 25402a8..3b09bab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ocamldsort (0.16.0-5) UNRELEASED; urgency=medium * Team upload * Second try: Set DEB_BUILD_OPTIONS=parallel=1 in debian/rules * Update Homepage field to set new upstream's location + * Update watch file -- Mehdi Dogguy Sun, 06 Nov 2016 10:04:37 +0100 diff --git a/debian/watch b/debian/watch index c6d373d..f9838c1 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 opts=pasv \ -ftp://quatramaran.ens.fr/pub/ara/ocamldsort/ocamldsort-(.*)\.tar\.gz +ftp://quatramaran.salle-s.org/pub/ara/ocamldsort/ocamldsort-(.*)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamldsort.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] [ocamldsort] 01/04: Set DEB_BUILD_OPTIONS=parallel=1 in debian/rules
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository ocamldsort. commit 77ad917a5f57cc392c4f00295b7926d9aa8582b1 Author: Mehdi DogguyDate: Sun Nov 6 10:05:19 2016 +0100 Set DEB_BUILD_OPTIONS=parallel=1 in debian/rules --- debian/changelog | 7 +++ debian/rules | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ba99141..94686ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ocamldsort (0.16.0-5) UNRELEASED; urgency=medium + + * Team upload + * Second try: Set DEB_BUILD_OPTIONS=parallel=1 in debian/rules + + -- Mehdi Dogguy Sun, 06 Nov 2016 10:04:37 +0100 + ocamldsort (0.16.0-4) unstable; urgency=medium * Team upload. diff --git a/debian/rules b/debian/rules index 5c76e0d..b2b7891 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -export MAKEFLAGS = -j1 +DEB_BUILD_OPTIONS=parallel=1 %: dh $@ --with=ocaml -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamldsort.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] [ocamldsort] annotated tag debian/0.16.0-5 created (now 195971c)
This is an automated email from the git hooks/post-receive script. mehdi pushed a change to annotated tag debian/0.16.0-5 in repository ocamldsort. at 195971c (tag) tagging 9f7dac55acaa056351083c7b362f3f15436ef95f (commit) replaces debian/0.16.0-4 tagged by Mehdi Dogguy on Sun Nov 6 10:07:37 2016 +0100 - Log - ocamldsort Debian release 0.16.0-5 -BEGIN PGP SIGNATURE- iQIcBAABCAAGBQJYHvLZAAoJEDO+GgqMLtj/kVUQAIC15Ln3BU4htl+gvYksF6qj MBnU0KHZzU2zPGx17/0VRAS0Px1medTOFixO4EMoi7XbDMftZB5RSGXZ6lp/IQLL pAoqQMQvIMflYOFESNeDsH5xs3NsU35A1K78YjBGr+1t/vxfD75zcepfo4DS+PoV iSEaziQg/gFyg9rTf70E1mClltH80fotKtRckRo+0sWt6r4dg711sHfS4cxNDrlQ Ji/5gOHCnENs0v9pXsBZLN/dcX3TtLgS4r/KIDZ9YF8HjnmgbjvwL9jgEG6nSHDc xPej6XzLB4pPFHvCKfG0oumlzEksHEMc25swHVHnZJDSlz8Jcwiy5Il16pSAVItJ gPXEnxG6Adt3gA2BzXMb8ZLmRQS4C28EFPsOCGSYxP1BYt0Z5MvfZJMURgan/t1J DOwEB2A45lkBHHgPnCZGxGZaSPramUXTPsWWMVayxI6vh1UiUIf4UlmMYs6w1bJ4 bZyD4UBxb5tgLVcPmA7+SJF+agOpiw0hVTMdE/PTlZrGsyqGLPEaXggElwSAt0fB p2ZroZyt854KINorRKiDJ1TLuPXAAYEFso1RYNW+gvPqDscH+quSCMaCgZlmObyJ Q26joS/3mPQO2spSLz8hh3yydt4Kxhty3h8uLXoDYbTWTLO1f34V5iNndGuWyiSC hmh/7gijLOAE35LWzRqE =sM9a -END PGP SIGNATURE- Mehdi Dogguy (4): Set DEB_BUILD_OPTIONS=parallel=1 in debian/rules Update Homepage field to set new upstream's location Update watch file Release to unstable --- 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/ocamldsort.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] [ocamldsort] 04/04: Release to unstable
This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository ocamldsort. commit 9f7dac55acaa056351083c7b362f3f15436ef95f Author: Mehdi DogguyDate: Sun Nov 6 10:07:32 2016 +0100 Release to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3b09bab..c183c24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -ocamldsort (0.16.0-5) UNRELEASED; urgency=medium +ocamldsort (0.16.0-5) unstable; urgency=medium * Team upload * Second try: Set DEB_BUILD_OPTIONS=parallel=1 in debian/rules * Update Homepage field to set new upstream's location * Update watch file - -- Mehdi Dogguy Sun, 06 Nov 2016 10:04:37 +0100 + -- Mehdi Dogguy Sun, 06 Nov 2016 10:07:32 +0100 ocamldsort (0.16.0-4) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamldsort.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