[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 071dd38f5717cbad95d4e9ccfac7b5ce2c6fe0bd
Author: André Hentschel <nerv at dawncrow.de>
Date:   Mon Mar 19 21:02:07 2012 +0100

    winemaker: Handle library search pragmas.
    (cherry picked from commit 37c702b534a49aa2039dba0758c204f6ccc3f55b)

diff --git a/tools/winemaker b/tools/winemaker
index 91032f0..58d6bfe 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -3,7 +3,7 @@ use strict;
 
 # Copyright 2000-2004 Francois Gouget for CodeWeavers
 # Copyright 2004 Dimitrie O. Paun
-# Copyright 2009-2011 André Hentschel
+# Copyright 2009-2012 André Hentschel
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@ use strict;
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 #
 
-my $version="0.8.2";
+my $version="0.8.3";
 
 use Cwd;
 use File::Basename;
@@ -2109,6 +2109,11 @@ sub fix_file($$$)
       print FILEO "$1$2$real_include_name$4$'";
       $modified|=($real_include_name ne $3);
 
+    } elsif (/^(\s*)\#\s*pragma\s+comment\s*\(\s*lib\s*,\s*\"(\w+)\.lib\"\s*\)/) {
+      my $pragma_indent=$1;
+      my $pragma_lib=$2;
+      push @{@$target[$T_LIBRARIES]},$pragma_lib;
+      print FILEO "$pragma_indent/* winemaker: Added -l$pragma_lib to the libraries */\n";
     } elsif (s/^(\s*)(\#\s*pragma\s+pack\s*\(\s*)//) {
       # Pragma pack handling
       #
@@ -2658,7 +2663,7 @@ sub print_banner()
   print "Winemaker $version\n";
   print "Copyright 2000-2004 Francois Gouget <fgouget\@codeweavers.com> for CodeWeavers\n";
   print "Copyright 2004 Dimitrie O. Paun\n";
-  print "Copyright 2009-2011 André Hentschel\n";
+  print "Copyright 2009-2012 André Hentschel\n";
 }
 
 sub usage()

-- 
Debian Wine packaging