[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.4.1-1-11-g6cca3a7
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Tue Jun 2 20:28:15 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=dd10d8d
The following commit has been merged in the experimental branch:
commit dd10d8d23907d7301ddb5d078ec0cf7ece669b9e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Tue Jun 2 17:27:29 2015 -0300
Use pkgkde-mark-private-symbols from pkg-kde-tools 0.15.17.
---
debian/changelog | 1 +
debian/control | 2 +-
debian/copyright | 5 ---
debian/mark_private_symbols.sh | 90 ------------------------------------------
debian/rules | 2 +-
5 files changed, 3 insertions(+), 97 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a1b3cb4..b198443 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ qtdeclarative-opensource-src (5.4.2-1) UNRELEASED; urgency=medium
* Expose HTML documentation in /usr/share/doc (Closes: #751176).
* Make libqt5qml5 recommend libgl1-mesa-glx to get QML stuff properly
rendered (Closes: #779581).
+ * Use pkgkde-mark-private-symbols from pkg-kde-tools 0.15.17.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 05 Mar 2015 14:58:50 +0300
diff --git a/debian/control b/debian/control
index 85fefa9..c53e928 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.16.1),
libdouble-conversion-dev,
libqt5xmlpatterns5-private-dev (>= 5.4.2~),
- pkg-kde-tools (>= 0.15.12~),
+ pkg-kde-tools (>= 0.15.17~),
python,
qtbase5-private-dev (>= 5.4.2+dfsg~)
Standards-Version: 3.9.6
diff --git a/debian/copyright b/debian/copyright
index d08f502..0c4f994 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,11 +8,6 @@ Copyright: 2012-2014 Digia Plc and/or its subsidiary(-ies)
1994-2008 Trolltech ASA.
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-2012 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 050db77..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/qtdeclarative5-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 aa34639..bc19cd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ override_dh_install:
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/qtdeclarative5-private-dev/usr/include
# Requires X so disabled for now
override_dh_auto_test:
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list