[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.2.1-5-21-gb8e357a

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 9a520594a0f773429a321b036f38851cbce4af12
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 21 23:23:22 2014 -0300

    Allow the maaintainer to write the symbols file.
---
 debian/mark_private_symbols.sh | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
index 14eeecd..b7295dd 100755
--- a/debian/mark_private_symbols.sh
+++ b/debian/mark_private_symbols.sh
@@ -20,6 +20,10 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+# Usage:
+# Define DEBUG to see which symbols is being processed.
+# Define WRITERESULTS to actually mark the real symbols files.
+
 PRIVATE_HEADERS=debian/qtdeclarative5-private-dev/usr/include
 
 error() {
@@ -36,11 +40,13 @@ then
 	error "Private headers not found"
 fi
 
-# Create a backup copy of the original symbols file.
-for symbols_file in `ls debian/*.symbols`
-do
-	cp $symbols_file $symbols_file.mps
-done
+if [ -n "${WRITERESULTS}" ]
+	# 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 | 
@@ -51,11 +57,17 @@ grep -rh class ${PRIVATE_HEADERS} |
 	while read privateclass 
 	do
 		debug marking ${privateclass} as private
-		sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/
 1/" debian/*.symbols.mps
+		if [ -n "${WRITERESULTS}" ]
+			sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/
 1/" debian/*.symbol
+		else
+			sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/
 1/" debian/*.symbols.mps
+		fi
 	done 
 
-# 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
+if [ -n "${WRITERESULTS}" ]
+	# 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

-- 
qtdeclarative packaging