[SCM] qt3d packaging branch, master, updated. 824b755f4f679b132eb760af4e946b665851a041

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt3d.git;a=commitdiff;h=22c556a

The following commit has been merged in the master branch:
commit 22c556a7dbb9d279cc4480ed65cc7b79fcb64270
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Dec 17 16:59:20 2013 +0000

    Refresh patches, add DEP-3
---
 debian/patches/link_against_system_zlib.patch      | 2 +-
 debian/patches/workaround_zlib_linking_issue.patch | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/patches/link_against_system_zlib.patch b/debian/patches/link_against_system_zlib.patch
index fde5065..73243be 100644
--- a/debian/patches/link_against_system_zlib.patch
+++ b/debian/patches/link_against_system_zlib.patch
@@ -95,7 +95,7 @@ index 541d46d..d4d95c9 100644
 +
  gcov: SUBDIRS -= sub_tools
  
- # We need opengl, minimum es2 or desktop
+ # We need opengl, minimum es2
 diff --git a/src/threed/threed.pro b/src/threed/threed.pro
 index 793c160..fd992ca 100644
 --- a/src/threed/threed.pro
diff --git a/debian/patches/workaround_zlib_linking_issue.patch b/debian/patches/workaround_zlib_linking_issue.patch
index 946c7d6..64b7484 100644
--- a/debian/patches/workaround_zlib_linking_issue.patch
+++ b/debian/patches/workaround_zlib_linking_issue.patch
@@ -1,3 +1,12 @@
+Description: Workaround build issue by using --no-as-needed
+ The patch workarounds a FTBFS described in a bug report.
+ .
+ Still needed with the latest Qt3d snapshot
+Author: Timo Jyrinki <timo.jyrinki at canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1207340
+Forwarded: no
+Last-Updated: 2013-08-01
+
 diff --git a/src/threed/threed.pro b/src/threed/threed.pro
 index 793c160..682db14 100644
 --- a/src/threed/threed.pro

-- 
qt3d packaging