[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.4.2+dfsg-2ubuntu1-37-ge7607b0

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 324f8df478ca17ff9e4bc560598539c80fbff125
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Sun Jul 5 12:08:09 2015 +0000

    New changelog entry. Start bringing stashed 5.5 beta packaging changes in.
---
 debian/changelog | 53 +++++++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9f1d73..3441dbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.5.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    (LP: #1437206) (LP: #1450137)
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 24 Mar 2015 13:56:14 +0000
+
 qtbase-opensource-src (5.5.0+dfsg-1) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
@@ -434,7 +441,28 @@ qtbase-opensource-src (5.4.0+dfsg-1) experimental; urgency=medium
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 15 Dec 2014 16:45:50 +0300
 
-<<<<<<< HEAD
+qtbase-opensource-src (5.3.2+dfsg-5) unstable; urgency=medium
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Remove libopenvg1-mesa-dev as a build dependency because mesa does not
+    build it anymore (Closes: #777341).
+    Thanks Andreas Beckmann for the report.
+
+  [ Dmitry Shachnev ]
+  * Fix several DoS vulnerabilities in the image handlers.
+    - CVE-2015-0295, CVE-2015-1858, CVE-2015-1859, CVE-2015-1860.
+    - Closes: #779580.
+  * Fix HTTP upload corruptions when server closes connection.
+  * Use the latest version of debian/mark_private_symbols.sh:
+    - Strip trailing colon from symbols names.
+    - Unmark private symbols before processing them.
+  * Symbols files:
+    - Remove references to ia64 and s390 from the symbols files.
+      Build logs for these architectures are no longer available.
+    - Update for the mark_private_symbols.sh change.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 27 Apr 2015 11:54:20 +0300
+
 qtbase-opensource-src (5.3.2+dfsg-4ubuntu10) vivid; urgency=medium
 
   * control: Drop build-dependency on libopenvg1-mesa-dev which is gone.
@@ -548,29 +576,6 @@ qtbase-opensource-src (5.3.2+dfsg-4ubuntu1) vivid; urgency=medium
   * Restore gles compatibility to symbols
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 24 Oct 2014 12:49:31 +0000
-=======
-qtbase-opensource-src (5.3.2+dfsg-5) unstable; urgency=medium
-
-  [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Remove libopenvg1-mesa-dev as a build dependency because mesa does not
-    build it anymore (Closes: #777341).
-    Thanks Andreas Beckmann for the report.
-
-  [ Dmitry Shachnev ]
-  * Fix several DoS vulnerabilities in the image handlers.
-    - CVE-2015-0295, CVE-2015-1858, CVE-2015-1859, CVE-2015-1860.
-    - Closes: #779580.
-  * Fix HTTP upload corruptions when server closes connection.
-  * Use the latest version of debian/mark_private_symbols.sh:
-    - Strip trailing colon from symbols names.
-    - Unmark private symbols before processing them.
-  * Symbols files:
-    - Remove references to ia64 and s390 from the symbols files.
-      Build logs for these architectures are no longer available.
-    - Update for the mark_private_symbols.sh change.
-
- -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 27 Apr 2015 11:54:20 +0300
->>>>>>> experimental
 
 qtbase-opensource-src (5.3.2+dfsg-4) unstable; urgency=medium
 

-- 
qtbase packaging