[Pkg-ocaml-maint-commits] [coccinelle] 06/07: Removed patches:

[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 f950ab4b941d4bde8f72c4c0c8a09a5bbf4fd781
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Tue Apr 15 20:02:13 2014 +0200

    Removed patches:
    
    * Removed patches:
      - whitespace-fix.diff - fixed upstream
---
 debian/changelog                   |  4 +++-
 debian/patches/series              |  1 -
 debian/patches/whitespace-fix.diff | 19 -------------------
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ad292b..e4add82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ coccinelle (1.0.0~rc21-1) unstable; urgency=medium
   * Updated patches:
     - pdf-docs-build.diff
   * debian/rules: call 'pdf' target to build the documentation
+  * Removed patches:
+    - whitespace-fix.diff - fixed upstream
 
- -- Євгеній Мещеряков <eugen at debian.org>  Tue, 15 Apr 2014 20:00:10 +0200
+ -- Євгеній Мещеряков <eugen at debian.org>  Tue, 15 Apr 2014 20:01:57 +0200
 
 coccinelle (1.0.0~rc20.deb-3) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index b8af929..e37dde9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 pdf-docs-build.diff
-whitespace-fix.diff
 notparallel-main-makefile.diff
diff --git a/debian/patches/whitespace-fix.diff b/debian/patches/whitespace-fix.diff
deleted file mode 100644
index 6102e91..0000000
--- a/debian/patches/whitespace-fix.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-A patch is below.  Thanks very much for the report.  Someone else had 
-reported the problem in a more obscure context, and it wasn't until I saw 
-your report that I realized what the problem was.
-
-julia
-
-diff --git a/parsing_c/parsing_hacks.ml b/parsing_c/parsing_hacks.ml
-index b5f29c2..8c6d7fb 100644
---- a/parsing_c/parsing_hacks.ml
-+++ b/parsing_c/parsing_hacks.ml
-@@ -1004,7 +1004,7 @@ let fix_tokens_strings toks =
- 		TString(str_isW,info) ->
- 		  (Parse_string_c.parse_string str_isW info) @ front @
- 		  out_strings rest
--	      |	_ ->  a :: out_strings rest))
-+	      |	_ ->  a :: front @ out_strings rest))
- 	else a :: out_strings rest in
-   out_strings toks
- 

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