[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

Fathi Boudra fabo at alioth.debian.org
Sat Jun 11 11:42:38 UTC 2011


The following commit has been merged in the experimental-snapshots branch:
commit cde1bb538fec9058e1d45deb0e09179f7ce3afdc
Merge: 8e699ef6a92818b306818ec82431d691423fbcc9 34f91cf44952a39eec05da7934592a0c1754b6d2
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Dec 4 22:09:13 2010 +0200

    Merge branch 'experimental-snapshots'
    
    Conflicts:
    	debian/control
    	debian/libqt4-designer.symbols
    	debian/libqt4-dev.install
    	debian/libqt4-multimedia.symbols
    	debian/libqt4-network.symbols
    	debian/libqt4-opengl.symbols
    	debian/libqt4-script.symbols
    	debian/libqt4-test.symbols
    	debian/libqt4-webkit.symbols
    	debian/libqtcore4.install
    	debian/libqtcore4.symbols
    	debian/libqtgui4.symbols
    	debian/patches/0180-window-role.diff
    	debian/patches/0216-allow-isystem-for-headers.diff
    	debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
    	debian/patches/05_append_qt4_target.diff
    	debian/patches/08_configure_quilt_compat.diff
    	debian/patches/10_config_tests_fixes.diff
    	debian/patches/15_fix_qmake_makefile_generation.diff
    	debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
    	debian/patches/20_install_qvfb.diff
    	debian/patches/30_webkit_unaligned_access.diff
    	debian/patches/50_kfreebsd_build_fix.diff
    	debian/patches/81_hurd_architecture.diff
    	debian/patches/82_hurd_SA_SIGINFO.diff
    	debian/patches/92_armel_gcc43_valist_compat.diff
    	debian/patches/96_webkit_no_gc_sections.diff
    	debian/patches/series
    	debian/qt4-dev-tools.install

 debian/changelog                                   |  141 ++
 debian/control                                     |  170 ++-
 debian/copyright                                   |  861 ++++++++++-
 debian/libqt4-assistant.install                    |    1 -
 debian/libqt4-assistant.lintian-overrides          |    2 -
 debian/libqt4-assistant.symbols                    |   38 -
 debian/libqt4-dbus.install                         |    2 +-
 debian/libqt4-dbus.symbols                         |    4 +-
 debian/libqt4-declarative-folderlistmodel.install  |    2 +
 debian/libqt4-declarative-gestures.install         |    2 +
 debian/libqt4-declarative-particles.install        |    2 +
 debian/libqt4-declarative.install                  |    2 +
 debian/libqt4-declarative.lintian-overrides        |    1 +
 debian/libqt4-declarative.symbols                  | 1779 ++++++++++++++++++++
 debian/libqt4-designer.symbols                     |   45 +-
 debian/libqt4-dev.install                          |  197 ++--
 debian/libqt4-help.install                         |    3 +
 debian/libqt4-help.symbols                         |    5 +-
 debian/libqt4-multimedia.install                   |    1 -
 debian/libqt4-multimedia.lintian-overrides         |    1 -
 debian/libqt4-multimedia.symbols                   |  294 ----
 debian/libqt4-network.install                      |    3 +
 debian/libqt4-network.symbols                      |  184 ++-
 debian/libqt4-opengl-dev.install                   |    3 +
 debian/libqt4-opengl.symbols                       |  166 ++-
 debian/libqt4-openvg.install                       |    2 +
 debian/libqt4-openvg.lintian-overrides             |    1 +
 debian/libqt4-openvg.symbols                       |  213 +++
 debian/libqt4-phonon.lintian-overrides             |    2 +-
 debian/libqt4-script.symbols                       |   52 +-
 debian/libqt4-test.symbols                         |    4 +-
 debian/libqt4-webkit.install                       |    2 -
 debian/libqt4-webkit.lintian-overrides             |    2 -
 debian/libqt4-webkit.symbols                       |  865 ----------
 debian/libqtcore4.install                          |    3 +-
 debian/libqtcore4.symbols                          |   62 +-
 debian/libqtgui4.symbols                           |  275 +++-
 debian/not-installed                               |    3 +
 ...04_problem_displaying_half_width_character.diff |   38 -
 .../0005_fix_detection_of_headers_files.diff       |   34 -
 ...06_webkit_propriotary_flash_init_gtk_first.diff |   70 -
 ...cket_improve_error_handling_CVE-2010-2621.patch |   36 -
 debian/patches/0180-window-role.diff               |   10 +-
 ...arget.diff => 01_debian_append_qt4_suffix.diff} |  132 ++-
 debian/patches/01_qmake_for_debian.diff            |   17 -
 debian/patches/0209-prevent-qt-mixing.diff         |    4 +-
 debian/patches/0216-allow-isystem-for-headers.diff |    4 +-
 ...225-invalidate-tabbar-geometry-on-refresh.patch |    2 +-
 debian/patches/02_launch_assistant-qt4.diff        |   25 -
 debian/patches/03_launch_moc-qt4.diff              |   15 -
 debian/patches/04_launch_uic-qt4.diff              |   13 -
 debian/patches/08_configure_quilt_compat.diff      |    2 +-
 debian/patches/10_config_tests_fixes.diff          |   40 +-
 debian/patches/11_build_translations.diff          |   68 +-
 .../patches/15_fix_qmake_makefile_generation.diff  |    2 +-
 .../patches/16_hide_std_symbols_on_qtwebkit.diff   |   10 +-
 debian/patches/17_add_postgresql_8.3_support.diff  |   20 +-
 .../18_enable_qt3support_qtwebkit_debug_info.diff  |    8 +-
 debian/patches/20_install_qvfb.diff                |    3 +-
 debian/patches/21_qt_ia32_library_path.diff        |   12 +-
 debian/patches/22_use___GLIBC__.diff               |   35 +
 debian/patches/30_webkit_unaligned_access.diff     |   62 +-
 debian/patches/40_alpha_ice.diff                   |    6 +-
 debian/patches/41_disable_opengl_visibility.diff   |    4 +-
 debian/patches/50_kfreebsd_Q_OS.diff               |   15 +
 debian/patches/50_kfreebsd_build_fix.diff          |   75 -
 debian/patches/51_kfreebsd_strnstr_build_fix.diff  |   20 +-
 debian/patches/80_hurd_max_path.diff               |   13 +-
 debian/patches/81_hurd_architecture.diff           |   26 -
 debian/patches/82_hurd_SA_SIGINFO.diff             |   19 -
 debian/patches/89_powerpc_opts.diff                |    2 +-
 debian/patches/91_s390_use_gstabs.diff             |    6 +-
 debian/patches/92_armel_gcc43_valist_compat.diff   |    2 +-
 debian/patches/95_sparc_platform_definition.diff   |   23 -
 debian/patches/96_webkit_no_gc_sections.diff       |    6 +-
 debian/patches/series                              |   19 +-
 debian/qt4-demos.lintian-overrides                 |  136 ++-
 debian/qt4-designer.install                        |    2 +
 debian/qt4-dev-tools.install                       |   18 +-
 debian/qt4-qmlviewer.install                       |    1 +
 debian/qt4-qtconfig.install                        |    4 +
 debian/rules                                       |   17 +-
 82 files changed, 4393 insertions(+), 2078 deletions(-)

diff --cc debian/changelog
index bbd8811,a987a65..ed3455a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,89 -1,144 +1,230 @@@
+ qt4-x11 (4:4.7.1-1) UNRELEASED; urgency=low
+ 
+   * New upstream release.
+ 
+   [ Fathi Boudra ]
+   * Remove patches:
+     - 0001_webkit_self_injection_into_qt_configuration.patch - stolen upstream
+     - 0002_fix_qstatictext_with_opengl1_engine.patch - stolen upstream
+     - 0003_add_three_new_style-hints_to_qfont.patch - stolen upstream
+     - 0004_fix_qstatictext_copy_constructor.patch - stolen upstream
+   * Refresh patches.
+   * Update installed files.
+   * Update symbols files.
+ 
+   [ Pino Toscano ]
+   * Rework and replace patch 50_kfreebsd_build_fix.diff with two new patches:
+     - 22_use___GLIBC__.diff: use __GLIBC__ instead of Q_OS_LINUX for GLIBC
+       functions
+     - 50_kfreebsd_Q_OS.diff: define Q_OS_FREEBSD_KERNEL for kFreeBSD
+   * Add a new patch 01_debian_append_qt4_suffix.diff, which contains all the
+     changes for appending the -qt4 suffix to various tools; it is the result
+     of the merge of the following patches (which are removed, as obsolete):
+     - 01_qmake_for_debian.diff
+     - 02_launch_assistant-qt4.diff
+     - 03_launch_moc-qt4.diff
+     - 04_launch_uic-qt4.diff
+     - 05_append_qt4_target.diff
+ 
+   [ Didier Raboud ]
+   * Cherry-pick "Fix qdbus manpage install. It is misplaced." from unstable.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Oct 2010 14:55:15 +0200
+ 
+ qt4-x11 (4:4.7.0~rc1-1) experimental; urgency=low
+ 
+   * New upstream release.
+   * Remove 0001_add_webkit_qt_config.patch in favor of
+     0001_webkit_self_injection_into_qt_configuration.patch.
+   * Add patches:
+     - 0002_fix_qstatictext_with_opengl1_engine.patch
+       OpenGL1 paint engine transforms text coordinates itself and
+       does not require QStaticText to use device coordinates.
+     - 0003_add_three_new_style-hints_to_qfont.patch
+       Add three new style-hints to QFont to match CSS generic font families.
+     - 0004_fix_qstatictext_copy_constructor.patch
+       Fix QStaticText copy constructor to also copy text option property.
+   * Update debian/control:
+     - bump Standards-Version to 3.9.1 (no changes needed).
+     - add libqt4-assistant and libqt4-webkit-dbg dummy transitional packages.
+   * Update debian/rules:
+     - add -no-openvg configure option.
+   * Refresh patches.
+   * Update installed files.
+   * Update symbols files.
+ 
+  -- Fathi Boudra <fabo at debian.org>  Thu, 26 Aug 2010 19:54:00 +0300
+ 
+ qt4-x11 (4:4.7.0~beta2-3) experimental; urgency=low
+ 
+   * Add 0001_add_webkit_qt_config.patch to load modules .pri files.
+     Fix the detection of Qt WebKit when shipped standalone.
+   * Update debian/control:
+     - remove references to Debian in package descriptions
+       (derivatives friendly).
+     - add libqtwebkit-dev to libqt4-dev package.
+     - remove libpulse-dev build dependency. It's used to build Phonon.
+ 
+  -- Fathi Boudra <fabo at debian.org>  Tue, 20 Jul 2010 16:55:20 +0300
+ 
+ qt4-x11 (4:4.7.0~beta2-2) experimental; urgency=low
+ 
+   [ Fathi Boudra ]
+   * Remove qt_webkit_version.pri file, installed inconditionaly.
+     It conflicts with qt_webkit_version.pri shipped in Qt WebKit.
+ 
+   [ Modestas Vainius ]
+   * Make libqt4-dev conflict with libqtwebkit-dev less broad: (<< 2.0~). The
+     latest version which this conflict is supposed to cover is 0~svn29752-1.
+   * Add Breaks (or turn Conflicts into Breaks) next to Replaces as recommended
+     by policy 3.9.0.
+   * Remove conflicts against old (predating etch) qt-x11-free (Qt3) packages.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 13 Jul 2010 16:20:28 +0300
+ 
+ qt4-x11 (4:4.7.0~beta2-1) experimental; urgency=low
+ 
+   * New upstream release.
+   * Remove Qt Multimedia, Qt MediaServices and Qt WebKit packages.
+   * Remove Debian patches:
+     - 81_hurd_architecture.diff - merged upstream.
+     - 97_alpha_ftbfs_qatomic_alpha_h_types.diff - merged upstream.
+   * Update debian/control:
+     - bump Standards-Version to 3.9.0.
+     - remove libqt4-declarative-widgets package.
+     - add libqt4-declarative-folderlistmodel package.
+     - add libqt4-declarative-gestures package.
+     - add libqt4-webkit dummy transitional package for the libqtwebkit4
+       package.
+   * Update debian/rules:
+     - replace -multimedia by -no-multimedia configure option.
+     - replace -webkit by -no-webkit configure option.
+     - remove leftover directories in override_dh_auto_install target.
+   * Update installed files.
+   * Update symbols files.
+   * Update debian/copyright: include files licensed under a BSD-style license.
+ 
+  -- Fathi Boudra <fabo at debian.org>  Thu, 08 Jul 2010 16:59:50 +0300
+ 
+ qt4-x11 (4:4.7.0~beta1-1) experimental; urgency=low
+ 
+   * New upstream release.
+     - QtAssistant client library removal (libqt4-assistant).
+     - legacy Qt Assistant removal (assistant_adp).
+     - new QtDeclarative module (libqt4-declarative).
+     - new QtMediaServices module (libqt4-mediaservices).
+   * Remove upstream patches:
+     - 0001_qpixmap_load_no_modify_referenced_copies.diff - stolen upstream
+     - 0002_qmake_qfileinfo_absolutepath.diff - stolen upstream
+     - 0003_s390_fix_atomic_ops_related_crashes.diff - stolen upstream
+     - 0004_problem_displaying_half_width_character.diff - stolen upstream
+     - 0005_always_redraw_the_complete_control.diff - stolen upstream
+     - 0006_expand_indicator_would_not_be_displayed.diff - stolen upstream
+   * Remove Debian patches:
+     - 82_hurd_SA_SIGINFO.diff - merged upstream
+     - 95_sparc_platform_definition.diff - merged upstream
+     - 98_alpha_ftbfs_wtf_platform_support.diff - stolen upstream
+   * Refresh Debian patches:
+     - 30_webkit_unaligned_access.diff - partially merged upstream
+   * Update debian/control:
+     - add libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev,
+       libpulse-dev and libxv-dev build dependencies.
+     - add libqt4-declarative, libqt4-mediaservices,
+       libqt4-declarative-$PLUGINS and qt4-qmlviewer packages.
+     - remove libqt4-assistant package.
+   * Update debian/rules:
+     - add -importdir configure option.
+   * Update installed files.
+   * Update symbols files.
+ 
+  -- Fathi Boudra <fabo at debian.org>  Fri, 21 May 2010 10:31:22 +0300
+ 
 +qt4-x11 (4:4.6.3-4) unstable; urgency=high
 +
 +  [ Pino Toscano ]
 +  * Update debian/control:
 +    - make libqtgui4 recommend libcups2, as it dlopen's cups for the printing
 +      support
 +    - drop suggestion of a browser from qt4-doc, as it does not contain any
 +      HTML documentation.
 +
 +  [ Modestas Vainius ]
 +  * Confirm 4.6.3 symbol files on the rest (!amd64) of arches. All symbols
 +    affected are optional. Also remove old stale MISSING symbols in the
 +    process.
 +  * Backport 22_fix_disappearing_cursor.diff patch from 4.7.1 to fix a bug
 +    with mouse cursor disappearing randomly on various widgets (QTreeView,
 +    QListView etc.).
 +  * Add 23_permit_plugins_built_with_future_qt.diff patch to permit loading
 +    plugins built with future version of Qt. This should restore full
 +    compatibility with symbol files. (Closes: #586831)
 +  * Urgency=high due to RC bug fix.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 16 Oct 2010 04:05:32 +0300
 +
 +qt4-x11 (4:4.6.3-3) unstable; urgency=low
 +
 +  * Update debian/control: add missing Replaces libqt4-dev (<< 4:4.6.3-2) to
 +    libqt4-dbus package.
 +  * Update debian/rules: replace -dbus configure option by -dbus-linked to link
 +    against dbus library instead of dlopen it. (Closes: #599224)
 +
 + -- Fathi Boudra <fabo at debian.org>  Wed, 06 Oct 2010 12:57:17 +0300
 +
 +qt4-x11 (4:4.6.3-2) unstable; urgency=low
 +
 +  [ Fathi Boudra ]
 +  * Add upstream patch:
 +    - 0005_fix_detection_of_headers_files.diff
 +      Disable the include generation if a dot which is not followed by [hH]
 +      is found after the last path separator. This implies that dots in
 +      directory names are now ignored, and that files without an extension are
 +      always considered headers (e.g., STL headers and Qt forwarding headers).
 +      (Closes: #586166)
 +    - 0007_qsslsocket_improve_error_handling_CVE-2010-2621.patch
 +      Improve error handling in QSslSocket. (Closes: #587711)
 +  * Fix qdbus manpage install. It is misplaced. (Closes: #588985)
 +
 +  [ Modestas Vainius ]
 +  * Fix debian/control Vcs fields to point to the new location.
 +
 +  [ Sune Vuorela ]
 +  * Steal 0006_webkit_propriotary_flash_init_gtk_first patch from upstream
 +    to make webkit not crash when loading adobe flash plugin.
 +    This is related to a change in flashplugin.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 Sep 2010 09:03:32 +0300
 +
 +qt4-x11 (4:4.6.3-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
 +  [ Modestas Vainius ]
 +  * Expand 96_webkit_no_gc_sections.diff to cover mips(el) as well. Hopefully,
 +    this will make linker less memory demanding and solve out-of-memory
 +    condition on buildds.
 +  * Add usleep(1000) before fork() in QProcess on hppa in order to decrease
 +    failure rate caused by #561203. Hopefully, probablity of the failure
 +    becomes so low that packages do not FBTFS anymore. This hack is just an
 +    ugly but very needed workaround for a common manifestation of the bug in
 +    QProcess (patch 99_hppa_bug561203_decrease_failure_rate.diff).
 +
 +  [ Fathi Boudra ]
 +  * Remove upstream patches:
 +    - 0001_qpixmap_load_no_modify_referenced_copies.diff - stolen upstream 
 +    - 0002_qmake_qfileinfo_absolutepath.diff - stolen upstream 
 +    - 0003_s390_fix_atomic_ops_related_crashes.diff - stolen upstream 
 +    - 0005_always_redraw_the_complete_control.diff - stolen upstream 
 +    - 0006_expand_indicator_would_not_be_displayed.diff - stolen upstream 
 +  * Remove Debian patches:
 +    - 97_alpha_ftbfs_qatomic_alpha_h_types.diff - merged upstream
 +    - 98_alpha_ftbfs_wtf_platform_support.diff - merged upstream
 +  * Refresh Debian patches:
 +    - 05_append_qt4_target.diff
 +    - 30_webkit_unaligned_access.diff
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 08 Jun 2010 09:39:56 +0300
 +
  qt4-x11 (4:4.6.2-5) unstable; urgency=low
  
    [ Modestas Vainius ]
diff --cc debian/control
index 8ac96a8,9957270..3cd9bd4
--- a/debian/control
+++ b/debian/control
@@@ -8,16 -8,18 +8,18 @@@ Build-Depends: debhelper (>= 7.4.13), q
   libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
   libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev,
   libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
-  libgtk2.0-dev, libice-dev, unixodbc-dev, libjpeg-dev, libmng-dev,
-  libmysqlclient-dev, libpam0g-dev, libpng12-dev, libpq-dev, libreadline-dev,
-  libsm-dev, libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev,
-  libxcursor-dev, libxext-dev, libxft-dev, libxi-dev, libxinerama-dev,
-  libxmu-dev, libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev,
-  libxtst-dev, zlib1g-dev, freetds-dev
- Standards-Version: 3.8.4
+  libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgtk2.0-dev,
+  libice-dev, unixodbc-dev, libjpeg-dev, libmng-dev, libmysqlclient-dev,
+ # libopenvg1-mesa-dev,
+  libpam0g-dev, libpng12-dev, libpq-dev, libreadline-dev, libsm-dev,
+  libsqlite0-dev, libsqlite3-dev, libtiff4-dev, libx11-dev, libxcursor-dev,
+  libxext-dev, libxft-dev, libxi-dev, libxinerama-dev, libxmu-dev,
+  libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev, libxtst-dev,
+  libxv-dev, zlib1g-dev, freetds-dev
+ Standards-Version: 3.9.1
  Homepage: http://www.qtsoftware.com
 -Vcs-Git: git://git.debian.org/pkg-kde/qt4-x11.git
 -Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt4-x11.git;a=summary
 +Vcs-Git: git://git.debian.org/pkg-kde/qt/qt4-x11.git
 +Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=summary
  
  Package: libqtcore4
  Architecture: any
@@@ -45,8 -47,9 +47,9 @@@ Description: transitional package for Q
  Package: libqtgui4
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}, fontconfig
 -Recommends: qt4-qtconfig
 +Recommends: libcups2, qt4-qtconfig
- Conflicts: libqt4-designer (<< 4.4.0~beta1-1)
+ Breaks: libqt4-core (<< 4.0.1-3), libqt4-gui (<< 4.4.0),
+  qt4-designer (<< 4.1.4), libqt4-designer (<< 4.4.0~beta1-1)
  Replaces: libqt4-core (<< 4.0.1-3), libqt4-gui (<< 4.4.0),
   qt4-designer (<< 4.1.4), libqt4-designer (<< 4.4.0~beta1-1)
  Description: Qt 4 GUI module
@@@ -248,7 -254,8 +254,8 @@@ Description: Qt 4 XML patterns modul
  Package: libqt4-dbus
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}
 -Breaks: libqt4-core (<< 4.4.0~beta1-1)
 -Replaces: libqt4-core (<< 4.4.0~beta1-1)
 +Replaces: libqt4-core (<< 4.4.0~beta1-1), libqt4-dev (<< 4:4.6.3-2)
++Breaks: libqt4-core (<< 4.4.0~beta1-1), libqt4-dev (<< 4:4.6.3-2)
  Description: Qt 4 D-Bus module
   Qt is a cross-platform C++ application framework. Qt's primary feature
   is its rich set of widgets that provide standard GUI functionality.
diff --cc debian/libqt4-dev.install
index 940c7cd,5f1b663..c576f03
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@@ -2394,32 -2450,6 +2450,7 @@@ usr/include/qt4/QtHelp/qhelpindexwidget
  usr/include/qt4/QtHelp/qhelpsearchengine.h
  usr/include/qt4/QtHelp/qhelpsearchquerywidget.h
  usr/include/qt4/QtHelp/qhelpsearchresultwidget.h
- usr/include/qt4/QtMultimedia/QAbstractAudioDeviceInfo
- usr/include/qt4/QtMultimedia/QAbstractAudioInput
- usr/include/qt4/QtMultimedia/QAbstractAudioOutput
- usr/include/qt4/QtMultimedia/QAbstractVideoBuffer
- usr/include/qt4/QtMultimedia/QAbstractVideoSurface
 +usr/include/qt4/QtMultimedia/QAudio
- usr/include/qt4/QtMultimedia/QAudioDeviceInfo
- usr/include/qt4/QtMultimedia/QAudioEngineFactoryInterface
- usr/include/qt4/QtMultimedia/QAudioEnginePlugin
- usr/include/qt4/QtMultimedia/QAudioFormat
- usr/include/qt4/QtMultimedia/QAudioInput
- usr/include/qt4/QtMultimedia/QAudioOutput
- usr/include/qt4/QtMultimedia/QVideoFrame
- usr/include/qt4/QtMultimedia/QVideoSurfaceFormat
- usr/include/qt4/QtMultimedia/QtMultimedia
- usr/include/qt4/QtMultimedia/qabstractvideobuffer.h
- usr/include/qt4/QtMultimedia/qabstractvideosurface.h
- usr/include/qt4/QtMultimedia/qaudio.h
- usr/include/qt4/QtMultimedia/qaudiodeviceinfo.h
- usr/include/qt4/QtMultimedia/qaudioengine.h
- usr/include/qt4/QtMultimedia/qaudioengineplugin.h
- usr/include/qt4/QtMultimedia/qaudioformat.h
- usr/include/qt4/QtMultimedia/qaudioinput.h
- usr/include/qt4/QtMultimedia/qaudiooutput.h
- usr/include/qt4/QtMultimedia/qvideoframe.h
- usr/include/qt4/QtMultimedia/qvideosurfaceformat.h
  usr/include/qt4/QtNetwork/QAbstractNetworkCache
  usr/include/qt4/QtNetwork/QAbstractSocket
  usr/include/qt4/QtNetwork/QAuthenticator
diff --cc debian/libqt4-network.symbols
index 68873ab,59bb850..bc350fe
--- a/debian/libqt4-network.symbols
+++ b/debian/libqt4-network.symbols
@@@ -1,8 -1,8 +1,8 @@@
- # SymbolsHelper-Confirmed: 4:4.6.3 alpha amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips powerpc s390 sparc
+ # SymbolsHelper-Confirmed: 4:4.7.1 amd64
  libQtNetwork.so.4 libqt4-network #MINVER#
  * Build-Depends-Package: libqt4-dev
 - _Z19qt_qhostinfo_lookupRK7QStringP7QObjectPKcPbPi at Base 4:4.7.0~beta1
 + _Z19qt_qhostinfo_lookupRK7QStringP7QObjectPKcPbPi at Base 4:4.6.3
-  _Z24qt_qhostinfo_clear_cachev at Base 4:4.6.3
+  _Z35qNetworkConfigurationManagerPrivatev at Base 4:4.7.0~beta1
   _Z5qHashRK12QHostAddress at Base 4:4.5.3
   _Z8qWarningv at Base 4:4.5.3
   _ZN10QByteArray4dataEv at Base 4:4.5.3
@@@ -325,7 -339,8 +339,8 @@@
   _ZN15QAbstractSocketD1Ev at Base 4:4.5.3
   _ZN15QAbstractSocketD2Ev at Base 4:4.5.3
   (optional=external|arch=armel hppa sparc)_ZN15QBasicAtomicInt3refEv at Base 4:4.5.3
 - (optional=external|arch=armel sparc)_ZN15QBasicAtomicInt5derefEv at Base 4:4.5.3
 + (optional=external|arch=sparc)_ZN15QBasicAtomicInt5derefEv at Base 4:4.5.3
+  _ZN15QNetworkRequest11setPriorityENS_8PriorityE at Base 4:4.7.0~beta1
   _ZN15QNetworkRequest12setAttributeENS_9AttributeERK8QVariant at Base 4:4.5.3
   _ZN15QNetworkRequest12setRawHeaderERK10QByteArrayS2_ at Base 4:4.5.3
   _ZN15QNetworkRequest19setSslConfigurationERK17QSslConfiguration at Base 4:4.5.3
@@@ -606,7 -718,7 +718,7 @@@
   _ZN7QSslKeyD1Ev at Base 4:4.5.3
   _ZN7QSslKeyD2Ev at Base 4:4.5.3
   _ZN7QSslKeyaSERKS_ at Base 4:4.5.3
-  (optional=external|arch=armel)_ZN7QString5clearEv at Base 4:4.6.3
 - _ZN7QString5clearEv at Base 4:4.7.1
++ (optional=external)_ZN7QString5clearEv at Base 4:4.6.3
   _ZN8QUrlInfo10setSymLinkEb at Base 4:4.5.3
   _ZN8QUrlInfo11greaterThanERKS_S1_i at Base 4:4.5.3
   _ZN8QUrlInfo11setLastReadERK9QDateTime at Base 4:4.5.3
diff --cc debian/libqt4-opengl.symbols
index 2c17bda,34cfc8f..a545a6e
--- a/debian/libqt4-opengl.symbols
+++ b/debian/libqt4-opengl.symbols
@@@ -264,17 -312,18 +312,18 @@@ libQtOpenGL.so.4 libqt4-opengl #MINVER
   _ZN17QGL2PaintEngineExD0Ev at Base 4:4.6.1
   _ZN17QGL2PaintEngineExD1Ev at Base 4:4.6.1
   _ZN17QGL2PaintEngineExD2Ev at Base 4:4.6.1
-  _ZN17QGLGraphicsSystemC1Ev at Base 4:4.5.3
-  _ZN17QGLGraphicsSystemC2Ev at Base 4:4.5.3
+  _ZN17QGLContextPrivate14extensionFuncsEPK10QGLContext at Base 4:4.7.0~rc1
+  _ZN17QGLGraphicsSystemC1Eb at Base 4:4.7.0~beta2
+  _ZN17QGLGraphicsSystemC2Eb at Base 4:4.7.0~beta2
   _ZN17QGLGraphicsSystemD0Ev at Base 4:4.5.3
   _ZN17QGLGraphicsSystemD1Ev at Base 4:4.5.3
 - _ZN18QGLContextResource5valueEPK10QGLContext at Base 4:4.7.0~beta1
 - _ZN18QGLContextResource6insertEPK10QGLContextPv at Base 4:4.7.0~beta1
 - _ZN18QGLContextResource7cleanupEPK10QGLContextPv at Base 4:4.7.0~beta1
 - _ZN18QGLContextResourceC1EPFvPvE at Base 4:4.7.0~beta1
 - _ZN18QGLContextResourceC2EPFvPvE at Base 4:4.7.0~beta1
 - _ZN18QGLContextResourceD1Ev at Base 4:4.7.0~beta1
 - _ZN18QGLContextResourceD2Ev at Base 4:4.7.0~beta1
 + _ZN18QGLContextResource5valueEPK10QGLContext at Base 4:4.6.3
 + _ZN18QGLContextResource6insertEPK10QGLContextPv at Base 4:4.6.3
 + _ZN18QGLContextResource7cleanupEPK10QGLContextPv at Base 4:4.6.3
 + _ZN18QGLContextResourceC1EPFvPvE at Base 4:4.6.3
 + _ZN18QGLContextResourceC2EPFvPvE at Base 4:4.6.3
 + _ZN18QGLContextResourceD1Ev at Base 4:4.6.3
 + _ZN18QGLContextResourceD2Ev at Base 4:4.6.3
   _ZN18QTextureGlyphCacheD0Ev at Base 4:4.6.1
   _ZN18QTextureGlyphCacheD1Ev at Base 4:4.6.1
   _ZN18QTextureGlyphCacheD2Ev at Base 4:4.6.1
diff --cc debian/libqt4-script.symbols
index 68e80ac,69eed8c..26d2172
--- a/debian/libqt4-script.symbols
+++ b/debian/libqt4-script.symbols
@@@ -236,20 -279,20 +279,20 @@@ libQtScript.so.4 libqt4-script #MINVER
   _ZN24QScriptSyntaxCheckResultD1Ev at Base 4:4.5.3
   _ZN24QScriptSyntaxCheckResultD2Ev at Base 4:4.5.3
   _ZN24QScriptSyntaxCheckResultaSERKS_ at Base 4:4.5.3
 - (optional=private|arch=!amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate11atStatementERKN5QTJSC17DebuggerCallFrameEiii at Base 4:4.6.1
 - _ZN25QScriptEngineAgentPrivate11atStatementERKN5QTJSC17DebuggerCallFrameEli at Base 4:4.7.0~beta1
 - (optional=private|arch=!amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEii at Base 4:4.6.1
 - (optional=private|arch=amd64 ia64 kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEli at Base 4:4.6.1
 - (optional=private|arch=!amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEi at Base 4:4.6.1
 - (optional=private|arch=amd64 ia64 kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEl at Base 4:4.6.1
 - (optional=private|arch=!amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEi at Base 4:4.6.1
 - (optional=private|arch=amd64 ia64 kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEl at Base 4:4.6.1
 - (optional=private|arch=!amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEi at Base 4:4.6.1
 - (optional=private|arch=amd64 ia64 kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEl at Base 4:4.6.1
 - (optional=private|arch=!amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameEib at Base 4:4.6.1
 - (optional=private|arch=amd64 ia64 kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameElb at Base 4:4.6.1
 - (optional=private|arch=!amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate18didReachBreakpointERKN5QTJSC17DebuggerCallFrameEiii at Base 4:4.6.1
 - _ZN25QScriptEngineAgentPrivate18didReachBreakpointERKN5QTJSC17DebuggerCallFrameEli at Base 4:4.7.0~beta1
 + (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate11atStatementERKN5QTJSC17DebuggerCallFrameEiii at Base 4:4.6.1
-  (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate11atStatementERKN5QTJSC17DebuggerCallFrameElii at Base 4:4.6.1
++ (optional=private)_ZN25QScriptEngineAgentPrivate11atStatementERKN5QTJSC17DebuggerCallFrameEli at Base 4:4.7.0~beta1
 + (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEii at Base 4:4.6.1
 + (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEli at Base 4:4.6.1
 + (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEi at Base 4:4.6.1
 + (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEl at Base 4:4.6.1
 + (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEi at Base 4:4.6.1
 + (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEl at Base 4:4.6.1
 + (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEi at Base 4:4.6.1
 + (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEl at Base 4:4.6.1
 + (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameEib at Base 4:4.6.1
 + (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameElb at Base 4:4.6.1
 + (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate18didReachBreakpointERKN5QTJSC17DebuggerCallFrameEiii at Base 4:4.6.1
-  (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64)_ZN25QScriptEngineAgentPrivate18didReachBreakpointERKN5QTJSC17DebuggerCallFrameElii at Base 4:4.6.1
++ (optional=private)_ZN25QScriptEngineAgentPrivate18didReachBreakpointERKN5QTJSC17DebuggerCallFrameEli at Base 4:4.7.0~beta1
   (optional=private)_ZN25QScriptEngineAgentPrivate6attachEv at Base 4:4.6.1
   (optional=private)_ZN25QScriptEngineAgentPrivate6detachEv at Base 4:4.6.1
   _ZN28QScriptClassPropertyIteratorC1ERK12QScriptValue at Base 4:4.5.3
diff --cc debian/libqtgui4.symbols
index 6cb76c9,b6506f5..2d33834
--- a/debian/libqtgui4.symbols
+++ b/debian/libqtgui4.symbols
@@@ -766,8 -784,9 +784,9 @@@ libQtGui.so.4 libqtgui4 #MINVER
   (subst)_ZN11QFontEngine16addOutlineToPathE{qreal}{qreal}RK12QGlyphLayoutP12QPainterPath6QFlagsIN9QTextItem10RenderFlagEE at Base 4:4.5.3
   _ZN11QFontEngine16alphaMapForGlyphEj at Base 4:4.5.3
   _ZN11QFontEngine16alphaMapForGlyphEjRK10QTransform at Base 4:4.5.3
 - _ZN11QFontEngine16getGlyphBearingsEjPdS0_ at Base 4:4.7.0~beta1
 + (subst)_ZN11QFontEngine16getGlyphBearingsEjP{qreal}S0_ at Base 4:4.6.3
   _ZN11QFontEngine16getUnscaledGlyphEjP12QPainterPathP15glyph_metrics_t at Base 4:4.5.3
+  _ZN11QFontEngine16lastRightBearingERK12QGlyphLayoutb at Base 4:4.7.1
   _ZN11QFontEngine16loadKerningPairsE6QFixed at Base 4:4.5.3
   _ZN11QFontEngine16tightBoundingBoxERK12QGlyphLayout at Base 4:4.5.3
   _ZN11QFontEngine17getGlyphPositionsERK12QGlyphLayoutRK10QTransform6QFlagsIN9QTextItem10RenderFlagEER15QVarLengthArrayIjLi256EERSA_I11QFixedPointLi256EE at Base 4:4.5.3
@@@ -5064,9 -5156,12 +5156,12 @@@
   _ZN20QGraphicsItemPrivate12resolveDepthEv at Base 4:4.6.1
   _ZN20QGraphicsItemPrivate12setPosHelperERK7QPointF at Base 4:4.6.1
   _ZN20QGraphicsItemPrivate13clearSubFocusEP13QGraphicsItem at Base 4:4.6.1
-  _ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEbb at Base 4:4.6.3
+  _ZN20QGraphicsItemPrivate14children_clearEP24QDeclarativeListPropertyI15QGraphicsObjectE at Base 4:4.7.1
+  _ZN20QGraphicsItemPrivate14children_countEP24QDeclarativeListPropertyI15QGraphicsObjectE at Base 4:4.7.0~beta1
+  _ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEbb at Base 4:4.7.0~beta1
+  _ZN20QGraphicsItemPrivate15children_appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ at Base 4:4.7.0~beta1
   _ZN20QGraphicsItemPrivate15resetFocusProxyEv at Base 4:4.6.1
 - _ZN20QGraphicsItemPrivate16clearFocusHelperEb at Base 4:4.7.0~beta1
 + _ZN20QGraphicsItemPrivate16clearFocusHelperEb at Base 4:4.6.3
   _ZN20QGraphicsItemPrivate16setEnabledHelperEbbb at Base 4:4.6.1
   _ZN20QGraphicsItemPrivate16setVisibleHelperEbbb at Base 4:4.6.1
   _ZN20QGraphicsItemPrivate18setIsMemberOfGroupEb at Base 4:4.6.1
diff --cc debian/patches/96_webkit_no_gc_sections.diff
index a1f12b3,84f1343..94e05b1
--- a/debian/patches/96_webkit_no_gc_sections.diff
+++ b/debian/patches/96_webkit_no_gc_sections.diff
@@@ -14,7 -14,7 +14,7 @@@ Last-Update: 2010-05-31 (mipsel added
   
   unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 
  -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
 -+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):QMAKE_LFLAGS += -Wl,--gc-sections
 ++unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):QMAKE_LFLAGS += -Wl,--gc-sections
+  linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
   
-  CONFIG(release):!CONFIG(QTDIR_build) {
-      contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+  CONFIG(release):!CONFIG(standalone_package) {
diff --cc debian/patches/series
index 2c90b91,c22c0bd..1caeb15
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -29,8 -19,7 +19,8 @@@
  18_enable_qt3support_qtwebkit_debug_info.diff
  20_install_qvfb.diff
  21_qt_ia32_library_path.diff
- 22_fix_disappearing_cursor.diff
+ 22_use___GLIBC__.diff
 +23_permit_plugins_built_with_future_qt.diff
  30_webkit_unaligned_access.diff
  40_alpha_ice.diff
  41_disable_opengl_visibility.diff
@@@ -42,8 -31,4 +32,5 @@@
  89_powerpc_opts.diff
  91_s390_use_gstabs.diff
  92_armel_gcc43_valist_compat.diff
- 95_sparc_platform_definition.diff
  96_webkit_no_gc_sections.diff
 +99_hppa_bug561203_decrease_failure_rate.diff
diff --cc debian/qt4-dev-tools.install
index 4f663e4,60da462..5c4e44e
--- a/debian/qt4-dev-tools.install
+++ b/debian/qt4-dev-tools.install
@@@ -13,13 -12,7 +12,8 @@@ usr/bin/qvf
  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_cs.qm
 +usr/share/qt4/translations/assistant_cs.qm
  usr/share/qt4/translations/assistant_da.qm
  usr/share/qt4/translations/assistant_de.qm
  usr/share/qt4/translations/assistant_fr.qm

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list