[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-37-g829510c
Didier Raboud
odyx at alioth.debian.org
Thu Apr 26 18:59:31 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=1153998
The following commit has been merged in the experimental branch:
commit 1153998704bf7d2b9f7419e04f5f6ef11edb3fd5
Merge: f09b9d72f6159da714d09595eaaaf5c3c950ab2a 078ffa7a46a69024130e851d6c19ca545ebfd4f3
Author: Didier Raboud <odyx at debian.org>
Date: Wed Apr 25 14:23:31 2012 +0200
Merge commit 'debian/4.7.4-3' into experimental
Conflicts:
debian/changelog
debian/control
debian/patches/CVE-2011-3922.patch
debian/patches/series
debian/rules
debian/changelog | 21 +++++++++++++++++++++
debian/control | 5 +++--
debian/patches/series | 3 +++
debian/rules | 4 +++-
4 files changed, 30 insertions(+), 3 deletions(-)
diff --cc debian/changelog
index e577d44,c85f02c..870ccc9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,94 -1,20 +1,115 @@@
+qt4-x11 (4:4.8.1-0r1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ [ Fathi Boudra ]
+ * Revert debian/compat to 8:
+ - drop mv-qt4-bin-dbg.sh script.
+ - drop elfutils build dependency.
+ * 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.
+
++ [ Didier Raboud ]
++ * Merge the 4:4.7.4-3 unstable release: drop fix-format.diff, merged
++ upstream.
++
+ -- Fathi Boudra <fabo at debian.org> Wed, 04 Jan 2012 22:15:56 +0200
+
+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
+
+ * Team upload.
+ * Add CVE-2011-3922.patch: Stack-buffer-overflow in glyph handling.
+
+ [ Pino Toscano ]
+ * Switch the libpng12-dev build dependency to libpng-dev. (Closes: #662484)
+ * Fix build failure with -Werror=format-security (patch fix-format.diff).
+ * Use dpkg-buildflags to set CFLAGS, CXXFLAGS and LDFLAGS and export them;
+ Qt's build system does not support CPPFLAGS, so they are just appended
+ to CFLAGS and CXXFLAGS. (Closes: #657637)
+ * Set the proper section (utils) for qdbus; thanks to Jonas Smedegaard.
+ (Closes: #663079)
+ * Bump Standards-Version to 3.9.3, no changes required.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Sat, 24 Mar 2012 19:25:33 -0300
+
qt4-x11 (4:4.7.4-2) unstable; urgency=low
* Update debian/rules: build documentation in dh_auto_install so it is only
diff --cc debian/control
index 67f88fb,47d71a7..95c295a
--- a/debian/control
+++ b/debian/control
@@@ -806,7 -746,7 +806,8 @@@ Description: Qt 4 Linguist tool
Package: qdbus
Architecture: any
+Multi-Arch: foreign
+ Section: utils
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: libqt4-dbus (<< 4:4.7.4-1)
Replaces: libqt4-dbus (<< 4:4.7.4-1)
diff --cc debian/patches/series
index 78f78e2,a6b9b08..ad6849b
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -39,8 -47,11 +39,11 @@@ powerpcspe.dif
sh.diff
kfreebsd_monotonic_clock.diff
powerpc_designer_gstabs.diff
-armv6_Include_explicitly_IT_instructions.patch
-armv6_Add_support_for_ARMv7_atomic_operations.patch
+qt-multiarch-plugin-path-compat.diff
+fix_qvfb_build.patch
s390x_jscore.diff
+add_missing_method_for_QBasicAtomicPointer_on_s390.patch
+ blacklist-diginotar-cert.diff
+ openssl_no_ssl2.patch
+ Remove_QtHelp_dependency_on_QtXml.patch
CVE-2011-3922.patch
-fix-format.diff
diff --cc debian/rules
index 2d7dc3c,63de657..3694c94
--- a/debian/rules
+++ b/debian/rules
@@@ -3,11 -3,11 +3,13 @@@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
export QTDIR := $(shell pwd)
export PATH := $(QTDIR)/bin:$(PATH)
- export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+ export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
# workaround to use lrelease.
export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
# workaround to use qhelpgenerator.
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list