[SCM] qtmultimedia packaging branch, kubuntu_unstable, updated. debian/5.5.0-3

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 14e73969016d8f8ea43ea49c053378e34f18af88
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Aug 24 23:04:20 2015 -0300

    Automatically mark private symbols in symbols files.
---
 debian/changelog                        | 2 ++
 debian/libqgsttools-p1.symbols          | 1 +
 debian/libqt5multimedia5.symbols        | 1 +
 debian/libqt5multimediaquick-p5.symbols | 1 +
 debian/libqt5multimediawidgets5.symbols | 1 +
 debian/rules                            | 5 +++++
 6 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a3b7e31..f613429 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ qtmultimedia-opensource-src (5.5.0-1) UNRELEASED; urgency=medium
     for it (Closes: #785874).
   * Update install files.
   * Update symbols files with current build log.
+  * Mark private symbols in symbols files. It should make handling the later
+    much easier.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Aug 2015 20:40:09 -0300
 
diff --git a/debian/libqgsttools-p1.symbols b/debian/libqgsttools-p1.symbols
index 431f9cc..9e7663b 100644
--- a/debian/libqgsttools-p1.symbols
+++ b/debian/libqgsttools-p1.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 5.5.0 amd64
 libqgsttools_p.so.1 libqgsttools-p1 #MINVER#
+| libqgsttools-p1 #MINVER#
  (optional=templinst)_Z17qRegisterMetaTypeI17QGstreamerMessageEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS3_Xaasr12QMetaTypeId2IS3_E7DefinedntsrS8_9IsBuiltInEE11DefinedTypeE at Base 5.4.2
  _Z19qt_gst_pad_get_capsP7_GstPad at Base 5.5.0
  _Z21qt_gst_caps_normalizeP8_GstCaps at Base 5.5.0
diff --git a/debian/libqt5multimedia5.symbols b/debian/libqt5multimedia5.symbols
index b5aa12d..a02a7a0 100644
--- a/debian/libqt5multimedia5.symbols
+++ b/debian/libqt5multimedia5.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 5.5.0 amd64
 libQt5Multimedia.so.5 libqt5multimedia5 #MINVER#
+| libqt5multimedia5 #MINVER#
  _ZN10QRadioData11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.0.2
  _ZN10QRadioData11qt_metacastEPKc at Base 5.0.2
  _ZN10QRadioData14setMediaObjectEP12QMediaObject at Base 5.0.2
diff --git a/debian/libqt5multimediaquick-p5.symbols b/debian/libqt5multimediaquick-p5.symbols
index 3ad3d43..22dccbb 100644
--- a/debian/libqt5multimediaquick-p5.symbols
+++ b/debian/libqt5multimediaquick-p5.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 5.5.0 amd64
 libQt5MultimediaQuick_p.so.5 libqt5multimediaquick-p5 #MINVER#
+| libqt5multimediaquick-p5 #MINVER#
  _ZN12QSGVideoNode23setTexturedRectGeometryERK6QRectFS2_i at Base 5.0.2
  _ZN12QSGVideoNodeC1Ev at Base 5.0.2
  _ZN12QSGVideoNodeC2Ev at Base 5.0.2
diff --git a/debian/libqt5multimediawidgets5.symbols b/debian/libqt5multimediawidgets5.symbols
index e12363c..671c8c5 100644
--- a/debian/libqt5multimediawidgets5.symbols
+++ b/debian/libqt5multimediawidgets5.symbols
@@ -1,5 +1,6 @@
 # SymbolsHelper-Confirmed: 5.4.0 amd64
 libQt5MultimediaWidgets.so.5 libqt5multimediawidgets5 #MINVER#
+| libqt5multimediawidgets5 #MINVER#
  _ZN12QVideoWidget10hueChangedEi at Base 5.0.2
  _ZN12QVideoWidget10paintEventEP11QPaintEvent at Base 5.0.2
  _ZN12QVideoWidget11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.0.2
diff --git a/debian/rules b/debian/rules
index 5111cbf..4efbf5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,11 @@ override_dh_auto_build-indep:
 override_dh_auto_install-arch:
 	dh_auto_install
 
+	# Check for private symbols not marked as such. Be verbose.
+	pkgkde-mark-private-symbols debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimedia/*/QtMultimedia/private
+	pkgkde-mark-private-symbols debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private
+	pkgkde-mark-private-symbols debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimediaQuick_p
+
 	# Remove private headers.
 	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimedia/*/QtMultimedia/private
 	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private/

-- 
qtmultimedia packaging