The following commit has been merged in the master branch:
commit 5e04a647a40a27a442fcce645b732753b5d933a2
Author: Nicolas Dandrimont <nicolas.dandrim...@crans.org>
Date:   Fri May 20 00:04:11 2011 +0200

    Drop patches

diff --git a/debian/changelog b/debian/changelog
index a410cae..c43b758 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ js-of-ocaml (1.0.2+dfsg-1) unstable; urgency=low
   * New upstream release
     - Bump required Lwt version to 2.3.0
     - Update license to LGPLv2
+    - Drop patches (fixed upstream)
 
- -- Nicolas Dandrimont <nicolas.dandrim...@crans.org>  Thu, 19 May 2011 
23:51:45 +0200
+ -- Nicolas Dandrimont <nicolas.dandrim...@crans.org>  Fri, 20 May 2011 
00:03:50 +0200
 
 js-of-ocaml (1.0+dfsg-2) unstable; urgency=low
 
diff --git a/debian/patches/0001-Do-not-fail-when-tests-dir-is-absent.patch 
b/debian/patches/0001-Do-not-fail-when-tests-dir-is-absent.patch
deleted file mode 100644
index 57834a6..0000000
--- a/debian/patches/0001-Do-not-fail-when-tests-dir-is-absent.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Sun, 23 Jan 2011 11:02:17 +0100
-Subject: [PATCH] Do not fail when tests dir is absent
-
----
- Makefile |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9e4a7d7..e4dbd58 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,7 +14,9 @@ runtime:
- examples: compiler library
-       $(MAKE) -C examples
- tests: compiler library
-+ifeq ($(wildcard tests),tests)
-       $(MAKE) -C tests
-+endif
- 
- LWTERROR="Js_of_ocaml requires Lwt version 2.1 at least.  Please upgrade."
- check_lwt:
-@@ -39,7 +41,9 @@ clean:
-       $(MAKE) -C lib clean
-       $(MAKE) -C runtime clean
-       $(MAKE) -C examples clean
-+ifeq ($(wildcard tests),tests)
-       $(MAKE) -C tests clean
-+endif
- 
- realclean: clean
-       find . -name "*~" -print | xargs rm -f
--- 
diff --git a/debian/patches/0002-Fix-typo-s-hasAttribyte-hasAttribute-g.patch 
b/debian/patches/0002-Fix-typo-s-hasAttribyte-hasAttribute-g.patch
deleted file mode 100644
index ef57198..0000000
--- a/debian/patches/0002-Fix-typo-s-hasAttribyte-hasAttribute-g.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Sun, 23 Jan 2011 11:26:34 +0100
-Subject: [PATCH] Fix typo: s/hasAttribyte/hasAttribute/g
-
----
- lib/dom.ml  |    2 +-
- lib/dom.mli |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/dom.ml b/lib/dom.ml
-index f24d8ac..1ac9d91 100644
---- a/lib/dom.ml
-+++ b/lib/dom.ml
-@@ -77,7 +77,7 @@ class type element = object
-   method getAttribute : js_string t -> js_string t meth
-   method setAttribute : js_string t -> js_string t -> unit meth
-   method removeAttribute : js_string t -> unit meth
--  method hasAttribyte : js_string t -> bool t meth
-+  method hasAttribute : js_string t -> bool t meth
-   method getElementsByTagName : js_string t -> 'element nodeList t meth
- end
- 
-diff --git a/lib/dom.mli b/lib/dom.mli
-index 3011b67..01d95b3 100644
---- a/lib/dom.mli
-+++ b/lib/dom.mli
-@@ -75,7 +75,7 @@ class type element = object
-   method getAttribute : js_string t -> js_string t meth
-   method setAttribute : js_string t -> js_string t -> unit meth
-   method removeAttribute : js_string t -> unit meth
--  method hasAttribyte : js_string t -> bool t meth
-+  method hasAttribute : js_string t -> bool t meth
-   method getElementsByTagName : js_string t -> 'element nodeList t meth
- end
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 67590b2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Do-not-fail-when-tests-dir-is-absent.patch
-0002-Fix-typo-s-hasAttribyte-hasAttribute-g.patch

-- 
js-of-ocaml packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to