[SCM] qtbase packaging branch, experimental, updated. debian/5.2.0-beta1+dfsg-3-14-g1cbf8fe

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=32ee875

The following commit has been merged in the experimental branch:
commit 32ee875a3bb97a60c533f5026261bf0218e14105
Merge: 35a73c132b25110eeedef4daf6986fd6fa48d3f9 95556f10192cffa29f62d8df4266b5855c47258b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Dec 5 14:25:40 2013 -0300

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/libqt5core5.symbols
    	debian/libqt5gui5.symbols
    	debian/libqt5network5.symbols
    	debian/libqt5widgets5.symbols
    	debian/patches/series

 debian/changelog                                   |   9 +
 ...w_deep_or_widely_nested_entity_references.patch | 261 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 3 files changed, 271 insertions(+)

diff --cc debian/changelog
index 84398e3,138116e..052234c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,58 -1,12 +1,67 @@@
 +qtbase-opensource-src (5.2.0~rc1+dfsg-1) UNRELEASED; urgency=low
 +
 +  [ Dmitry Shachnev ]
 +  * Fix two wrongly sorted lines in qtbase5-private-dev.install (thanks Timo).
 +  * Do not list armhf-specific paths in qtbase5-dev.install-armel.
 +
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
 +  * New upstream release.
 +  * Upstream switched qreal to double for all archs. In Debian's case we will only
 +    keep armel and sh4 with qreal as float.
 +  * Update install files.
 +  * Update symbols files, marking private symbols as such.
 +
 + -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Nov 2013 19:31:35 +0400
 +
 +qtbase-opensource-src (5.2.0~beta1+dfsg-3) experimental; urgency=low
 +
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
 +  * Also install KSM/EGL CMake's configuration files for armel:
 +    - Create debian/qtbase5-dev.install-armel.
 +  * Install the QEvdev CMake related files only in Linux, as they are not
 +    present in Hurd.
 +  * Update symbols files.
 +
 + -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Fri, 22 Nov 2013 12:29:39 -0300
 +
 +qtbase-opensource-src (5.2.0~beta1+dfsg-2) experimental; urgency=low
 +
 +  * Install KMS/EGL CMake's configuration files for armhf.
 +    - Create debian/qtbase5-dev.install-armhf.
 +    - Move debian/qtbase5-dev.install to debian/qtbase5-dev.install-common.
 +  * Update symbols files.
 +  * Import upstream's fix_power_atomic_code.patch for fixing PowerPC's FTBFS
 +    (Closes: #729265). Thanks Aurelien Jarno for the patch.
 +  * Import upstream's support_mips_atomic_on_pre-mips32_archs.patch for fixing
 +    MIPS's FTBFS (Closes: #729187). Thanks Aurelien Jarno for the patch.
 +
 + -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 11 Nov 2013 11:22:49 -0300
 +
 +qtbase-opensource-src (5.2.0~beta1+dfsg-1) experimental; urgency=low
 +
 +  [ Dmitry Shachnev ]
 +  * New upstream beta release.
 +  * Drop fix_usr-move_workaround_in_the_presence_of_multi-arch.patch,
 +    applied upstream.
 +  * Update .install files for new upstream release.
 +  * Make libqt5core5 provide qtbase-abi-5-2-0.
 +  * Update symbols files.
 +  * Add myself to Uploaders.
 +
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
 +  * Use newer qtbase-abi-5-2-0 in lintian-overrides files.
 +
 + -- Dmitry Shachnev <mitya57 at gmail.com>  Thu, 31 Oct 2013 20:04:49 +0400
 +
+ qtbase-opensource-src (5.1.1+dfsg-6) unstable; urgency=high
+ 
+   * Backport Disallow_deep_or_widely_nested_entity_references.patch to fix
+     CVE-2013-4549: XML Entity Expansion Denial of Service. Set severity
+     to high.
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 05 Dec 2013 13:43:42 -0300
+ 
  qtbase-opensource-src (5.1.1+dfsg-5) unstable; urgency=low
  
    * Add mips64 and mipsel64 to the list of archs that should use linux-g++
diff --cc debian/patches/series
index a09c2da,22e9ee9..93374e5
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,7 +1,8 @@@
  sha3_64bit_BE.diff
  linux_no_perf.diff
 -fix_usr-move_workaround_in_the_presence_of_multi-arch.patch
  hurd_opengl_incldir.diff
 +fix_power_atomic_code.patch
 +support_mips_atomic_on_pre-mips32_archs.patch
+ Disallow_deep_or_widely_nested_entity_references.patch
  
  # Debian specific.

-- 
qtbase packaging