Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=171db5d
The following commit has been merged in the experimental branch:
commit 171db5de3c546ec6314df43768c16349fa8b2ce6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed May 13 10:07:15 2015 -0300
Use pkgkde-mark-private-symbols instead of mark_private_symbols.sh.
---
debian/changelog | 3 ++
debian/control | 2 +-
debian/mark_private_symbols.sh | 90 ------------------------------------------
debian/rules | 2 +-
4 files changed, 5 insertions(+), 92 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 02d5044..df77323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ qtbase-opensource-src (5.4.1+dfsg-3) UNRELEASED; urgency=medium
(and we really hope to see you back really soon!).
* Split the GTK2 platform theme plugin into a separate package
(Closes: #781148). Thanks Riku Voipio for the patch.
+ * Use pkgkde-mark-private-symbols instead of mark_private_symbols.sh.
+ - Remove the previous script from the package.
+ - Depend on pkg-kde-tools >= 0.15.17.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 05 Mar 2015 10:26:29 +0300
diff --git a/debian/control b/debian/control
index ec3a132..6c16792 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Build-Depends: debhelper (>= 9),
libxkbcommon-dev,
libxkbcommon-x11-dev,
libxrender-dev,
- pkg-kde-tools (>= 0.14.2),
+ pkg-kde-tools (>= 0.15.17),
unixodbc-dev,
zlib1g-dev
Build-Conflicts: libmariadbclient-dev
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
deleted file mode 100755
index 82bcf5a..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/qtbase5-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 9c01027..2ed9843 100755
--- a/debian/rules
+++ b/debian/rules
@@ -320,7 +320,7 @@ override_dh_makeshlibs:
dh_makeshlibs -V
# Check for private symbols not marked as such. Be verbose.
- DEBUG=1 debian/mark_private_symbols.sh
+ pkgkde-mark-private-symbols debian/qtbase5-private-dev/usr/include
override_dh_clean:
dh_clean
--
qtbase packaging