[SCM] Qt 4 packaging branch, master, updated. debian/4.7.2-4-13-gb33e1a8
Fathi Boudra
fabo at alioth.debian.org
Sat May 7 11:41:16 UTC 2011
The following commit has been merged in the master branch:
commit b33e1a83527fcdf1d19919634d956cf8a0339586
Merge: 9835fd572bf8e0d06e17bf763c274ef77dadc6c4 df2bbfaebe7795081ee7167df52d54afb57c7d34
Author: Fathi Boudra <fabo at debian.org>
Date: Sat May 7 14:39:25 2011 +0300
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-kde/qt/qt4-x11
debian/changelog | 19 +++++++
debian/control | 6 +-
debian/patches/89_powerpc_opts.diff | 14 ------
debian/patches/91_s390_use_gstabs.diff | 24 ---------
.../arm_qbasicatomicint_disable_vol_bitfields.diff | 50 ++++++++++++++++++++
debian/patches/powerpc_designer_gstabs.diff | 29 +++++++++++
debian/patches/series | 4 +-
debian/rules | 5 --
8 files changed, 103 insertions(+), 48 deletions(-)
diff --cc debian/changelog
index 4093e93,e777788..55ff28a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,26 +1,28 @@@
qt4-x11 (4:4.7.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Remove patches:
+ - blacklist_fraudulent_comodo_certificates.diff - stolen upstream
+ [ 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.
+ * Add arm_qbasicatomicint_disable_vol_bitfields.diff patch which disables
+ -fstrict-volatile-bitfields for QBasicAtomicInt::fetchAndStoreOrdered(int)
+ method on arm. This should fix FTBFSes triggered by this inline function.
+ (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).
+
-- Fathi Boudra <fabo at debian.org> Wed, 04 May 2011 13:08:38 +0300
qt4-x11 (4:4.7.2-4) unstable; urgency=low
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list