The following commit has been merged in the master branch: commit f700ee7afe3e63865d3a660dc5a82f5eb4a82b51 Author: Eugeniy Meshcheryakov <eu...@debian.org> Date: Sun Oct 30 18:40:57 2011 +0100
Removed patches: python-string-regression-fix.diff — fixed upstream diff --git a/debian/changelog b/debian/changelog index 8145a23..1ae54d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ coccinelle (1.0.0~rc7.deb-1) unstable; urgency=low * New upstream RC * Build-depend on libpcre-ocaml-dev + * Removed patches: + - python-string-regression-fix.diff — fixed upstream - -- Євгеній Мещеряков <eu...@debian.org> Sun, 30 Oct 2011 18:28:22 +0100 + -- Євгеній Мещеряков <eu...@debian.org> Sun, 30 Oct 2011 18:40:16 +0100 coccinelle (0.2.5.deb-3) unstable; urgency=low diff --git a/debian/patches/python-string-regression-fix.diff b/debian/patches/python-string-regression-fix.diff deleted file mode 100644 index e3b693d..0000000 --- a/debian/patches/python-string-regression-fix.diff +++ /dev/null @@ -1,52 +0,0 @@ -From: Julia Lawall <ju...@diku.dk> -Subject: Re: [Cocci] Trouble with python_regexp.cocci example - -On Tue, 5 Apr 2011, Eugeniy Meshcheryakov wrote: - -> Hello, -> -> I'm trying to check if new version of coccinelle (0.2.5) works correctly, -> and got strange results with python_regexp.cocci example: -> -> % spatch -sp_file /tmp/python_regexp.cocci python_regexp.c -> init_defs_builtins: /usr/share/coccinelle/standard.h -> File "/tmp/python_regexp.cocci", line 3, column 15, charpos = 45 -> around = '', whole content = m = re.compile('_new$') -> Fatal error: exception Failure("lexing: empty token") -> -> Is it expected result, or is there something wrong with how I compile -> the package? Other examples that use python seem to work fine (after -> correcting syntax errors). - -A patch that fixes the problem is below. - -julia - -diff -u -p a/parsing_cocci/lexer_script.mll b/parsing_cocci/lexer_script.mll ---- a/parsing_cocci/lexer_script.mll 2011-04-02 10:39:29.000000000 +0200 -+++ b/parsing_cocci/lexer_script.mll 2011-04-05 22:03:04.000000000 +0200 -@@ -46,18 +46,15 @@ rule token = parse - | "/" { TScriptData (tok lexbuf) } - | "//" [^ '\n']* { token lexbuf } (* skip SmPL comments *) - | '"' { TScriptData (Printf.sprintf "\"%s\"" (string lexbuf)) } -- | "'" { TScriptData (Printf.sprintf "'%s'" (char lexbuf)) } -+ | "'" { TScriptData (Printf.sprintf "'%s'" (cstring lexbuf)) } - | eof { EOF } - | _ { raise (Lexical ("unrecognised symbol, in token rule:"^tok lexbuf)) } - - (* These are C strings. Perhaps they require some adjustment. *) - and string = parse - | '"' { "" } -- | (_ as x) { Common.string_of_char x ^ string lexbuf } -- | ("\\" _) as x { x ^ string lexbuf } -+ | (_ as x) { (String.make 1 x) ^ string lexbuf } - --and char = parse -- | (_ as x) "'" { String.make 1 x } -- | (("\\" (oct | oct oct | oct oct oct)) as x "'") { x } -- | (("\\x" (hex | hex hex)) as x "'") { x } -- | (("\\" _ ) as x "'") { x } -+and cstring = parse -+ | "'" { "" } -+ | (_ as x) { (String.make 1 x) ^ cstring lexbuf } - diff --git a/debian/patches/series b/debian/patches/series index 58bb5e3..9475bed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ pycaml-build-check.diff -python-string-regression-fix.diff -- Debian packaging for coccinelle _______________________________________________ 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