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

Proposed by Julian Taylor
Status: Merged
Merged at revision: 9
Proposed branch: lp:~jtaylor/ubuntu/oneiric/qtemu/fix-756221
Merge into: lp:ubuntu/oneiric/qtemu
Diff against target: 42 lines (+24/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/fix-no-add-needed-build.patch (+16/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/qtemu/fix-756221
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Ubuntu branches Pending
Review via email: mp+67153@code.launchpad.net

Description of the change

fixes oneiric build failure

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

nice work. Approved :) thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1qtemu (2.0~alpha1-1ubuntu4) oneiric; urgency=low
2
3 * debian/patches/fix-no-add-needed-build.patch: (LP: #756221)
4 - add missing link against libQtNetwork required by ld --no-add-needed
5
6 -- Julian Taylor <jtaylor.debian@googlemail.com> Thu, 07 Jul 2011 11:50:23 +0200
7
1qtemu (2.0~alpha1-1ubuntu3) maverick; urgency=low8qtemu (2.0~alpha1-1ubuntu3) maverick; urgency=low
29
3 * Remove libqt4-webkit-dev from build-depends and add10 * Remove libqt4-webkit-dev from build-depends and add
411
=== 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 @@
1Description: add missing link against libQtNetwork
2 required when building with ld --no-add-needed
3Author: Julian Taylor <jtaylor.debian@googlemail.com>
4Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qtemu/+bug/756221
5Index: qtemu/CMakeLists.txt
6===================================================================
7--- qtemu.orig/CMakeLists.txt 2011-07-07 11:50:21.893973111 +0200
8+++ qtemu/CMakeLists.txt 2011-07-07 11:50:20.273973109 +0200
9@@ -212,6 +212,7 @@
10 ${QT_QTDBUS_LIBRARY}
11 ${QT_QTWEBKIT_LIBRARY}
12 ${QT_QTDBUS_LIBRARY}
13+ ${QT_QTNETWORK_LIBRARY}
14 ${LIBVNCCLIENT_LIBRARIES}
15 )
16
017
=== 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 @@
1fix-no-kqemu.patch1fix-no-kqemu.patch
2fix-no-add-needed-build.patch

Subscribers

People subscribed via source and target branches

to all changes: