[Pkg-ocaml-maint-commits] [SCM] js-of-ocaml packaging branch, master, updated. debian/1.2-2-8-g16d24e5

[Stephane Glondu]

The following commit has been merged in the master branch:
commit c2865c95c6df904865a06d0e026945e3bd42ea46
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Dec 7 08:00:38 2012 +0100

    Remove patch (merged upstream)

diff --git a/debian/patches/0001-Changelog-and-version.patch b/debian/patches/0001-Changelog-and-version.patch
deleted file mode 100644
index 7ab61fa..0000000
--- a/debian/patches/0001-Changelog-and-version.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Stephane Glondu <steph at 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
deleted file mode 100644
index e6e21f5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Changelog-and-version.patch

-- 
js-of-ocaml packaging