[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.0+dfsg-5-16-g82d459b

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the kubuntu_unstable branch:
commit b4d5b545e6be616d2fadb52d27d8b0adab2fa94a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Feb 19 13:22:55 2015 -0300

    Make mark_private_symbols.sh unmark private symbols before processing them.
    
    This will help us detect symbols that became public.
---
 debian/changelog               |  2 ++
 debian/mark_private_symbols.sh | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2f3b53e..1697c9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ qtbase-opensource-src (5.4.0+dfsg-6) UNRELEASED; urgency=medium
   * Headers installed into a versioned directory are always private. Simplify
     even further qtbase5-private-dev.install. Moreover this directories will
     always start with 5 during Qt 5's lifetime.
+  * Make mark_private_symbols.sh unmark private symbols before processing them.
+    This will help us detect symbols that became public.
 
   [ Rohan Garg ]
   * Make sure we strip out the 'git' keyword when looking for changelogs to install
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
index 445dbdd..53d7159 100755
--- a/debian/mark_private_symbols.sh
+++ b/debian/mark_private_symbols.sh
@@ -50,6 +50,18 @@ 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 

-- 
qtbase packaging