[SCM] qtbase packaging branch, experimental, updated. debian/5.4.2+dfsg-4-3-g1d5708e

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 1aa59a1fccb6be8743c30809a1c7de7f28237cad
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Apr 26 22:42:43 2015 +0300

    Use the latest version of debian/mark_private_symbols.sh.
    
    - Strip trailing colon from symbols names.
    - Unmark private symbols before processing them.
---
 debian/changelog               |  3 +++
 debian/mark_private_symbols.sh | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eff24e8..c65702b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ qtbase-opensource-src (5.3.2+dfsg-5) UNRELEASED; urgency=medium
     - CVE-2015-0295, CVE-2015-1858, CVE-2015-1859, CVE-2015-1860.
     - Closes: #779580.
   * Fix HTTP upload corruptions when server closes connection.
+  * Use the latest version of debian/mark_private_symbols.sh:
+    - Strip trailing colon from symbols names.
+    - Unmark private symbols before processing them.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 26 Apr 2015 21:56:26 +0300
 
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
index 445dbdd..82bcf5a 100755
--- a/debian/mark_private_symbols.sh
+++ b/debian/mark_private_symbols.sh
@@ -50,10 +50,23 @@ then
 	done
 fi
 
+# Unmark private symbols from the copies. This will
+# help us find symbols that might have become public.
+for symbols_file in `ls debian/*.symbols`
+do
+	if [ ! -n "${WRITERESULTS}" ]
+	then
+		sed -i 's/ 1$//g' $symbols_file.mps
+	else
+		sed -i 's/ 1$//g' $symbols_file
+	fi
+done
+
 grep -rh class ${PRIVATE_HEADERS} |
 	grep EXPORT | 
 	while read class export classname rest 
 	do
+		classname=$(echo $classname | sed 's/://')
 		echo ${#classname}${classname} 
 	done | 
 	while read privateclass 

-- 
qtbase packaging