[SCM] Qt Assistant compatibility version packaging branch, master, updated. debian/4.6.3-2-5-gbef2a85

Modestas Vainius modax at alioth.debian.org
Sat Mar 19 10:15:38 UTC 2011


The following commit has been merged in the master branch:
commit 969dc6b285a301c7172354d67e7c6656d1dc5e09
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Mar 19 11:58:47 2011 +0200

    Use pkgkde-symbolshelper and fix issues with the symbol file.
    
    (Closes: #617657)
---
 debian/changelog                     |    2 ++
 debian/control                       |    2 +-
 debian/libqtassistantclient4.symbols |   27 ++++++++++++++-------------
 debian/rules                         |    2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0459197..1abe521 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qt-assistant-compat (4.6.3-3) UNRELEASED; urgency=low
 
+  * Use pkgkde-symbolshelper and fix issues with the symbol file.
+    (Closes: #617657)
 
  -- Modestas Vainius <modax at debian.org>  Sat, 19 Mar 2011 11:52:40 +0200
 
diff --git a/debian/control b/debian/control
index 5bca5c4..e664174 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: qt-assistant-compat
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 7.4.15), libqt4-dev (>= 4:4.7.0~)
+Build-Depends: debhelper (>= 7.4.15), libqt4-dev (>= 4:4.7.0~), pkg-kde-tools (>= 0.6)
 Standards-Version: 3.9.1
 Section: devel
 Homepage: http://doc.qt.nokia.com/4.6/qassistantclient.html
diff --git a/debian/libqtassistantclient4.symbols b/debian/libqtassistantclient4.symbols
index c0e3439..44db5e4 100644
--- a/debian/libqtassistantclient4.symbols
+++ b/debian/libqtassistantclient4.symbols
@@ -1,6 +1,7 @@
+# SymbolsHelper-Confirmed: 4.6.3 amd64
 libQtAssistantClient.so.4 libqtassistantclient4 #MINVER#
- _ZN10QByteArrayD1Ev at Base 4.6.3
- _ZN10QByteArrayD2Ev at Base 4.6.3
+ (optional=external)_ZN10QByteArrayD1Ev at Base 4.6.3
+ (optional=external)_ZN10QByteArrayD2Ev at Base 4.6.3
  _ZN16QAssistantClient11qt_metacallEN11QMetaObject4CallEiPPv at Base 4.6.3
  _ZN16QAssistantClient11qt_metacastEPKc at Base 4.6.3
  _ZN16QAssistantClient11socketErrorEv at Base 4.6.3
@@ -22,19 +23,19 @@ libQtAssistantClient.so.4 libqtassistantclient4 #MINVER#
  _ZN16QAssistantClientD0Ev at Base 4.6.3
  _ZN16QAssistantClientD1Ev at Base 4.6.3
  _ZN16QAssistantClientD2Ev at Base 4.6.3
- _ZN4QMapIPK16QAssistantClientP23QAssistantClientPrivateE13detach_helperEv at Base 4.6.3
- _ZN4QMapIPK16QAssistantClientP23QAssistantClientPrivateE6removeERKS2_ at Base 4.6.3
- _ZN5QListI7QStringE13detach_helperEi at Base 4.6.3
- _ZN5QListI7QStringE13detach_helperEv at Base 4.6.3
- _ZN5QListI7QStringE18detach_helper_growEii at Base 4.6.3
- _ZN5QListI7QStringE6appendERKS0_ at Base 4.6.3
- _ZN5QListI7QStringED1Ev at Base 4.6.3
- _ZN5QListI7QStringED2Ev at Base 4.6.3
- _ZN7QStringD1Ev at Base 4.6.3
- _ZN7QStringD2Ev at Base 4.6.3
+ (optional=templinst)_ZN4QMapIPK16QAssistantClientP23QAssistantClientPrivateE13detach_helperEv at Base 4.6.3
+ (optional=templinst)_ZN4QMapIPK16QAssistantClientP23QAssistantClientPrivateE6removeERKS2_ at Base 4.6.3
+ (optional=templinst)_ZN5QListI7QStringE13detach_helperEi at Base 4.6.3
+ (optional=templinst)_ZN5QListI7QStringE13detach_helperEv at Base 4.6.3
+ (optional=templinst)_ZN5QListI7QStringE18detach_helper_growEii at Base 4.6.3
+ (optional=templinst)_ZN5QListI7QStringE6appendERKS0_ at Base 4.6.3
+ (optional=templinst)_ZN5QListI7QStringED1Ev at Base 4.6.3
+ (optional=templinst)_ZN5QListI7QStringED2Ev at Base 4.6.3
+ (optional=external)_ZN7QStringD1Ev at Base 4.6.3
+ (optional=external)_ZN7QStringD2Ev at Base 4.6.3
  _ZNK16QAssistantClient10metaObjectEv at Base 4.6.3
  _ZNK16QAssistantClient6isOpenEv at Base 4.6.3
- _ZNK4QMapIPK16QAssistantClientP23QAssistantClientPrivateE15mutableFindNodeEPPN8QMapData4NodeERKS2_ at Base 4.6.3
+ (optional=templinst)_ZNK4QMapIPK16QAssistantClientP23QAssistantClientPrivateE15mutableFindNodeEPPN8QMapData4NodeERKS2_ at Base 4.6.3
  _ZTI16QAssistantClient at Base 4.6.3
  _ZTS16QAssistantClient at Base 4.6.3
  _ZTV16QAssistantClient at Base 4.6.3
diff --git a/debian/rules b/debian/rules
index 5140c50..9858b12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export QMAKE := /usr/bin/qmake-qt4
 export LRELEASE := /usr/bin/lrelease-qt4
 
 %:
-	dh $@ --parallel --list-missing
+	dh $@ --with=pkgkde-symbolshelper --parallel --list-missing
 
 override_dh_auto_configure:
 	dh_auto_configure

-- 
Qt Assistant compatibility version packaging



More information about the pkg-kde-commits mailing list