[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.2-5-5-g87ab30f

Fri May 21 14:35:09 UTC 2010

The following commit has been merged in the experimental-snapshots branch:
commit 87ab30f81a50901aa1f7fc9a985b3db8adb01ff1
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri May 21 17:32:52 2010 +0300

    QtAssistant client library removal (libqt4-assistant).
    legacy Qt Assistant removal (assistant_adp).
---
 debian/changelog                          |    2 +
 debian/control                            |   23 +++--------------
 debian/libqt4-assistant.install           |    1 -
 debian/libqt4-assistant.lintian-overrides |    2 -
 debian/libqt4-assistant.symbols           |   38 -----------------------------
 debian/libqt4-dev.install                 |    7 -----
 debian/qt4-dev-tools.install              |    7 -----
 7 files changed, 6 insertions(+), 74 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 906652c..9a0e395 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qt4-x11 (4:4.7.0~beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    - QtAssistant client library removal (libqt4-assistant).
+    - legacy Qt Assistant removal (assistant_adp).
   * Remove upstream patches:
     - 0001_qpixmap_load_no_modify_referenced_copies.diff - stolen upstream
     - 0002_qmake_qfileinfo_absolutepath.diff - stolen upstream
diff --git a/debian/control b/debian/control
index 98c1d96..41346ed 100644
--- a/debian/control
+++ b/debian/control
@@ -58,7 +58,7 @@ Description: Qt 4 GUI module
 Package: libqt4-gui
 Architecture: any
 Depends: ${misc:Depends}, libqtgui4 (= ${binary:Version}), libqt4-svg (= ${binary:Version}), libqt4-opengl (= ${binary:Version}),
- libqt4-designer (= ${binary:Version}), libqt4-assistant (= ${binary:Version})
+ libqt4-designer (= ${binary:Version})
 Description: transitional package for Qt 4 GUI runtime libraries
  Qt is a cross-platform C++ application framework.  Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -297,18 +297,6 @@ Description: Qt 4 help module
  The QtHelp module provides classes for integrating online documentation in
  applications.
 
-Package: libqt4-assistant
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libqt4-gui (<< 4.4.0~beta1-1)
-Replaces: libqt4-gui (<< 4.4.0~beta1-1)
-Description: Qt 4 assistant module
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- The QtAssistant module provides a means of launching Qt Assistant to provide
- online help.
-
 Package: libqt4-test
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -355,9 +343,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (= ${binary:Version}),
  libqt4-sql (= ${binary:Version}), libqt4-script (= ${binary:Version}),
  libqt4-scripttools (= ${binary:Version}), libqt4-xmlpatterns (= ${binary:Version}),
  libqt4-qt3support (= ${binary:Version}), libqt4-designer (= ${binary:Version}),
- libqt4-help (= ${binary:Version}), libqt4-assistant (= ${binary:Version}),
- libqt4-test (= ${binary:Version}), libqt4-multimedia (= ${binary:Version}),
- qt4-qmake (= ${binary:Version})
+ libqt4-help (= ${binary:Version}), libqt4-test (= ${binary:Version}),
+ libqt4-multimedia (= ${binary:Version}), qt4-qmake (= ${binary:Version})
 Recommends: libqt4-opengl-dev (= ${binary:Version})
 Conflicts: qt3-dev-tools (<= 3:3.3.4-7), libqtwebkit-dev
 Replaces: libqtwebkit-dev, libqt4-opengl-dev (<< 4.4.0-2)
@@ -536,7 +523,5 @@ Description: Qt 4 API documentation (HTML format)
  .
  This package contains the complete Qt 4 API documentation (HTML format).
  .
- The documentation is provided in HTML format; the HTML version can be viewed
- in conjunction with the legacy Qt Assistant (assistant_adp) found in the
- qt4-dev-tools package.
+ The documentation is provided in HTML format.
 
diff --git a/debian/libqt4-assistant.install b/debian/libqt4-assistant.install
deleted file mode 100644
index 1505c24..0000000
--- a/debian/libqt4-assistant.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libQtAssistantClient.so.*
diff --git a/debian/libqt4-assistant.lintian-overrides b/debian/libqt4-assistant.lintian-overrides
deleted file mode 100644
index 5d3aeeb..0000000
--- a/debian/libqt4-assistant.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libqt4-assistant: package-name-doesnt-match-sonames libQtAssistantClient4
-
diff --git a/debian/libqt4-assistant.symbols b/debian/libqt4-assistant.symbols
deleted file mode 100644
index d1b468c..0000000
--- a/debian/libqt4-assistant.symbols
+++ /dev/null
@@ -1,38 +0,0 @@
-# SymbolsHelper-Confirmed: 4:4.6.2 amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc s390 sparc
-libQtAssistantClient.so.4 libqt4-assistant #MINVER#
-* Build-Depends-Package: libqt4-dev
- _ZGVZ13qvariant_castI8QVariantET_RKS0_E3vid at Base 4:4.6.1
- (arch=armel hppa hurd-i386 sparc)_ZN10QByteArrayD1Ev at Base 4:4.5.3
- _ZN16QAssistantClient11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.5.3
- _ZN16QAssistantClient11qt_metacastEPKc at Base 4:4.5.3
- _ZN16QAssistantClient11socketErrorEv at Base 4:4.5.3
- _ZN16QAssistantClient12readStdErrorEv at Base 4:4.5.3
- _ZN16QAssistantClient12setArgumentsERK11QStringList at Base 4:4.5.3
- _ZN16QAssistantClient13openAssistantEv at Base 4:4.5.3
- _ZN16QAssistantClient14closeAssistantEv at Base 4:4.5.3
- _ZN16QAssistantClient15assistantClosedEv at Base 4:4.5.3
- _ZN16QAssistantClient15assistantOpenedEv at Base 4:4.5.3
- _ZN16QAssistantClient15socketConnectedEv at Base 4:4.5.3
- _ZN16QAssistantClient16staticMetaObjectE at Base 4:4.5.3
- _ZN16QAssistantClient22socketConnectionClosedEv at Base 4:4.5.3
- _ZN16QAssistantClient5errorERK7QString at Base 4:4.5.3
- _ZN16QAssistantClient8readPortEv at Base 4:4.5.3
- _ZN16QAssistantClient8showPageERK7QString at Base 4:4.5.3
- _ZN16QAssistantClient9procErrorEN8QProcess12ProcessErrorE at Base 4:4.5.3
- _ZN16QAssistantClientC1ERK7QStringP7QObject at Base 4:4.5.3
- _ZN16QAssistantClientC2ERK7QStringP7QObject at Base 4:4.5.3
- _ZN16QAssistantClientD0Ev at Base 4:4.5.3
- _ZN16QAssistantClientD1Ev at Base 4:4.5.3
- _ZN16QAssistantClientD2Ev at Base 4:4.5.3
- (optional=templinst)_ZN4QMapIPK16QAssistantClientP23QAssistantClientPrivateE11node_createEP8QMapDataPPNS6_4NodeERKS2_RKS4_ at Base 4:4.6.1
- (optional=templinst)_ZN4QMapIPK16QAssistantClientP23QAssistantClientPrivateE13detach_helperEv at Base 4:4.6.1
- (optional=templinst)_ZN4QMapIPK16QAssistantClientP23QAssistantClientPrivateE6removeERKS2_ at Base 4:4.5.3
- (optional=templinst)_ZN5QListI7QStringE13detach_helperEv at Base 4:4.5.3
- (optional=templinst)_ZN5QListI7QStringE4freeEPN9QListData4DataE at Base 4:4.5.3
- (optional=templinst)_ZN5QListI7QStringE6appendERKS0_ at Base 4:4.5.3
- _ZN7QStringD1Ev at Base 4:4.5.3
- _ZNK16QAssistantClient10metaObjectEv at Base 4:4.5.3
- _ZNK16QAssistantClient6isOpenEv at Base 4:4.5.3
- _ZTI16QAssistantClient at Base 4:4.5.3
- _ZTS16QAssistantClient at Base 4:4.5.3
- _ZTV16QAssistantClient at Base 4:4.5.3
diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install
index 93e238d..506c3be 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -1029,10 +1029,6 @@ usr/include/qt4/Qt3Support/q3whatsthis.h
 usr/include/qt4/Qt3Support/q3widgetstack.h
 usr/include/qt4/Qt3Support/q3wizard.h
 usr/include/qt4/Qt3Support/qiconset.h
-usr/include/qt4/QtAssistant/QAssistantClient
-usr/include/qt4/QtAssistant/QtAssistant
-usr/include/qt4/QtAssistant/qassistantclient.h
-usr/include/qt4/QtAssistant/qassistantclient_global.h
 usr/include/qt4/QtCore/QAbstractAnimation
 usr/include/qt4/QtCore/QAbstractConcatenable
 usr/include/qt4/QtCore/QAbstractEventDispatcher
@@ -2749,8 +2745,6 @@ usr/include/qt4/QtXmlPatterns/qxmlschemavalidator.h
 usr/include/qt4/QtXmlPatterns/qxmlserializer.h
 usr/lib/libQt3Support.prl
 usr/lib/libQt3Support.so
-usr/lib/libQtAssistantClient.prl
-usr/lib/libQtAssistantClient.so
 usr/lib/libQtCLucene.prl
 usr/lib/libQtCLucene.so
 usr/lib/libQtCore.prl
@@ -2788,7 +2782,6 @@ usr/lib/libQtXml.so
 usr/lib/libQtXmlPatterns.prl
 usr/lib/libQtXmlPatterns.so
 usr/lib/pkgconfig/Qt3Support.pc
-usr/lib/pkgconfig/QtAssistantClient.pc
 usr/lib/pkgconfig/QtCLucene.pc
 usr/lib/pkgconfig/QtCore.pc
 usr/lib/pkgconfig/QtDBus.pc
diff --git a/debian/qt4-dev-tools.install b/debian/qt4-dev-tools.install
index 71a6493..3d4a067 100644
--- a/debian/qt4-dev-tools.install
+++ b/debian/qt4-dev-tools.install
@@ -1,5 +1,4 @@
 usr/bin/assistant-qt4
-usr/bin/assistant_adp
 usr/bin/lconvert
 usr/bin/linguist-qt4
 usr/bin/pixeltool
@@ -13,12 +12,6 @@ usr/bin/qvfb
 usr/bin/xmlpatterns
 usr/bin/xmlpatternsvalidator
 usr/share/qt4/phrasebooks/*
-usr/share/qt4/translations/assistant_adp_de.qm
-usr/share/qt4/translations/assistant_adp_ja.qm
-usr/share/qt4/translations/assistant_adp_pl.qm
-usr/share/qt4/translations/assistant_adp_ru.qm
-usr/share/qt4/translations/assistant_adp_zh_CN.qm
-usr/share/qt4/translations/assistant_adp_zh_TW.qm
 usr/share/qt4/translations/assistant_da.qm
 usr/share/qt4/translations/assistant_de.qm
 usr/share/qt4/translations/assistant_fr.qm

-- 
Qt 4 Debian packaging

