The following commit has been merged in the master branch:
commit 0596238a79001537d20790889792b11a553668f3
Author: Stephane Glondu <st...@glondu.net>
Date:   Mon Feb 27 14:24:10 2012 +0100

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index aa4d779..25dbaf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tyxml (2.0.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    - remove patch (merged upstream)
+
+ -- St├ęphane Glondu <glo...@debian.org>  Mon, 27 Feb 2012 14:25:37 +0100
+
 tyxml (2.0.1c-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/0001-Fix-typo-causing-FTBFS-with-ocamlduce.patch 
b/debian/patches/0001-Fix-typo-causing-FTBFS-with-ocamlduce.patch
deleted file mode 100644
index 67c43ce..0000000
--- a/debian/patches/0001-Fix-typo-causing-FTBFS-with-ocamlduce.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Sat, 31 Dec 2011 13:32:01 +0100
-Subject: Fix typo causing FTBFS with ocamlduce
-
----
- doc/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/doc/Makefile b/doc/Makefile
-index 79b10bb..0e8d503 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -3,7 +3,7 @@ include ../Makefile.filelist
- 
- LIB := -I ../lib -I ../syntax
- 
--ifeq "${OCAMLDUCE}" "YES"
-+ifeq "${OCAMLDUCE}" "yes"
- OCAMLDOC := ${OCAMLDUCEFIND} ocamldoc -package ocamlduce
- else
- OCAMLDOC := ${OCAMLFIND} ocamldoc
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bc45bd8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-typo-causing-FTBFS-with-ocamlduce.patch

-- 
tyxml 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

Reply via email to