Merge lp:~jtaylor/ubuntu/oneiric/qtemu/fix-756221 into lp:ubuntu/oneiric/qtemu

[Julian Taylor]

fixes oneiric build failure

[Didier Roche-Tolomelli (didrocks)]

nice work. Approved :) thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-21 12:54:39 +0000
+++ debian/changelog	2011-07-07 10:03:07 +0000
@@ -1,3 +1,10 @@
+qtemu (2.0~alpha1-1ubuntu4) oneiric; urgency=low
+
+  * debian/patches/fix-no-add-needed-build.patch: (LP: #756221)
+    - add missing link against libQtNetwork required by ld --no-add-needed
+
+ -- Julian Taylor <[e-mail]>  Thu, 07 Jul 2011 11:50:23 +0200
+
 qtemu (2.0~alpha1-1ubuntu3) maverick; urgency=low
 
   * Remove libqt4-webkit-dev from build-depends and add

=== added file 'debian/patches/fix-no-add-needed-build.patch'
--- debian/patches/fix-no-add-needed-build.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-no-add-needed-build.patch	2011-07-07 10:03:07 +0000
@@ -0,0 +1,16 @@
+Description: add missing link against libQtNetwork
+ required when building with ld --no-add-needed
+Author: Julian Taylor <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qtemu/+bug/756221
+Index: qtemu/CMakeLists.txt
+===================================================================
+--- qtemu.orig/CMakeLists.txt	2011-07-07 11:50:21.893973111 +0200
++++ qtemu/CMakeLists.txt	2011-07-07 11:50:20.273973109 +0200
+@@ -212,6 +212,7 @@
+     ${QT_QTDBUS_LIBRARY}
+     ${QT_QTWEBKIT_LIBRARY}
+     ${QT_QTDBUS_LIBRARY}
++    ${QT_QTNETWORK_LIBRARY}
+     ${LIBVNCCLIENT_LIBRARIES}
+ )
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-11-27 10:32:04 +0000
+++ debian/patches/series	2011-07-07 10:03:07 +0000
@@ -1,1 +1,2 @@
 fix-no-kqemu.patch
+fix-no-add-needed-build.patch