[SCM] qtscript packaging branch, master, updated. debian/5.0.2+dfsg-3-8-g6cfef76

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Sun Jul 14 19:01:38 UTC 2013


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

The following commit has been merged in the master branch:
commit 9deb36e93101242549f2acdf2d9d9ecb5e9011c5
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Jul 14 15:45:19 2013 -0300

    Make libqt5script5 provide qtscript-api-5-1-0.
---
 debian/changelog                  |    4 ++++
 debian/control                    |    1 +
 debian/libqt5script5.symbols      |    1 +
 debian/libqt5scripttools5.symbols |    1 +
 debian/mark_private_symbols.sh    |   30 ++++++++++++++++++++++++++++++
 5 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 153cf59..9c70b49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ qtscript-opensource-src (5.1.0+dfsg-1) UNRELEASED; urgency=low
   * New upstream release.
   * Fix watch file.
   * Bump Qt dependencies to 5.1.0~.
+  * Make libqt5script5 provide qtscript-api-5-1-0.
+    In this way we can know if external packages are using private headers.
+    - Add the necessary options in the symbols file.
+    - Add mark_private_symbols.sh.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 26 Jun 2013 11:22:55 -0300
 
diff --git a/debian/control b/debian/control
index 3906424..6cb2cbb 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtscript.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtscript.git;a=summary
 
 Package: libqt5script5
+Provides: qtscript-abi-5-1-0
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
diff --git a/debian/libqt5script5.symbols b/debian/libqt5script5.symbols
index 26336c5..728955c 100644
--- a/debian/libqt5script5.symbols
+++ b/debian/libqt5script5.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 5.0.2 alpha amd64 armhf hurd-i386 i386 ia64 powerpc s390
 libQt5Script.so.5 libqt5script5 #MINVER#
+| libqt5script5 #MINVER#, qtscript-abi-5-1-0
  _Z14qScriptConnectP7QObjectPKcRK12QScriptValueS5_ at Base 5.0.2
  _Z17qScriptDisconnectP7QObjectPKcRK12QScriptValueS5_ at Base 5.0.2
  _Z5qHashRK13QScriptString at Base 5.0.2
diff --git a/debian/libqt5scripttools5.symbols b/debian/libqt5scripttools5.symbols
index 23304e2..4236edf 100644
--- a/debian/libqt5scripttools5.symbols
+++ b/debian/libqt5scripttools5.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 5.0.2 amd64
 libQt5ScriptTools.so.5 libqt5scripttools5 #MINVER#
+| libqt5scripttools5 #MINVER#, qtscript-abi-5-1-0
  _ZN21QScriptEngineDebugger11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.0.2
  _ZN21QScriptEngineDebugger11qt_metacastEPKc at Base 5.0.2
  _ZN21QScriptEngineDebugger16staticMetaObjectE at Base 5.0.2
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
new file mode 100755
index 0000000..1c80325
--- /dev/null
+++ b/debian/mark_private_symbols.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+PRIVATE_HEADERS=qtscript5-private-dev/usr/include
+
+error() {
+	echo $@
+	exit 1
+}
+
+debug() {
+	[ -n "${DEBUG}" ] && echo $@
+}
+
+if [ ! -e "${PRIVATE_HEADERS}" ] 
+then
+	error "Private headers not found"
+fi
+
+grep -rh class ${PRIVATE_HEADERS} | 
+	grep EXPORT | 
+	while read class export classname rest 
+	do
+		echo ${#classname}${classname} 
+	done | 
+	while read privateclass 
+	do
+		debug marking ${privateclass} as private
+		sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/ 1/" *.symbols 
+	done 
+

-- 
qtscript packaging



More information about the pkg-kde-commits mailing list