The following commit has been merged in the master branch: commit 586299584b2b883d898e9560a68557893fc57684 Author: Stephane Glondu <st...@glondu.net> Date: Fri Oct 26 10:19:01 2012 +0200
Update upstream changelog and version (Closes: #691257) diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..c8e0154 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,12 @@ +js_of_ocaml 1.2 in Debian +------------------------- + +The upstream part of this packages matches tag 1.2 [1] from the +upstream Darcs repository, and not the tarball currently published on +the upstream site versioned as 1.2, which contains more commits. In +particular, module Lwt_js_events is not present. See Debian bug +#691257 for more information. + +[1] hash 20120530130911-4e2d2-f31950afc273d98b70ecc9d2dd6cc23947de7204.gz + + -- Stéphane Glondu <glo...@debian.org>, Wed, 14 Nov 2012 12:18:13 +0100 diff --git a/debian/changelog b/debian/changelog index 7639114..8cac14e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +js-of-ocaml (1.2-2) unstable; urgency=low + + * Update upstream changelog and version (Closes: #691257) + + -- Stéphane Glondu <glo...@debian.org> Wed, 14 Nov 2012 12:18:20 +0100 + js-of-ocaml (1.2-1) unstable; urgency=low * New upstream release diff --git a/debian/patches/0001-Changelog-and-version.patch b/debian/patches/0001-Changelog-and-version.patch new file mode 100644 index 0000000..7ab61fa --- /dev/null +++ b/debian/patches/0001-Changelog-and-version.patch @@ -0,0 +1,40 @@ +From: Stephane Glondu <st...@glondu.net> +Date: Fri, 26 Oct 2012 10:14:29 +0200 +Subject: Changelog and version + +Origin: upstream, http://ocsigen.org/darcsweb/?r=js_of_ocaml;a=commit;h=20120530130902-4e2d2-a51cd5bebba852be2e409cb076f8b300dea37cf9.gz +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=691257 +--- + CHANGES | 13 +++++++++++++ + VERSION | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/CHANGES b/CHANGES +index 1608ba0..1701902 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -1,3 +1,16 @@ ++ ++===== 1.2 (2012-06-02) ===== ++ ++ * Bugfixes ++ ** Fix #284 ++ ** Fix return type of window##open_ ++ ++ * Features/Changes ++ ** Improvements in the data-flow solver ++ ** Add Dom_html.window##onscroll ++ ** Dom_events.listen: handler should return boolean ++ ** Add DOM drag/drop events ++ + ===== 1.1.1 (2012-03-15) ===== + + * Bugfixes: +diff --git a/VERSION b/VERSION +index 524cb55..5625e59 100644 +--- a/VERSION ++++ b/VERSION +@@ -1 +1 @@ +-1.1.1 ++1.2 +-- diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..e6e21f5 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Changelog-and-version.patch -- js-of-ocaml 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