The following commit has been merged in the experimental/master branch:
commit 487408077dc3b99895088078a16d05543b0b6cfd
Author: Ralf Treinen <trei...@pps.univ-paris-diderot.fr>
Date: Fri Feb 1 13:47:04 2013 +0100
drop patch ocaml4.0-deps
diff --git a/debian/changelog b/debian/changelog
index 611460b..dd707f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocamldsort (0.16.0-1) experimental; urgency=low
+
+ * New upstream release, now compatible with ocaml 4.0
+ * Drop patch ocaml4.0-deps which has been adopted by upstream.
+
+ -- Ralf Treinen <trei...@debian.org> Fri, 01 Feb 2013 13:46:03 +0100
+
ocamldsort (0.15.0-3) experimental; urgency=low
* Patch ocaml4.0-deps: make ocamldsort accept dependencies generated
diff --git a/debian/patches/ocaml4.0-deps b/debian/patches/ocaml4.0-deps
deleted file mode 100644
index de8c99d..0000000
--- a/debian/patches/ocaml4.0-deps
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: accept dependencies produced by ocaml 4.0's dependency
- generator which contain a blank before the colon.
-Author: Roberto Di Cosmo <robe...@dicosmo.org>
-Debian-bug: #699495
-
-Index: ocamldsort/dep_parse.ml
-===================================================================
---- ocamldsort.orig/dep_parse.ml 2013-02-01 04:41:02.000000000 +0100
-+++ ocamldsort/dep_parse.ml 2013-02-01 09:28:41.000000000 +0100
-@@ -41,6 +41,7 @@
-
- let rec parse_target = parser
- | [< '':' >] -> ""
-+ | [< '' '; _ = parse_target >] -> ""
- | [< 'a; n = parse_target >] -> concat a n
-
- let rec parse_ocamldep stream =
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 92e41a3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-ocaml4.0-deps
--
ocamldsort 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
