[SCM] qtquick1 packaging branch, experimental, updated. debian/5.2.1-3-5-g47ae535

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 47ae535447792ab045d3bbd61d20b09342b59e94
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu May 29 15:49:48 2014 -0300

    Improve mark_private_symbols.sh. Mark at build time.
---
 debian/changelog               |  2 ++
 debian/mark_private_symbols.sh | 33 ++++++++++++++++++++++++++++++---
 debian/rules                   |  5 +++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bcdc848..737e75b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtquick1-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   * Bump Qt build dependencies.
   * Move headers to their new m-a path. Mark development package as
     Multi-Arch: same.
+  * Improve mark_private_symbols.sh to be able to show private symbols not
+    marked as such at build time. Modify debian/rules accordingly.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 29 May 2014 15:37:13 -0300
 
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
index 2a01ce9..be21bb8 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=qtquick1-5-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/qtquick1-5-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 dd5a737..745e540 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,5 +27,10 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install --fail-missing
 
+override_dh_makeshlibs:
+	dh_makeshlibs
+	# Check for private symbols not marked as such. Be verbose.
+	DEBUG=1 debian/mark_private_symbols.sh
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz

-- 
qtquick1 packaging