This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch experimental/master
in repository dose3.
commit 06022310641417d97fa85ae98c3bb2c0f7b47dec
Author: Ralf Treinen <trei...@free.fr>
Date: Sun Apr 27 17:49:09 2014 +0200
drop patch ocaml-4.1
since integrated by upstream
---
debian/changelog | 1 +
debian/patches/ocaml-4.1 | 28 ----------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7abbb43..18ff960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ dose3 (3.2-rc1-1) experimental; urgency=medium
* Drop debian patches integrated by upstream:
- pod2man-5.18
- configure-dynlink
+ - ocaml-4.1
* Refreshed patches:
- binaries-prefix-edos
diff --git a/debian/patches/ocaml-4.1 b/debian/patches/ocaml-4.1
deleted file mode 100644
index 701f144..0000000
--- a/debian/patches/ocaml-4.1
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Ralf Treinen <trei...@debian.org>, following instructions by
- Pietro Abate (thanks!)
-Description: Fix FTBFS with ocaml 4.01
-Debian-bug: #731277
-
-Index: dose3/_tags.in
-===================================================================
---- dose3.orig/_tags.in 2013-12-06 20:12:19.891181979 +0100
-+++ dose3/_tags.in 2013-12-06 20:13:39.659339735 +0100
-@@ -31,12 +31,12 @@
- <rpm/rpm.cm{x,}a>: @USE_RPM@
- <rpm/rpm.cmxs>: @LINK_RPM@
-
--<common/*.cmx>: for-pack(Common)
--<algo/*.cmx>: for-pack(Algo)
--<deb/*.cmx>: for-pack(Debian)
--<eclipse/*.cmx>: for-pack(Eclipse)
--<opencsw/*.cmx>: for-pack(Csw)
--<rpm/*.cmx>: for-pack(Rpm)
-+<common/*.cmx> and not <common/common.cmx>: for-pack(Common)
-+<algo/*.cmx> and not <algo/algo.cmx>: for-pack(Algo)
-+<deb/*.cmx> and not <deb/debian.cmx>: for-pack(Debian)
-+<eclipse/*.cmx> and not <eclipse/eclipse.cmx>: for-pack(Eclipse)
-+<opencsw/*.cmx> and not <opencsw/csw.cmx>: for-pack(Csw)
-+<rpm/*.cmx> and not <rpm/rpm.cmx>: for-pack(Rpm)
-
- <{applications,experimental}/*>: use_common, use_debian, use_eclipse, use_csw
- <{applications,experimental}/*>: package(extlib), package(pcre), package(unix)
diff --git a/debian/patches/series b/debian/patches/series
index ba5ab43..f9d36ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
binaries-prefix-edos
doc-makefile-html
-ocaml-4.1
ocaml-4.1-zip
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git
_______________________________________________
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
