[SCM] qtbase packaging branch, experimental, updated. debian/5.3.0+dfsg-2-3-g100d896

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 48d242b2661e734f8567186b3a8fcec9f1d39862
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu May 22 00:35:43 2014 -0300

    Search for private symbols at build time
---
 debian/changelog               |  6 ++++++
 debian/copyright               |  1 +
 debian/mark_private_symbols.sh | 33 ++++++++++++++++++++++++++++++---
 debian/rules                   |  3 +++
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c7bc27..24a3aed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 qtbase-opensource-src (5.3.0+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Search for private symbols at build time and produce a diff so as to be
+    able to get the changes from build logs.
+    - Modify mark_private_symbols.sh.
+    - Run mark_private_symbols.sh from debian/rules.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 22 May 2014 00:31:54 -0300
 
 qtbase-opensource-src (5.3.0+dfsg-2) experimental; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index ca46ae1..ed5b9bf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,7 @@ License: BSD-3-clause
 
 Files: debian/mark_private_symbols.sh
 Copyright: 2013 Sune Vuorela <sune at debian.org>
+           2014 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 License: Expat
 
 Files: debian/*
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
index e2d74e8..445dbdd 100755
--- a/debian/mark_private_symbols.sh
+++ b/debian/mark_private_symbols.sh
@@ -1,5 +1,6 @@
 #! /bin/sh
 # Copyright (c) 2013 Sune Vuorela <sune at debian.org>
+# Copyright (c) 2014 Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,7 +21,11 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-PRIVATE_HEADERS=qtbase5-private-dev/usr/include
+# Usage:
+# Define DEBUG to see which symbols is being processed.
+# Define WRITERESULTS to actually mark the real symbols files.
+
+PRIVATE_HEADERS=debian/qtbase5-private-dev/usr/include
 
 error() {
 	echo $@
@@ -36,6 +41,15 @@ then
 	error "Private headers not found"
 fi
 
+if [ ! -n "${WRITERESULTS}" ]
+then
+	# Create a backup copy of the original symbols file.
+	for symbols_file in `ls debian/*.symbols`
+	do
+		cp $symbols_file $symbols_file.mps
+	done
+fi
+
 grep -rh class ${PRIVATE_HEADERS} |
 	grep EXPORT | 
 	while read class export classname rest 
@@ -44,7 +58,20 @@ grep -rh class ${PRIVATE_HEADERS} |
 	done | 
 	while read privateclass 
 	do
-		debug marking ${privateclass} as private
-		sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/
 1/" *.symbols 
+		debug Marking ${privateclass} as private
+		if [ -n "${WRITERESULTS}" ]
+		then
+			sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/
 1/" debian/*.symbols
+		else
+			sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/
 1/" debian/*.symbols.mps
+		fi
 	done 
 
+if [ ! -n "${WRITERESULTS}" ]
+then
+	# Diff the symbols files and output it's differences.
+	for symbols_file in `ls debian/*.symbols`
+	do
+		diff -Nau $symbols_file $symbols_file.mps
+	done
+fi
diff --git a/debian/rules b/debian/rules
index 6f393f3..6604af7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -291,6 +291,9 @@ override_dh_makeshlibs:
 		fi \
 	done
 
+	# Check for private symbols not marked as such. Be verbose.
+	DEBUG=1 debian/mark_private_symbols.sh
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 

-- 
qtbase packaging