[SCM] qtscript packaging branch, experimental, updated. debian/5.4.1+dfsg-3-9-gec1685c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit ec1685cb1734b603fd26d21c75d46d8d24fa6aa7
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Jun 2 17:12:53 2015 -0300

    Use pkgkde-make-private-symbols from pkg-kde-tools 0.15.17.
---
 debian/changelog               |  2 ++
 debian/control                 |  2 +-
 debian/copyright               |  5 ---
 debian/mark_private_symbols.sh | 78 ------------------------------------------
 debian/rules                   |  2 +-
 5 files changed, 4 insertions(+), 85 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 130ea0c..dd09024 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ qtscript-opensource-src (5.4.2+dfsg-1) UNRELEASED; urgency=medium
   * Update symbols files with buildds' logs.
   * Refresh s390x_jscore.diff.
   * Remove ppc64el_jscore.diff, applied upstream.
+  * Use pkgkde-make-private-symbols from pkg-kde-tools 0.15.17.
+    - Drop the relevant entry in debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 08 May 2015 20:52:28 -0300
 
diff --git a/debian/control b/debian/control
index 45358b4..851a713 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
            Dmitry Shachnev <mitya57 at debian.org>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
-               pkg-kde-tools (>= 0.15.8~),
+               pkg-kde-tools (>= 0.15.17~),
                qtbase5-private-dev (>= 5.4.2+dfsg~),
                xauth,
                xvfb
diff --git a/debian/copyright b/debian/copyright
index f470024..b759ca1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,11 +8,6 @@ Files: *
 Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
 License: LGPL-2.1-or-3 with Digia-1.1 exception
 
-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/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2007-2015 Sune Vuorela <debian at pusling.com>
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
deleted file mode 100755
index 512d292..0000000
--- a/debian/mark_private_symbols.sh
+++ /dev/null
@@ -1,78 +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/qtscript5-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
-
-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 c645033..a5d90cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ 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
+	pkgkde-mark-private-symbols debian/qtscript5-private-dev/usr/include
 
 override_dh_auto_test:
 	xvfb-run -a dh_auto_test

-- 
qtscript packaging