[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:43:01 UTC 2011
The following commit has been merged in the experimental-snapshots branch:
commit 8bf1fd85697f78a5625b2c68d4812224e37247b1
Merge: f4b64de150eba4cf693e2541ba387a399a813057 ffa3d71b1055653fca9ae8568aa9c8a01be2c95b
Author: Modestas Vainius <modax at debian.org>
Date: Tue May 17 02:08:27 2011 +0300
Merge commit 'debian/4.6.3-4+squeeze1'
Conflicts:
debian/changelog
debian/changelog | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --cc debian/changelog
index 559453c,7b962d6..8035c5f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,345 -1,16 +1,358 @@@
+qt4-x11 (4:4.7.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Remove blacklist_fraudulent_comodo_certificates.diff - stolen upstream.
+ * Add patches cherry-picked upstream:
+ - Fix_GL_problems_on_stock_1.4_SGX_drivers.patch
+ - Fixed_missing_text_when_using_static_text_items_in_GL_2_engine.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
+ - Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
+ - Prevent_recursion_when_creating_window_surface.patch
+
+ [ Pino Toscano ]
+ * Build depend on libssl-dev. (Closes: #623596)
+
+ [ Modestas Vainius ]
+ * Build with system compiler on s390 (which is 4.6 now). However, in order to
+ avoid #606079, build depend >= g++ 4:4.5 on s390.
+ * Bump Standards-Version to 3.9.2: no changes needed.
+ * Drop blacklist_fraudulent_comodo_certificates.diff patch, upstream.
+ * Refresh patches.
+ * Build depend on g++-4.6 (>= 4.6.0-7~) [armel] and make libqt4-dev break
+ g++-4.6 (<< 4.6.0-7~). (Closes: #625825)
+ * Drop 91_s390_use_gstabs.diff patch. It's no longer needed as webkit is not
+ built from Qt sources anymore.
+ * Drop 89_powerpc_opts.diff patch. No longer needed with gcc 4.4 or later.
+ * Build designer library with -gstabs on powerpc to avoid gcc 4.6 dwarf2 ICE,
+ which makes the package FTBFS (patch powerpc_designer_gstabs.diff).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 04 May 2011 13:08:38 +0300
+
+qt4-x11 (4:4.7.2-4) unstable; urgency=low
+
+ [ José Manuel Santamaría Lema ]
+ * Blacklist a set of fraudulent ssl certificates with the patch
+ blacklist_fraudulent_comodo_certificates.diff.
+ * Fix CVE-2010-3170 (browser wildcard cerficate validation weakness) with
+ cve_2010_3170_ssl_certificates_wildcard.diff. This problem affects the Arora
+ web browser.
+
+ [ Pino Toscano ]
+ * FireBird/ibase:
+ - rules: enable the ibase plugin only if the libqt4-sql-ibase package is
+ enabled for the current architecture (this allows to get rid of an
+ hardcoded list of architectures in rules).
+ - control: synchronize the list of architectures of libqt4-sql-ibase
+ to be the same as the one of the firebird2.1-dev build dependency.
+ This should make libqt4-sql-ibase available to few more architectures.
+ - control: add sh4 to the architectures for libqt4-sql-ibase.
+ (Closes: #623282)
+ * Add patches:
+ - powerpcspe.diff: identify PowerPCSPE as PowerPC. (Closes: #623185)
+ - sh.diff: identify correctly sh4 CPUs. (Closes: #623281)
+ * Update debian/control:
+ - qt4-dev-tools: suggest qt-assistant-compat instead of qt4-dev-tools,
+ as the former now contains the old assistant with uses HTML documentation.
+ * debian/qt4-qmake.links:
+ - stop forcing the "default" symlink of the mkspecs to linux-g++, just let
+ Qt create it according to the platform.
+
+ [ Modestas Vainius ]
+ * Add patch kfreebsd_monotonic_clock.diff which fixes monotonic clock
+ detection on kFreeBSD. This should unbreak QProcess::waitForFinished().
+ (Closes: #624679)
+ * Update symbol files for all debian arches.
+ * Update symbol files for gcc 4.6 on amd64.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 02 May 2011 01:18:05 +0300
+
+qt4-x11 (4:4.7.2-3) unstable; urgency=low
+
+ [ Pino Toscano ]
+ * Change the directory used for the hppa readdir test from doc/html (which
+ gets removed in clean) to doc/src/images.
+ * Set earlier the compiler for s390. (really closes: #606079)
+ * Update Homepage.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 22 Mar 2011 10:21:55 +0100
+
+qt4-x11 (4:4.7.2-2) unstable; urgency=low
+
+ [ Konstantinos Margaritis ]
+ * armhf support. (Closes: #618670)
+ backport from Ubuntu:
+ * http://launchpadlibrarian.net/66374974/x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
+
+ [ Sune Vuorela ]
+ * Use gcc4.5 on s390 (Closes: #606079)
+ * Make qt4-dev-tools conflict with qt3-dev-tools-embedded (due to
+ qvfb). Closes: 617579
+
+ -- Sune Vuorela <sune at debian.org> Sat, 19 Mar 2011 18:00:06 +0100
+
+qt4-x11 (4:4.7.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ [ Modestas Vainius ]
+ * Confirm symbol files on hurd-i386, kfreebsd-amd64, kfreebsd-i386, mips.
+ * Clean up #MISSING symbols because they didn't reappear on any arch.
+
+ [ Fathi Boudra ]
+ * Update installed files.
+ * Remove patches:
+ - 0001_backport_e3f1268_alsa_buffer_overrun.diff - stolen upstream.
+ - 0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff - stolen
+ upstream.
+ - 17_add_postgresql_8.3_support.diff - fixed upstream.
+ - 22_use___GLIBC__.diff - merged upstream.
+ * Add patches:
+ - qtdebug_syslog.patch - send Q_ASSERT, qDebug, qWarning and qFatal
+ messages to syslog.
+ - buildable_appchooser_states_demos.patch - images files aren't shipped
+ (Closes: #616500)
+ * Update symbols files.
+ * Update debian/rules:
+ - remove catalan translation, obsolete and should have been contributed
+ upstream.
+ - pass -opengl desktop and -no-egl configure options. (Closes: #616391)
+ * Update debian/control:
+ - Suggests/Recommends QML plugin packages to libqt4-declarative and
+ qt4-demos packages. (Closes: #597900)
+
+ [ Pino Toscano ]
+ * Add a -qt4 suffix for the shipped icons of assistant, designer, linguist,
+ and qtconfig.
+ * Rename qt4config.desktop to qtconfig-qt4.desktop.
+
+ -- Fathi Boudra <fabo at debian.org> Thu, 03 Mar 2011 20:58:36 +0200
+
+qt4-x11 (4:4.7.1-2) experimental; urgency=low
+
+ [ Pino Toscano ]
+ * libqt4-network.install: specify the single directory with bearer plugins,
+ instead of the single plugins; this avoids build failures due to few
+ bearers being compiled for Linux only. (Closes: #606063)
+ * Update debian/control:
+ - Add qt4-qmlviewer as suggestion for libqt4-declarative and qt4-demos.
+
+ [ Modestas Vainius ]
+ * Confirm symbol files for 4.7.1 on alpha, armel, i386, ia64, mipsel,
+ powerpc, sparc.
+ * Add appropriate Build-Depends-Package field to libqt4-declarative and
+ libqt4-openvg symbol files.
+
+ [ Frederik Schwarzer ]
+ * Add upstream patch
+ 0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff
+ that fixes a crash when using the backspace key under
+ various circumstances. (Closes: #606405)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 18 Dec 2010 18:54:28 +0200
+
+qt4-x11 (4:4.7.1-1) experimental; urgency=low
+
+ * New upstream release. (Closes: #605364)
+
+ [ 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
+ * Demote qt4-qtconfig from recommend to suggest of libqtgui4.
+ (Closes: #599635)
+ * Remove sharutils from Build-Depends, as there is no more need to uudecode
+ binaries at install time.
+
+ [ Modestas Vainius ]
+ * Merge revisions from 4:4.6.3-1 to 4:4.6.3-4:
+ - refresh 23_permit_plugins_built_with_future_qt.diff patch;
+ - bump libqt4-dbus Replaces/Breaks against libqt4-dev to << 4:4.7.1 because
+ 4:4.7.0~rc1-1 still has dbus.1 manpage misplaced;
+ - remove merged patches which were backported from upstream:
+ - 0005_fix_detection_of_headers_files.diff
+ - 0006_webkit_propriotary_flash_init_gtk_first.diff
+ - 0007_qsslsocket_improve_error_handling_CVE-2010-2621.patch
+ - 22_fix_disappearing_cursor.diff
+ * Bump debian/compat to 7. This source package uses dh v7.
+ * Confirm symbol files for 4.7.0~rc1 on alpha armel hurd-i386 i386 ia64
+ kfreebsd-amd64 kfreebsd-i386 mipsel powerpc sparc (based on experimental
+ build logs).
+ * Drop a couple of patches as recommended by Thiago and Jonathan:
+ - 0180-window-role.diff - rejected by upstream, unnecessary KDE apps have
+ names already;
+ - 0209-prevent-qt-mixing.diff - should be dropped;
+ - 0216-allow-isystem-for-headers.diff - mac only skip it;
+ - 09_qmake_lflags_as-needed.diff - configure script supports LDFLAGS
+ nowadays. Drop the patch and export appropriate LDFLAGS in debian/rules
+ instead.
+ * Do not pass --sourcedir=debian/tmp to dh_install anymore. Not needed for
+ compat level 7 or higher.
+ * Remove quilt from Build-Depends. It's no longer needed for source format
+ 3.0 (quilt).
+ * Confirm symbol files for official 4.7.1 on amd64.
+ * 4.7.1 tarball ships with bogus executable bits on some data files in
+ mkspecs, docs, examples and demos subdirs. Remove those -x bits when files
+ are installed to debian/tmp.
+ * Fix formatting error in the qmake-qt4.1 manpage at line 83.
+ * Use dh_auto_* wrappers in place of $(MAKE) within debian/rules in order to
+ get automatic handling of parallel building settings for these calls.
+ * Backport patch 0001_backport_e3f1268_alsa_buffer_overrun.diff to fix
+ potential buffer overrun in ALSA QAudioInput implementation. Thanks to
+ Gregor Herrmann for heads up. (Closes: #603052)
+ * Patch bin/synqt to generate sane timestamp for symlinks of non existing
+ headers. This is needed to avoid timestamp screw up for QtConfig
+ header-symlink file.
+ Patch 02_syncqt_sane_timestamp_for_nonexisting_headers.diff.
+ * Do not run syncqt before ./configure in debian/rules. Simply remove include
+ directory forcing ./configure to run syncqt for us.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 05 Dec 2010 19:50:11 +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+squeeze1) stable; urgency=low
+
+ [ José Manuel Santamaría Lema ]
+ * Blacklist a set of fraudulent ssl certificates; to perform this
+ blacklisting we need these patches:
+ - blacklist_fraudulent_comodo_certificates.diff
+ - ssl_certificate_large_sn.diff
+ * Fix CVE-2010-3170 (browser wildcard cerficate validation weakness) with
+ cve_2010_3170_ssl_certificates_wildcard.diff. This problem affects the Arora
+ web browser.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 17 May 2011 00:26:26 +0300
+
qt4-x11 (4:4.6.3-4) unstable; urgency=high
[ Pino Toscano ]
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list