[SCM] qtsvg packaging branch, kubuntu_unstable, updated. debian/5.4.2-1

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit acc867089e3b645792eea84a9ce9659d000b5580
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jun 3 18:41:46 2015 -0300

    Use pkgkde-mark-private-symbols from pkg-kde-tools' 0.15.17.
---
 debian/changelog               |  1 +
 debian/control                 |  2 +-
 debian/mark_private_symbols.sh | 90 ------------------------------------------
 debian/rules                   |  4 +-
 4 files changed, 4 insertions(+), 93 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2f5ba1..4307f16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ qtsvg-opensource-src (5.4.2-1) UNRELEASED; urgency=medium
   * Clear up the list in Uploaders removing people who hasn't committed to the
     repo in more than a year. They can re add themselves whenever they want
     (and we really hope to see you back really soon!).
+  * Use pkgkde-mark-private-symbols from pkg-kde-tools' 0.15.17.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 04 Mar 2015 12:52:23 +0000
 
diff --git a/debian/control b/debian/control
index 6cc1e93..795ff4b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
 Build-Depends: dbus,
                debhelper (>= 9),
                libqt5opengl5-dev (>= 5.4.2+dfsg~),
-               pkg-kde-tools,
+               pkg-kde-tools (>= 0.15.17),
                qtbase5-private-dev (>= 5.4.2+dfsg~),
                zlib1g-dev
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.4.2+dfsg~),
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
deleted file mode 100755
index 92bdca4..0000000
--- a/debian/mark_private_symbols.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /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
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# 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/libqt5svg5-private-dev/usr/include
-
-error() {
-	echo $@
-	exit 1
-}
-
-debug() {
-	[ -n "${DEBUG}" ] && echo $@
-}
-
-if [ ! -e "${PRIVATE_HEADERS}" ] 
-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
-
-# 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 
-	do
-		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 60ed66b..09dbe35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,5 +45,5 @@ override_dh_install:
 
 override_dh_makeshlibs:
 	dh_makeshlibs
-	# Check for private symbols not marked as such. Be verbose.
-	DEBUG=1 debian/mark_private_symbols.sh
+	# Check for private symbols not marked as such.
+	pkgkde-mark-private-symbols debian/libqt5svg5-private-dev/usr/include

-- 
qtsvg packaging