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

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 282d7791b8e418af9a7eedbc1720f611d7f4555a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Feb 3 11:45:07 2016 +0300

    migrate-symbols: Update the version only for found symbols.
---
 debian/scripts/migrate-symbols.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/scripts/migrate-symbols.py b/debian/scripts/migrate-symbols.py
index a7b7cc8..5f1db1c 100755
--- a/debian/scripts/migrate-symbols.py
+++ b/debian/scripts/migrate-symbols.py
@@ -88,7 +88,9 @@ def main(buildlog_path, mark_private, source_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 = source_version or match.group(3)
+                new_version = match.group(3)
+                if source_version and symbol_subst in new_symbols:
+                    new_version = source_version
                 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