[SCM] qtxmlpatterns packaging branch, experimental, updated. debian/5.3.0-1-4-g8378201

[Lisandro Damián Nicanor Pérez]

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

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

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

diff --git a/debian/changelog b/debian/changelog
index eb77123..efc4d85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ qtxmlpatterns-opensource-src (5.3.0-2) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Development packages are now Multi-Arch: same.
+  * 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>  Wed, 21 May 2014 23:34:31 -0300
 
diff --git a/debian/copyright b/debian/copyright
index f6a0107..aa824d5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,7 @@ License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
 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 4f09cb1..f9d890a 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=libqt5xmlpatterns5-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/libqt5xmlpatterns5-private-dev/usr/include
 
 error() {
 	echo $@
@@ -36,7 +41,16 @@ then
 	error "Private headers not found"
 fi
 
-grep -rh class ${PRIVATE_HEADERS} | 
+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 
 	do
@@ -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

-- 
qtxmlpatterns packaging