[SCM] Qt 4 packaging branch, master, updated. debian/4.8.0-1-46-g8aba5b4
Fathi Boudra
fabo at alioth.debian.org
Tue May 1 10:24:16 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=8aba5b4
The following commit has been merged in the master branch:
commit 8aba5b4d6c7ce5d687c9c1db751d876071ac6c20
Merge: af42a8a3a92832a2e2c46b594f3e5bf228c03f6d 1513b5068f4465b3a30f1ff7bcf40229d8527baa
Author: Fathi Boudra <fathi.boudra at linaro.org>
Date: Tue May 1 13:23:21 2012 +0300
Merge branch 'experimental'
debian/changelog | 107 +++++-
debian/compat | 2 +-
debian/control | 99 ++++-
debian/libqt4-dbus.install | 2 +-
debian/libqt4-dbus.symbols | 50 ++-
debian/libqt4-declarative-folderlistmodel.install | 4 +-
debian/libqt4-declarative-gestures.install | 4 +-
debian/libqt4-declarative-particles.install | 4 +-
debian/libqt4-declarative-shaders.install | 4 +-
debian/libqt4-declarative.install | 7 +-
debian/libqt4-declarative.symbols | 177 +++++++-
debian/libqt4-designer.install | 4 +-
debian/libqt4-designer.symbols | 107 ++++-
debian/libqt4-dev-bin.install | 7 +
debian/libqt4-dev-bin.links | 3 +
...libqt4-dev.manpages => libqt4-dev-bin.manpages} | 0
...libqt4-dev.postinst => libqt4-dev-bin.postinst} | 0
debian/{libqt4-dev.prerm => libqt4-dev-bin.prerm} | 0
debian/libqt4-dev.install | 217 +++++++---
debian/libqt4-dev.links | 3 -
debian/libqt4-help.install | 2 +-
debian/libqt4-help.symbols | 12 +-
debian/libqt4-network.install | 4 +-
debian/libqt4-network.symbols | 73 +++-
debian/libqt4-opengl-dev.install | 10 +-
debian/libqt4-opengl.install | 4 +-
debian/libqt4-opengl.symbols | 121 ++++--
debian/libqt4-phonon.install | 4 +-
debian/libqt4-qt3support.install | 6 +-
debian/libqt4-qt3support.symbols | 40 +-
debian/libqt4-script.install | 4 +-
debian/libqt4-script.symbols | 6 +-
debian/libqt4-scripttools.install | 2 +-
debian/libqt4-scripttools.symbols | 9 +-
debian/libqt4-sql-ibase.install | 2 +-
debian/libqt4-sql-mysql.install | 2 +-
debian/libqt4-sql-odbc.install | 2 +-
debian/libqt4-sql-psql.install | 2 +-
debian/libqt4-sql-sqlite.install | 2 +-
debian/libqt4-sql-sqlite2.install | 2 +-
debian/libqt4-sql-tds.install | 2 +-
debian/libqt4-sql.install | 2 +-
debian/libqt4-sql.symbols | 7 +-
debian/libqt4-svg.install | 6 +-
debian/libqt4-svg.symbols | 3 +-
debian/libqt4-test.install | 2 +-
debian/libqt4-test.symbols | 8 +-
debian/libqt4-xml.install | 2 +-
debian/libqt4-xml.symbols | 8 +-
debian/libqt4-xmlpatterns.install | 2 +-
debian/libqt4-xmlpatterns.symbols | 8 +-
debian/libqtcore4.install | 7 +-
debian/libqtcore4.symbols | 252 +++++++++---
debian/libqtgui4.install | 19 +-
debian/libqtgui4.symbols | 461 ++++++++++++++++----
debian/manpages/lupdate-qt4.1 | 2 +-
debian/manpages/moc-qt4.1 | 6 +-
debian/patches/0195-compositing-properties.diff | 6 +-
debian/patches/01_debian_append_qt4_suffix.diff | 70 ++--
...cqt_sane_timestamp_for_nonexisting_headers.diff | 2 +-
debian/patches/08_configure_quilt_compat.diff | 2 +-
.../patches/12_add_nostrip_for_debug_packages.diff | 2 +-
.../patches/15_fix_qmake_makefile_generation.diff | 2 +-
.../patches/16_hide_std_symbols_on_qtwebkit.diff | 27 +-
.../18_enable_qt3support_qtwebkit_debug_info.diff | 26 +-
debian/patches/20_install_qvfb.diff | 2 +-
.../23_permit_plugins_built_with_future_qt.diff | 2 +-
debian/patches/30_webkit_unaligned_access.diff | 71 +---
debian/patches/40_alpha_ice.diff | 2 +-
debian/patches/41_disable_opengl_visibility.diff | 2 +-
debian/patches/50_kfreebsd_Q_OS.diff | 2 +-
debian/patches/51_kfreebsd_strnstr_build_fix.diff | 8 +-
debian/patches/92_armel_gcc43_valist_compat.diff | 2 +-
debian/patches/96_webkit_no_gc_sections.diff | 14 +-
.../99_hppa_bug561203_decrease_failure_rate.diff | 47 ++-
..._support_for_QT_USE_DRAG_DISTANCE_env_var.patch | 2 +-
...low-QTDIR-to-contain-regex-metacharacters.patch | 82 ----
debian/patches/CVE-2011-3922.patch | 3 +
...pilers_without_--with-fpu_neon_as_default.patch | 43 --
...Fix_fontconfig_usage_in_X11_font_database.patch | 224 ----------
.../Fix_transformIsSimple_in_QGraphicsScene.patch | 43 --
...backend_when_creating_translucent_windows.patch | 33 --
...formance-of-partial-updates-in-raster-win.patch | 110 -----
.../patches/Make_use_of_the_fast_image_paths.patch | 78 ----
.../patches/Micro-optimization_for_QSpanData.patch | 26 --
..._orphaned_file_descriptors_after_printing.patch | 37 ++
..._not_clickable_when_run_under_gnome-shell.patch | 97 ++++
...rash_in_cursorToX_when_new_block_is_added.patch | 30 ++
.../Remove_QtHelp_dependency_on_QtXml.patch | 30 --
.../Some_Optimizations_for_the_gray_raster.patch | 104 -----
..._by_default_to_match_the_behavior_of_GTK+.patch | 53 ---
.../Update_createwindow_in_qgl_x11egl.patch | 38 --
...ng_method_for_QBasicAtomicPointer_on_s390.patch | 26 ++
...6_Add_support_for_ARMv7_atomic_operations.patch | 399 -----------------
.../armv6_Include_explicitly_IT_instructions.patch | 26 --
debian/patches/blacklist-diginotar-cert.diff | 92 ----
debian/patches/fix-format.diff | 25 -
debian/patches/fix_qvfb_build.patch | 18 +
debian/patches/gcc-4.7.diff | 39 +--
debian/patches/openssl_no_ssl2.patch | 129 ------
debian/patches/powerpcspe.diff | 2 +-
.../patches/qt-multiarch-plugin-path-compat.diff | 63 +++
debian/patches/qtdebug_syslog.patch | 4 +-
debian/patches/s390x_jscore.diff | 34 +--
debian/patches/series | 25 +-
debian/patches/sh.diff | 2 +-
debian/qt4-demos.install | 10 +-
debian/qt4-demos.lintian-overrides | 453 +++++++++++++-------
debian/qt4-dev-tools.install | 1 +
debian/rules | 73 +++-
110 files changed, 2276 insertions(+), 2374 deletions(-)
diff --cc debian/changelog
index 24a94b4,6876733..e68f237
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,114 +1,114 @@@
- qt4-x11 (4:4.7.4-4) UNRELEASED; urgency=low
-qt4-x11 (4:4.8.1-0r1) UNRELEASED; urgency=low
++qt4-x11 (4:4.8.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ [ Fathi Boudra ]
+ * Use multiarch for importsdir:
+ - update debian/libqt4-declarative-*.install files.
+ - mark QML plugin packages as Multi-Arch: same.
+ * Re-add patch s390x_jscore.diff to add s390/s390x support in JavaScriptCore.
+ The patch was partly merged in Qt 4.8.
+ * Add CVE-2011-3922.patch: Stack-buffer-overflow in glyph handling.
+
+ [ Felix Geyer ]
+ * Drop fix_ftbfs_format-security.patch, fixed upstream.
+ * Refresh patches for the new upstream version.
+ * Update symbol files.
+ * Add QTBUG-24718_Fix_a_crash_in_cursorToX_when_new_block_is_added.patch,
+ cherry-picked from upstream.
+ * Make it possible to install libqt4-dev from a foreign architecture while
+ having all binaries in the native architecture.
+ - Move binaries from libqt4-dev into the new package libqt4-dev-bin.
+ - Mark libqt4-dev-bin, qt4-qmake and qt4-linguist-tools as
+ Multi-Arch: foreign.
+ * Add a dh_strip call for qt4-bin-dbg instead of moving the debug files
+ manually.
+ - drop mv-qt4-bin-dbg.sh script.
+ - drop elfutils build dependency.
+ * Bump debhelper build-dependency to 9.
+ * Fix hyphen-used-as-minus-sign lintian warnings.
+ * Build the documentation in the dh_auto_build-indep target instead of
+ dh_auto_install.
+ * qt-multiarch-plugin-path-compat.diff: include legacy pre-multiarch qml
+ import path.
+
+ [ Didier Raboud ]
+ * Merge the 4:4.7.4-3 unstable release: drop fix-format.diff, merged
+ upstream.
[ Pino Toscano ]
* Fix build failures with GCC 4.7; patch gcc-4.7.diff. (Closes: #667911)
* Fix atomic support on sparc64, by Aurelien Jarno (thanks!);
patch qt_atomic_sparc64.patch. (Closes: #647265)
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 17 Apr 2012 01:55:05 +0200
- -- Fathi Boudra <fabo at debian.org> Wed, 04 Jan 2012 22:15:56 +0200
++ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 01 May 2012 12:15:56 +0300
+
+ qt4-x11 (4:4.8.0-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ Fathi Boudra ]
+ * Drop patches (stolen upstream):
+ - Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch
+ - Update_createwindow_in_qgl_x11egl.patch
+ - Improve-performance-of-partial-updates-in-raster-win.patch
+ - Fix_transformIsSimple_in_QGraphicsScene.patch
+ - Micro-optimization_for_QSpanData.patch
+ - Some_Optimizations_for_the_gray_raster.patch
+ - Make_use_of_the_fast_image_paths.patch
+ - Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
+ - Take_Xft.hintstyle_by_default_to_match_the_behavior_of_GTK+.patch
+ - Fix_fontconfig_usage_in_X11_font_database.patch
+ - Bug-fix-Allow-QTDIR-to-contain-regex-metacharacters.patch
+ - armv6_Include_explicitly_IT_instructions.patch
+ - armv6_Add_support_for_ARMv7_atomic_operations.patch
+ - s390x_jscore.diff
+ - blacklist-diginotar-cert.diff
+ - Remove_QtHelp_dependency_on_QtXml.patch
+ * Drop openssl_no_ssl2.patch - fixed upstream.
+ * Add patches:
+ - qt-multiarch-plugin-path-compat.diff - include legacy pre-multiarch
+ plugin path.
+ - fix_ftbfs_format-security.patch - due to debian/compat bump to 9, Qt is
+ built with -Werror=format-security and trigger an error: format not a
+ string literal and no format arguments.
+ - fix_qvfb_build.patch - fix qvfb build on Qt 4.8.0
+ - QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch
+ - QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_
+ gnome-shell.patch
+ - add_missing_method_for_QBasicAtomicPointer_on_s390.patch
+ * Update debian/compat: bump to 9 for multiarch.
+ * Update debian/control:
+ - mark Qt libraries as Multi-Arch.
+ - build-depends on firebird-dev package. (Closes: #653378)
+ - suggests libthai0 to libqtcore4. (Closes: #652712)
+ - build-depends on elfutils for mv-qt4-bin-dbg.sh script.
+ - build-depends on libicu-dev package.
+ - bump debhelper build-dependency to 8.9.13.
+ - build-depends on dpkg-dev >= 1.16.1.
+ - bump pkg-kde-tools build-dependency to 0.14.2.
+ - recommends imagemagick or gifsicle to qmlviewer.
+ * Update debian/rules:
+ - add DEB_HOST_MULTIARCH support for libdir/plugindir.
+ - remove -qt-gif configure option - removed upstream.
+ - use ts-all target. The ts target has been removed.
+ - call mv-qt4-bin-dbg.sh to move the binaries in qt4-bin-dbg package.
+ - replace LDFLAGS by DEB_LDFLAGS_MAINT_APPEND usage.
+ - add -icu configure option.
+ * Update debian/*.install files:
+ - update paths for multiarch.
+ - headers, translations, qmlplugindump.
+ * Update debian/*.symbol files.
+ * Add mv-qt4-bin-dbg.sh script: with debhelper compat 9, dh_strip puts
+ separated debug symbols in a location based on their build-id. The script
+ moves the debug files for the binaries in the qt4-bin-dbg package.
+
+ [ Pino Toscano ]
+ * Use the hurd-g++ mkspec when building on Hurd:
+ - add mkspecs/hurd-g++/qmake.conf in 01_debian_append_qt4_suffix.diff
+ - update the platform_arg in debian/rules
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 22 Dec 2011 17:50:13 +0200
qt4-x11 (4:4.7.4-3) unstable; urgency=low
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list