This is an automated email from the git hooks/post-receive script.
eugen pushed a commit to branch master
in repository coccinelle.
commit 1ba44a1585513471577f1b97319f6c5d1738511f
Author: Eugeniy Meshcheryakov <eu...@debian.org>
Date: Tue May 26 21:05:06 2015 +0200
Remove patches:
* Remove patches:
- no-parmap-subdir.diff
---
debian/changelog | 4 +++-
debian/patches/no-parmap-subdir.diff | 29 -----------------------------
2 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 67e732b..d1995bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
coccinelle (1.0.0.deb-1) unstable; urgency=medium
* New upstream release
+ * Remove patches:
+ - no-parmap-subdir.diff
- -- Євгеній Мещеряков <eu...@debian.org> Tue, 26 May 2015 20:59:47 +0200
+ -- Євгеній Мещеряков <eu...@debian.org> Tue, 26 May 2015 21:04:49 +0200
coccinelle (1.0.0~rc24.deb-4) unstable; urgency=medium
diff --git a/debian/patches/no-parmap-subdir.diff
b/debian/patches/no-parmap-subdir.diff
deleted file mode 100644
index 0f492b4..0000000
--- a/debian/patches/no-parmap-subdir.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -74,8 +74,7 @@
-
- MAKESUBDIRS=$(MAKELIBS) commons \
- globals ctl parsing_cocci parsing_c \
-- engine popl09 extra python ocaml \
-- bundles/parmap
-+ engine popl09 extra python ocaml
-
- CLEANSUBDIRS=commons \
- globals ctl parsing_cocci parsing_c \
---- a/Makefile.libs
-+++ b/Makefile.libs
-@@ -75,10 +75,11 @@
- OPTFLAGS_type_conv =
-
- # parmap library
--PARMAPDIR = bundles/parmap/parmap-1.0-rc5-patched/_build
-+PARMAPDIR := $(shell ocamlfind query parmap)
- LOCAL_parmap = $(PARMAPDIR)/parmap.cma
- LOCALOPT_parmap = $(PARMAPDIR)/parmap.cmxa
- GLOBAL_parmap = $(PARMAPDIR)/parmap.cma
- GLOBALOPT_parmap = $(PARMAPDIR)/parmap.cmxa
--FLAGS_parmap = -cclib -lparmap_stubs
--OPTFLAGS_parmap = -cclib -lparmap_stubs
-+#PARMAP_LIBS = $(shell ocamlfind query -l-format parmap)
-+FLAGS_parmap = -dllib -lparmap_stubs -cclib -lparmap_stubs
-+OPTFLAGS_parmap = -cclib -lparmap_stubs
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/coccinelle.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
