[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 8a57aa34a0561b4895f13c69ab25af567e925d4e
Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Apr 13 17:40:40 2012 +0200

    vbscript: Short if statement may have optional 'end if'.
    (cherry picked from commit cb1a8a3c58e1ba020fa6b8b8196519637d2cb916)

diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index 45e0e8a..2a85272 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -221,9 +221,13 @@ IfStatement
     : tIF Expression tTHEN tNL StatementsNl ElseIfs_opt Else_opt tEND tIF
                                             { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; }
     | tIF Expression tTHEN Statement        { $$ = new_if_statement(ctx, $2, $4, NULL, NULL); CHECK_ERROR; }
-    | tIF Expression tTHEN Statement tELSE Statement
+    | tIF Expression tTHEN Statement tELSE Statement EndIf_opt
                                             { $$ = new_if_statement(ctx, $2, $4, NULL, $6); CHECK_ERROR; }
 
+EndIf_opt
+    : /* empty */
+    | tEND tIF
+
 ElseIfs_opt
     : /* empty */                           { $$ = NULL; }
     | ElseIfs                               { $$ = $1; }

-- 
Debian Wine packaging