[Pkg-ocaml-maint-commits] [coccinelle] 04/04: Remove disable-spgen.diff - fixed upstream

[Eugeniy Meshcheryakov]

This is an automated email from the git hooks/post-receive script.

eugen pushed a commit to branch master
in repository coccinelle.

commit ed28c020091455ee4363c4a1aaa6b420be0673a6
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Thu Nov 5 22:13:19 2015 +0100

    Remove disable-spgen.diff - fixed upstream
---
 debian/changelog                  |  3 ++-
 debian/patches/disable-spgen.diff | 55 ---------------------------------------
 debian/patches/series             |  1 -
 3 files changed, 2 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9c34d4..d3704ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 coccinelle (1.0.4.deb-1) unstable; urgency=medium
 
   * New upstream release
+  * Remove disable-spgen.diff - fixed upstream
 
- -- Євгеній Мещеряков <eugen at debian.org>  Thu, 05 Nov 2015 22:10:39 +0100
+ -- Євгеній Мещеряков <eugen at debian.org>  Thu, 05 Nov 2015 22:13:05 +0100
 
 coccinelle (1.0.3.deb-2) unstable; urgency=medium
 
diff --git a/debian/patches/disable-spgen.diff b/debian/patches/disable-spgen.diff
deleted file mode 100644
index e2b661e..0000000
--- a/debian/patches/disable-spgen.diff
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -300,7 +300,7 @@
- 
- docs:
- 	@$(MAKE) -C docs || ($(ECHO) "Warning: ignored the failed construction of the manual" 1>&2)
--	@$(MAKE) docs -C tools/spgen/documentation
-+	#@$(MAKE) docs -C tools/spgen/documentation
- 	@if test "x$(FEATURE_OCAML)" = x1; then \
- 		if test -f ./parsing_c/ast_c.cmo -o -f ./parsing_c/ast_c.cmx; then \
- 			$(MAKE) -C ocaml doc; \
-@@ -311,7 +311,7 @@
- clean:: Makefile.config
- #	$(MAKE) -C docs clean
- 	$(MAKE) -C ocaml cleandoc
--	$(MAKE) clean -C tools/spgen/documentation
-+	#$(MAKE) clean -C tools/spgen/documentation
- 
- ##############################################################################
- # Pre-Install (customization of spatch frontend script)
-@@ -361,7 +361,7 @@
- 	$(MKDIR_P) $(DESTDIR)$(MANDIR)/man3
- 	$(INSTALL_DATA) docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/
- 	$(INSTALL_DATA) docs/pycocci.1 $(DESTDIR)$(MANDIR)/man1/
--	$(INSTALL_DATA) docs/spgen.1 $(DESTDIR)$(MANDIR)/man1/
-+	#$(INSTALL_DATA) docs/spgen.1 $(DESTDIR)$(MANDIR)/man1/
- 	$(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/
- 
- install-bash:
-@@ -401,7 +401,7 @@
- 	rm -f $(DESTDIR)$(LIBDIR)/spatch
- 	rm -f $(DESTDIR)$(LIBDIR)/spatch.opt
- 	rm -f $(DESTDIR)$(BINDIR)/pycocci
--	@$(MAKE) install -s -C tools/spgen/source
-+	#@$(MAKE) install -s -C tools/spgen/source
- 	$(INSTALL_PROGRAM) tools/pycocci $(DESTDIR)$(BINDIR)
- 	@if test -x spatch -o -x spatch.opt; then \
- 		$(MAKE) install-def;fi
-@@ -449,14 +449,14 @@
- 	rm -f $(DESTDIR)$(LIBDIR)/globals/*.cmi
- 	rm -f $(DESTDIR)$(LIBDIR)/python/coccilib/coccigui/*
- 	rm -f $(DESTDIR)$(LIBDIR)/python/coccilib/*.py
--	@$(MAKE) uninstall -C tools/spgen/source
-+	#@$(MAKE) uninstall -C tools/spgen/source
- 	rmdir --ignore-fail-on-non-empty -p \
- 		$(DESTDIR)$(LIBDIR)/python/coccilib/coccigui
- 	rmdir --ignore-fail-on-non-empty $(DESTDIR)$(LIBDIR)/ocaml
- 	rmdir $(DESTDIR)$(LIBDIR)
- 	rm -f $(DESTDIR)$(MANDIR)/man1/spatch.1
- 	rm -f $(DESTDIR)$(MANDIR)/man3/Coccilib.3cocci
--	rm -f $(DESTDIR)$(MANDIR)/man1/spgen.1
-+	#rm -f $(DESTDIR)$(MANDIR)/man1/spgen.1
- 
- uninstall-bash:
- 	rm -f $(DESTDIR)$(BASH_COMPLETION_DIR)/spatch
diff --git a/debian/patches/series b/debian/patches/series
index fa3b2c7..f3e5b64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 pdf-docs-build.diff
 notparallel-main-makefile.diff
 bash-completion-dir.diff
-disable-spgen.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coccinelle.git