[SCM] qtbase packaging branch, experimental, updated. debian/5.6.0-beta+dfsg-4-3-g5ef8ba2

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=5ef8ba2

The following commit has been merged in the experimental branch:
commit 5ef8ba21d52712347709b7d433ec2315657cb1a7
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jan 9 09:34:03 2016 +0300

    migrate-symbols.py: Fix variable name conflict
---
 debian/scripts/migrate-symbols.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/scripts/migrate-symbols.py b/debian/scripts/migrate-symbols.py
index b578edb..a3277c9 100755
--- a/debian/scripts/migrate-symbols.py
+++ b/debian/scripts/migrate-symbols.py
@@ -46,7 +46,7 @@ def apply_substs(symbol):
     return symbol
 
 
-def main(buildlog_path, mark_private, version):
+def main(buildlog_path, mark_private, source_version):
     new_symbols = {}
     with open(buildlog_path) as buildlog:
         for line in buildlog:
@@ -88,7 +88,7 @@ def main(buildlog_path, mark_private, version):
                 format_string = ' %s"%s@%s" %s' if 'c++' in options else ' %s%s@%s %s'
                 if mark_private and 'PRIVATE' in abi:
                     format_string += ' 1'
-                new_version = version or match.group(3)
+                new_version = source_version or match.group(3)
                 new_lines.append(format_string % (options, symbol, abi, new_version))
         with open(symbols_file_path, 'w') as symbols_file:
             for line in new_lines:

-- 
qtbase packaging