[SCM] qtbase packaging branch, experimental, updated. debian/5.6.1+dfsg-2-2-g3e36d2e

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 3e36d2e8e4ec1394a74988328025abaa8684f7f2
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jun 18 11:39:19 2016 +0300

    Drop debian/scripts/migrate-symbols.py, no longer needed.
---
 debian/changelog                  |   1 +
 debian/scripts/migrate-symbols.py | 108 --------------------------------------
 2 files changed, 1 insertion(+), 108 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b4a32ec..5af3cb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtbase-opensource-src (5.7.0+dfsg-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop debian/scripts/migrate-symbols.py, no longer needed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jun 2016 11:38:32 +0300
 
diff --git a/debian/scripts/migrate-symbols.py b/debian/scripts/migrate-symbols.py
deleted file mode 100755
index 203bf43..0000000
--- a/debian/scripts/migrate-symbols.py
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/python3
-
-# Script to migrate symbols from old symbols versioning to new symbols versioning
-# Author: Dmitry Shachnev <mitya57 at debian.org>
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-import argparse
-import glob
-import re
-import subprocess
-import sys
-
-options_re = re.compile(r'\([^)]+\)')
-symbol_re = re.compile(r'([^@]+)@([0-6ABEIPQRTVaest_.]+) (\S+)')
-cxx_symbol_re = re.compile(r'"([^@]+)@(Base)" (\S+)')
-
-
-def apply_substs(symbol):
-    # this is the version for amd64
-    # see SymbolsHelper/Substs/TypeSubst.pm for details
-    symbol = symbol.replace('{size_t}', 'm')
-    symbol = symbol.replace('{ssize_t}', 'l')
-    symbol = symbol.replace('{int64_t}', 'l')
-    symbol = symbol.replace('{uint64_t}', 'm')
-    symbol = symbol.replace('{qptrdiff}', 'x')
-    symbol = symbol.replace('{quintptr}', 'y')
-    symbol = symbol.replace('{intptr_t}', 'l')
-    return symbol
-
-
-def main(buildlog_path, mark_private, source_version):
-    new_symbols = {}
-    with open(buildlog_path, errors='replace') as buildlog:
-        for line in buildlog:
-            if not line.startswith('+ '):
-                continue
-            match = symbol_re.match(line[2:])
-            if match:
-                symbol, version = match.group(1, 2)
-                if symbol.startswith('_ZThn'):
-                    symbol = subprocess.check_output(('c++filt', symbol))
-                    symbol = symbol.decode('ascii').rstrip()
-                new_symbols[symbol] = version
-
-    for symbols_file_path in glob.glob('debian/*.symbols'):
-        new_lines = []
-        with open(symbols_file_path) as symbols_file:
-            for line in symbols_file:
-                line = line.rstrip()
-                was_private = line.endswith(' 1')
-                if was_private:
-                    line = line[:-2]
-                if not line.startswith(' '):
-                    new_lines.append(line)
-                    continue
-                match = options_re.search(line)
-                options = match.group(0) if match else ''
-                symbol_part = line[1:]
-                if symbol_part.startswith('('):
-                    symbol_part = options_re.sub('', symbol_part, count=1)
-                if 'c++' in options:
-                    match = cxx_symbol_re.match(symbol_part)
-                else:
-                    match = symbol_re.match(symbol_part)
-                symbol = match.group(1)
-                symbol_subst = apply_substs(symbol)
-                abi = new_symbols.get(symbol_subst, match.group(2))
-                if not was_private and 'optional' not in options and symbol_subst not in new_symbols:
-                    print('Missing symbol in %s: %s' % (symbols_file_path, symbol_subst), file=sys.stderr)
-                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 = 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:
-                print(line, file=symbols_file)
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--no-mark-private', help='do not mark private symbols', action='store_true')
-    parser.add_argument('--version', help='version to change all symbols to')
-    parser.add_argument('buildlog', help='build log path')
-    args = parser.parse_args()
-    if not args.version:
-        print('Please use the --version flag to bump the symbols versions.', file=sys.stderr)
-        print('For example: --version 5.6.0~beta', file=sys.stderr)
-    main(args.buildlog, not args.no_mark_private, args.version)

-- 
qtbase packaging