[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.6+git64-g5dc8b2b+dfsg-3-11-g4975ae9

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 4975ae9955b83f355d4f48f30220812a968ece5a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Apr 8 18:59:53 2015 -0300

    Remove fix_libmng_test.patch
    
    Applied upstream.
---
 debian/changelog                     |  4 +++-
 debian/patches/fix_libmng_test.patch | 24 ------------------------
 debian/patches/series                |  1 -
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f95a3b..81233b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,9 @@ qt4-x11 (4:4.8.6+git155-g716fbae+dfsg-1) UNRELEASED; urgency=medium
   * Remove GStreamer 0.10's build dependencies. The real users of it
     should be using phonon with GStreamer 1.0.
   * Add a note for packagers on qt4-default's long description.
-  * Remove aarch64_arm64_fix_arch_detection.patch, applied upstream.
+  * Remove patches applied upstream:
+    - aarch64_arm64_fix_arch_detection.patch
+    - fix_libmng_test.patch
 
   [ Dmitry Shachnev ]
   * Make qt4-qmake suggest libqtcore4, as that package contains configuration
diff --git a/debian/patches/fix_libmng_test.patch b/debian/patches/fix_libmng_test.patch
deleted file mode 100644
index 330b807..0000000
--- a/debian/patches/fix_libmng_test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Description: Fix libmng test.
- libmng pulls in libjpeg. In turn libjpeg requires that code that uses it should
- include stdio.h [0].
- .
- [0] <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=461602#10>
- .
- So adding the corresponding include before libmng solves the issue.
-Forwarded: https://codereview.qt-project.org/#/c/93061/
-
----
- config.tests/unix/libmng/libmng.cpp |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/config.tests/unix/libmng/libmng.cpp
-+++ b/config.tests/unix/libmng/libmng.cpp
-@@ -39,6 +39,7 @@
- **
- ****************************************************************************/
- 
-+#include <stdio.h>
- #include <libmng.h>
- 
- int main(int, char **)
diff --git a/debian/patches/series b/debian/patches/series
index 78104c4..da7cd60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ xmlpatterns_stack_overflow_fix.diff
 
 # Patches submitted upstream but still not accepted
 aarch64_arm64_qatomic_support.patch
-fix_libmng_test.patch
 
 # qt-copy patches
 0195-compositing-properties.diff

-- 
Qt 4 packaging