[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.2+dfsg-10-10-g3f2077c

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=3f2077c

The following commit has been merged in the experimental branch:
commit 3f2077c474d6f02e34a435036facbc59ebf4a60d
Merge: 52102c0755b949b68b6c03114d2414d12eb144ad 89adde534cfa53e9a866c85a0f318eee7be6dd81
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jan 21 08:38:38 2013 +0000

    Merge branch 'wheezy' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                                   |   22 ++++-
 debian/control                                     |    1 +
 debian/libqt4-designer.symbols                     |    6 +-
 ..._incompatibility_between_openssl_versions.patch |   80 +++++++++++++++
 ...cates-blacklist-mis-issued-Turktrust-cert.patch |  107 ++++++++++++++++++++
 debian/patches/series                              |    2 +
 6 files changed, 214 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 47c7355,5bb102c..261a089
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,22 +1,46 @@@
 +qt4-x11 (4:4.8.4+dfsg-1) UNRELEASED; urgency=low
 +
 +  * New upstream release
 +  * Migrate to use qtchooser for Qt5 co-installation support
 +    - Libraries co-installed, executables managed by qtchooser
 +    - Packages will need build-dep on qt4-default to build against Qt4
 +    - Symlinks left for binaries that had -qt4 via alternatives
 +  * Drop patches that have been merged upstream:
 +    - QElfParser-fix-type-of-sh_size.patch
 +    - Fix-cursor-truncate-to-include-line-position.patch
 +    - qt_atomic_sparc64.patch
 +    - fix_use_after_free_qlocale_unix.patch
 +    - QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch
 +    - disable-SSL-compression-by-default.patch
 +    - fix_jit_crash_on_x86_64.patch
 +    - add_missing_map_noreserve.patch
 +    - make_rules_for_redirect_stricter.patch
 +  * Refresh patches:
 +    - 16_hide_std_symbols_on_qtwebkit.diff
 +    - no_libicu_message.diff
 +  * Update symbols
 +
-  -- Timo Jyrinki <timo at debian.org>  Thu, 17 Jan 2013 12:23:33 +0000
++ -- Timo Jyrinki <timo at debian.org>  Mon, 21 Jan 2013 08:37:04 +0000
++
+ qt4-x11 (4:4.8.2+dfsg-10) unstable; urgency=medium
+ 
+   * Add SSL-certificates-blacklist-mis-issued-Turktrust-cert.patch to blacklist
+     miss issued certificates from Turktrust.
+     - Patch taken from upstream.
+     - Set urgency to medium.
+   * Add Fix_binary_incompatibility_between_openssl_versions.patch to avoid a
+     bug that would cause certificate verification problems if a different
+     version of openssl is loaded at runtime to the headers Qt was compiled
+     against (Closes: #697582).
+     - Patch taken from upstream.
+     - Also deserves setting the urgency to medium.
+   * Confirm symbols files with buildds' logs.
+   * Make libqt4-network recommend ca-certificates. It may be needed if doing
+     SSL stuff and expecting to use certificate chains.
+     Also Qt does not ship certificate bundles anymore but rather uses the
+     system bundle (Closes: #530532).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sat, 19 Jan 2013 16:47:57 -0300
  
  qt4-x11 (4:4.8.2+dfsg-9) unstable; urgency=low
  
diff --cc debian/patches/series
index 273497b,f8cac92..e328e77
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,15 +1,8 @@@
  # upstream patches
  Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
 -QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch
  QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
 -QElfParser-fix-type-of-sh_size.patch
 -Fix-cursor-truncate-to-include-line-position.patch
 -disable-SSL-compression-by-default.patch
 -fix_jit_crash_on_x86_64.patch
 -add_missing_map_noreserve.patch
 -make_rules_for_redirect_stricter.patch
+ SSL-certificates-blacklist-mis-issued-Turktrust-cert.patch
+ Fix_binary_incompatibility_between_openssl_versions.patch
  
  # qt-copy patches
  0195-compositing-properties.diff

-- 
Qt 4 packaging