[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, experimental/master, updated. debian/107.01-5-23-g05147b6
The following commit has been merged in the experimental/master branch: commit 69a0627c2cadab44b7d4b323948f85735f2ce6f9 Author: Lifeng Sun Date: Fri Jul 26 11:30:55 2013 +0800 Update debian/watch. diff --git a/debian/changelog b/debian/changelog index 9cdb0c9..a82832d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -janest-core (109.32.00-1) experimental; urgency=low +janest-core (109.35.00-1~exp1) UNRELEASED; urgency=low * New upstream release. * Add myself to Uploaders. - -- Lifeng Sun Sat, 06 Jul 2013 09:50:00 +0800 + -- Lifeng Sun Fri, 26 Jul 2013 08:39:04 +0800 janest-core (107.01-5) unstable; urgency=low diff --git a/debian/watch b/debian/watch index 833e756..3c1c048 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://ocaml.janestreet.com/?q=node/13 .*/core-(.*)\.t(?:ar\.)gz +opts=uversionmangle=s/-rc/~rc/ https://github.com/janestreet/core/tags /.*/archive/([\d\.\-rc]+)\.tar\.gz -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, experimental/master, updated. debian/107.01-5-23-g05147b6
The following commit has been merged in the experimental/master branch: commit 5f3caa5244af3b21e5337c8c08b915bfea4ff6c2 Author: Lifeng Sun Date: Fri Jul 26 11:28:40 2013 +0800 debian/control: Canonical VCS-* fields. diff --git a/debian/control b/debian/control index 33bf9e6..526785e 100644 --- a/debian/control +++ b/debian/control @@ -26,8 +26,8 @@ Build-Depends: libsexplib-camlp4-dev, libvariants-camlp4-dev Standards-Version: 3.9.2 -Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/janest-core.git -Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/janest-core.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/janest-core.git +Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/janest-core.git Homepage: http://www.janestcapital.com/ocaml/ Package: libcore-ocaml-dev -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, experimental/master, updated. debian/107.01-5-23-g05147b6
The following commit has been merged in the experimental/master branch: commit 0f4aa0b1fa350372e5afa16ddb044d2e36d80a27 Author: Lifeng Sun Date: Fri Jul 26 11:29:09 2013 +0800 Bump Standards-Version to 3.9.4. diff --git a/debian/control b/debian/control index 526785e..ed96b5b 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Build-Depends: libpipebang-camlp4-dev, libsexplib-camlp4-dev, libvariants-camlp4-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/janest-core.git Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/janest-core.git Homepage: http://www.janestcapital.com/ocaml/ -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, experimental/master, updated. debian/107.01-5-23-g05147b6
The following commit has been merged in the experimental/master branch: commit e15a4c6ccd896787843979548436e8c221377cd4 Author: Lifeng Sun Date: Fri Jul 26 11:39:09 2013 +0800 Bump debhelper compat to 9. diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index caa0913..4b67823 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Stéphane Glondu , Lifeng Sun Build-Depends: - debhelper (>= 8), + debhelper (>= 9), bc, ocaml-nox (>= 4.00.1), dh-ocaml, -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, experimental/master, updated. debian/107.01-5-23-g05147b6
The following commit has been merged in the experimental/master branch: commit 611212c23d3c8a4b7c8eda4089504b463c3ccf8c Author: Lifeng Sun Date: Fri Jul 26 08:43:11 2013 +0800 Remove 0001-escape-special-characters-in-doc.patch. Appled by upstream. diff --git a/debian/patches/0001-escape-special-characters-in-doc.patch b/debian/patches/0001-escape-special-characters-in-doc.patch deleted file mode 100644 index 5a9433b..000 --- a/debian/patches/0001-escape-special-characters-in-doc.patch +++ /dev/null @@ -1,16 +0,0 @@ a/lib/command.mli -+++ b/lib/command.mli -@@ -288,11 +288,11 @@ - - The [name] must not be surrounded by whitespace, if it is, an exn will be raised. - -- If the [name] is surrounded by a special character pair (<>, {}, [] or (),) -+ If the [name] is surrounded by a special character pair (<>, \{\}, \[\] or (),) - [name] will remain as-is, otherwise, [name] will be uppercased. - - In the situation where [name] is only prefixed or only suffixed by one of the -- special character pairs, or different pairs are used, (e.g. "http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, experimental/master, updated. debian/107.01-5-23-g05147b6
The following commit has been merged in the experimental/master branch: commit 8317ac8e02ba36ee2c6e2dab769e4f24c06dde5b Merge: c2f1e47055db94d674c8d1749d79f51c2e42b682 956330d151603f6f356affad760ed56929216cf3 Author: Lifeng Sun Date: Sun Jul 28 19:42:38 2013 +0800 Merge tag 'upstream/109.35.00' into experimental/master Upstream version 109.35.00 -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, experimental/master, updated. debian/107.01-5-23-g05147b6
The following commit has been merged in the experimental/master branch: commit 05147b6734c703178fa49f234446a21c32dd65d9 Author: Lifeng Sun Date: Sun Jul 28 15:41:20 2013 +0800 Fix time test. diff --git a/debian/changelog b/debian/changelog index a82832d..f0b0ccf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ janest-core (109.35.00-1~exp1) UNRELEASED; urgency=low * New upstream release. * Add myself to Uploaders. + * New patch: fix-time-test.patch. -- Lifeng Sun Fri, 26 Jul 2013 08:39:04 +0800 diff --git a/debian/patches/fix-time-test.patch b/debian/patches/fix-time-test.patch new file mode 100644 index 000..0cda9dd --- /dev/null +++ b/debian/patches/fix-time-test.patch @@ -0,0 +1,13 @@ +FIx time test. + +--- a/lib_test/time_test.ml b/lib_test/time_test.ml +@@ -56,7 +56,7 @@ + "sexp1" @? (Time.t_of_sexp (Time.sexp_of_t time1) = time1); + "sexp2" @? (Time.t_of_sexp (Time.sexp_of_t time2) = time2); + "sexp3" @? (Time.t_of_sexp (Time.sexp_of_t time3) = time3); +- let date, ofday = Time.to_local_date_ofday time3 in ++ let date, ofday = Time.to_date_ofday time3 (Zone.of_string "nyc") in + "date" @? (date = Date.of_string "2005-05-25"); + "ofday" @? (Ofday.(=.) ofday (Time.Ofday.of_string "12:46:15.232")); + "ofday1" @? (Time.Ofday.of_string "09:13" = Time.Ofday.of_string "0913"); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..985a06e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-time-test.patch -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, experimental/master, updated. debian/107.01-5-23-g05147b6
The following commit has been merged in the experimental/master branch: commit da1d08d0f3667c20a1768019df16f1f687e36b7a Author: Lifeng Sun Date: Fri Jul 26 11:38:04 2013 +0800 debian/rules: export OCAMLFIND_LDCONF=ignore. diff --git a/debian/rules b/debian/rules index 135af7b..b9e7a38 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,7 @@ include /usr/share/ocaml/ocamlvars.mk export OCAML_DLL_DIR export OCAML_HAVE_OCAMLOPT export OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR) +export OCAMLFIND_LDCONF=ignore %: dh $@ --with ocaml -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, experimental/master, updated. debian/107.01-5-23-g05147b6
The following commit has been merged in the experimental/master branch: commit ad52bf36b90b90a861ac729a197da2aebbb38bfd Author: Lifeng Sun Date: Fri Jul 26 11:30:12 2013 +0800 debian/control: new Homepage. diff --git a/debian/control b/debian/control index ed96b5b..caa0913 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Build-Depends: Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/janest-core.git Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/janest-core.git -Homepage: http://www.janestcapital.com/ocaml/ +Homepage: https://github.com/janestreet/core Package: libcore-ocaml-dev Architecture: any -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, experimental/master, updated. debian/107.01-5-23-g05147b6
The following commit has been merged in the experimental/master branch: commit 3b79f81463b71eba4e358b005bfd1c671cf2a1db Author: Lifeng Sun Date: Sat Jul 27 21:28:03 2013 +0800 enable tests. diff --git a/debian/TODO b/debian/TODO index 9c463d9..a6e7cd3 100644 --- a/debian/TODO +++ b/debian/TODO @@ -1,2 +1 @@ -Turn on tests. switch copyright format to dep5. diff --git a/debian/rules b/debian/rules index b9e7a38..5d3b9af 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ export OCAMLFIND_LDCONF=ignore .PHONY: override_dh_auto_configure override_dh_auto_configure: - ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libcore-ocaml-doc/html/api + ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libcore-ocaml-doc/html/api --enable-tests .PHONY: override_dh_auto_build override_dh_auto_build: -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, experimental/master, updated. debian/107.01-5-23-g05147b6
The following commit has been merged in the experimental/master branch: commit c2f1e47055db94d674c8d1749d79f51c2e42b682 Merge: 2c13e8258e6fb3c9d8436e571cab526adbfa5a28 215a2cbbc72094b986223c0e4fb6d5991d369002 Author: Lifeng Sun Date: Sun Jul 28 19:42:32 2013 +0800 Merge tag 'upstream/109.34.00' into experimental/master Upstream version 109.34.00 -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, experimental/master, updated. debian/107.01-5-23-g05147b6
The following commit has been merged in the experimental/master branch: commit 31fe820ce827590c6987fded443e8338170e4208 Author: Lifeng Sun Date: Fri Jul 26 11:39:26 2013 +0800 Add debian/TODO. diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 000..9c463d9 --- /dev/null +++ b/debian/TODO @@ -0,0 +1,2 @@ +Turn on tests. +switch copyright format to dep5. -- janest-core packaging ___ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits