[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.4.0-2-26-g8359410

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 8359410174023b4b452f33f2edab1bad72d53ad6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Feb 27 14:49:15 2015 +0300

    Unmark private symbols before processing them.
    
    Copied from Lisandro's change in qtbase-opensource-src.
---
 debian/changelog               |  6 ++++--
 debian/mark_private_symbols.sh | 12 ++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8b9dc2..00fe3c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ qtdeclarative-opensource-src (5.4.1-1) UNRELEASED; urgency=medium
     dependencies (like done in qtbase).
   * Fix a typo in libqt5quickparticles5 description (closes: #771570,
     thanks Davide Prina for noticing).
-  * debian/mark-private-symbols.sh: Strip out trailing colon from
-    symbols names.
+  * debian/mark-private-symbols.sh:
+    - Strip out trailing colon from symbols names.
+    - Unmark private symbols before processing them (copied from
+      Lisandro's change in qtbase).
   * Update symbols files:
     - Mark destructors symbols missing with GCC 5 as optional
       (closes: #778087).
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
index 6709344..050db77 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 

-- 
qtdeclarative packaging