[SCM] qtsvg packaging branch, kubuntu_unstable, updated. debian/5.4.1-1-2-g62111e3

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit f477f38420f5471f22a40f9d605fa6960432c8da
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Mar 4 09:47:03 2015 +0000

    debian/mark-private-symbols.sh:
    
    * 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 e5e7862..d2671dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ qtsvg-opensource-src (5.4.1-1) UNRELEASED; urgency=medium
   * Bump Qt build-dependencies to 5.4.1.
   * Update watch file to qt.io
   * Mark symbols missing with GCC 5 as optional (Closes: #778094).
+  * 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>  Wed, 04 Mar 2015 07:49:07 +0000
 
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
index cd0fbfa..92bdca4 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 

-- 
qtsvg packaging