--- qtemu-2.0~alpha1.orig/debian/watch +++ qtemu-2.0~alpha1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/qtemu/qtemu-(.*)\.tar\.bz2 --- qtemu-2.0~alpha1.orig/debian/rules +++ qtemu-2.0~alpha1/debian/rules @@ -0,0 +1,6 @@ +#!/usr/bin/make -f + +%: + dh --with quilt $@ + +.PHONY: dh_auto_test --- qtemu-2.0~alpha1.orig/debian/control +++ qtemu-2.0~alpha1/debian/control @@ -0,0 +1,21 @@ +Source: qtemu +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian KDE Extras Team +Uploaders: Fathi Boudra , Mark Purcell +Build-Depends: debhelper (>= 7.3), cmake, quilt, libqt4-dev, libqtwebkit-dev, libvncserver-dev (>= 0.9.7) +Standards-Version: 3.8.2 +Homepage: http://qtemu.org +Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/qtemu?op=log +Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/qtemu/ + +Package: qtemu +Architecture: amd64 arm armel i386 powerpc kfreebsd-i386 kfreebsd-amd64 sparc +Depends: ${shlibs:Depends}, ${misc:Depends}, qemu +Suggests: sudo, iproute, net-tools, bridge-utils, uml-utilities +Description: graphical user interface for QEMU + QtEmu is a graphical user interface for QEMU written in Qt4. It has the + ability to run virtual operating systems on native systems. This way you can + easily test a new operating system or try a Live CD on your system without any + troubles and dangers. --- qtemu-2.0~alpha1.orig/debian/changelog +++ qtemu-2.0~alpha1/debian/changelog @@ -0,0 +1,109 @@ +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 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 + libqtwebkit-dev for qtwebkit transition + + -- Kiszel Kristóf Wed, 21 Jul 2010 12:54:39 +0200 + +qtemu (2.0~alpha1-1ubuntu2) maverick; urgency=low + + * Add build-dep on libqt4-webkit-dev. + + -- Felix Geyer Sat, 22 May 2010 18:42:00 +0200 + +qtemu (2.0~alpha1-1ubuntu1) lucid; urgency=low + + * Add quilt support. + * debian/patches/fix-no-kqemu.patch: + - Patch from upstream trunk to fix missing --no-kqemu/--kernel-kqemu. + + -- Maia Kozheva Fri, 27 Nov 2009 10:32:04 +0600 + +qtemu (2.0~alpha1-1) experimental; urgency=low + + * New upstream release. + + [Ana Beatriz Guerrero Lopez] + * Add to the list of Architectures: arm, armel and sparc. + That are also supported by qemu. (Closes: #520206) + + [Fathi Boudra] + * Remove debian/patches: merged upstream. + * Bump debian/compat from 6 to 7. + * Update debian/control: + - Remove cdbs and sharutils build dependencies. + - Add libvncserver-dev (>= 0.9.7) build dependency. + - Bump debhelper version to 7.3. + - Add Vcs-Browser and Vcs-Svn fields. + - Add Suggests: Suggests: sudo, iproute, net-tools, bridge-utils and + uml-utilities. + * Update debian/copyright: keep up-to-date. + * Remove debian/install: not needed anymore since Debian packaging doesn't + provide qtemu.desktop and qtemu.png files. + * Convert debian/rules to dh usage. + + -- Fathi Boudra Sun, 05 Jul 2009 14:18:47 +0200 + +qtemu (1.0.5-2) unstable; urgency=low + + * Add kfreebsd-i386 and kfreebsd-amd64 to the architecture list. + (Closes: #493482) + * Bump Standards-Version to 3.8.0 (no changes needed). + * Bump compat/debhelper to 6. + * Merge from Ubuntu: + * Add desktop and icon files. (Closes: #460932) + * Add build dependency on sharutils for uudecode. + + -- Fathi Boudra Sun, 10 Aug 2008 11:44:33 +0200 + +qtemu (1.0.5-1) unstable; urgency=low + + * New upstream release. + + [Mark Purcell] + * Architecture: amd64 i386 powerpc as qemu only exists there. + - Helps buildserver.net + + [Fathi Boudra] + * Refresh install path patch. + * Update my e-mail address. + * Remove qemu build dependency. + * Bump Standards-Version to 3.7.3. + * Use Homepage field. + * Remove our cmake.mk. Merged in cdbs package. + * Switch to quilt patch system. + * Update url used in watch file. (Closes: #449960) + * Add CMAKE_CXX_COMPILER:FILEPATH=g++ to workaround g++ path not properly + set. + + -- Fathi Boudra Sun, 23 Dec 2007 12:51:32 +0100 + +qtemu (1.0.4-2) unstable; urgency=low + + * Build-Depend on qemu. This ensures that the package will not be built + (or even attempted to) where qemu is not available. Plus we don't need a + new upload when a new architecture builds qemu. + (Thanks luk and dato for the reminder) + + -- Fathi Boudra Tue, 17 Jul 2007 00:52:45 +0200 + +qtemu (1.0.4-1) unstable; urgency=low + + * New upstream release. + + -- Fathi Boudra Mon, 16 Jul 2007 20:40:26 +0200 + +qtemu (1.0.3-1) unstable; urgency=low + + * Initial release. (Closes: #425289) + * Add patch to fix install path and FHS support. + + -- Fathi Boudra Sun, 20 May 2007 17:16:50 +0200 + --- qtemu-2.0~alpha1.orig/debian/docs +++ qtemu-2.0~alpha1/debian/docs @@ -0,0 +1 @@ +README --- qtemu-2.0~alpha1.orig/debian/copyright +++ qtemu-2.0~alpha1/debian/copyright @@ -0,0 +1,98 @@ +This package was debianized by Fathi Boudra on +Sun, 20 May 2007 17:16:50 +0200. + +It was downloaded from http://qtemu.org + +Upstream Authors: + + Urs Wolfer + Ben Klopfenstein + +Copyright: + + © 2006-2008 Urs Wolfer + © 2008 Ben Klopfenstein + +Copyright for wizard.cpp/h code (some parts of the files have been taken +from examples/dialogs/complexwizard of Qt 4.1): + + © 2006-2008 Urs Wolfer + © 2004-2006 Trolltech ASA. All rights reserved. + +Copyright for GuestTools/modules/clipboard/clipboardpoll.cpp/h code: + + © 2003 Lubos Lunak + +Copyright for floatingtoolbar.cpp/h code: + + © 2007-2008 Urs Wolfer + © 2004-2005 Enrico Ros + +Copyright for vnc/remoteview.cpp/h code: + + © 2007-2008 Urs Wolfer + © 2002-2003 Tim Jansen + +The icons have been taken from the KDE Crystal theme which is LGPL licensed: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in + - `/usr/share/common-licenses/LGPL-2'. + - `/usr/share/common-licenses/LGPL-2.1'. + - `/usr/share/common-licenses/LGPL-3'. + +Copyright for CheckPointerMember cmake module: + + © 2006 Alexander Neundorf + + Redistribution and use is allowed according to the terms of the BSD license. + +On Debian systems, the complete text of the BSD license can be found in +`/usr/share/common-licenses/BSD'. + +Copyright for FindLibVNCServer cmake module: + + © 2006 Alessandro Praduroux + + Redistribution and use is allowed according to the terms of the BSD license. + +On Debian systems, the complete text of the BSD license can be found in +`/usr/share/common-licenses/BSD'. + +QtEmu license: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in: + - `/usr/share/common-licenses/GPL-2'. + - `/usr/share/common-licenses/GPL-3'. + +The Debian packaging is (C) 2007-2009, Fathi Boudra and +is licensed under the GPL-2 or any later version, see above. --- qtemu-2.0~alpha1.orig/debian/compat +++ qtemu-2.0~alpha1/debian/compat @@ -0,0 +1 @@ +7 --- qtemu-2.0~alpha1.orig/debian/patches/fix-no-kqemu.patch +++ qtemu-2.0~alpha1/debian/patches/fix-no-kqemu.patch @@ -0,0 +1,124 @@ +--- qtemu/machineprocess.cpp (revision 316) ++++ qtemu/machineprocess.cpp (working copy) +@@ -215,13 +215,36 @@ + + //Acceleration support + //FIXME we should detect if the CPU/Kernel supports kvm, them use it. otherwise use kqemu instead. "-enable-kvm" is the option to enable kvm in qemu +- if (!(property("virtualization").toBool()) && kvmVersion > 0) +- arguments << "-no-kvm"; +- else if (!(property("virtualization").toBool())) +- arguments << "-no-kqemu"; +- else if (property("virtualization").toBool() && kvmVersion <= 0) +- arguments << "-kernel-kqemu"; + ++ if(kvmVersion > 0) //using KVM binary ++ { ++ if (property("virtualization").toBool() == false) //dont want to use hardware. ++ arguments << "-no-kvm"; ++ //else if ++ //kvm uses acceleration by default ++ } ++ else if(kvmVersion == 0)//using QEMU ++ { ++ if (property("virtualization").toBool() == false)//dont want to use hardware ++ { ++ if(env.kvmSupport()) ++ arguments << "-disable-kvm";//this may not exist or be right... ++ if(env.kqemuSupport()) ++ arguments << "-no-kqemu"; ++ } ++ else ++ { ++ if(env.kvmSupport()) ++ arguments << "-enable-kvm"; ++ else if(env.kqemuSupport()) ++ arguments << "-kernel-kqemu"; ++ } ++ } ++ else //@!#%&$! changed the version string format probably. throw an error. ++ { ++ emit error(tr("Could not find KVM version for this KVM binary, got version acceleration has been left in its default state. Got version ") + QString().number(kvmVersion)); ++ } ++ + //Image resume support + if (doResume) + arguments << "-loadvm" << snapshotNameString; +--- qtemu/qtemuenvironment.cpp (revision 316) ++++ qtemu/qtemuenvironment.cpp (working copy) +@@ -89,14 +89,30 @@ + qemuVersion[1] = versionStringList.at(1).toInt(); + qemuVersion[2] = versionStringList.at(2).toInt(); + versionString = infoStringList.at(5); +- versionString.remove(QRegExp("[(),]")); ++ + if(versionString.contains(QRegExp("kvm"))) + { +- kvmVersion = versionString.remove(QRegExp("kvm-")).toInt(); ++ kvmVersion = versionString.remove(QRegExp("\\D")).toInt(); ++ if(kvmVersion == 0) ++ kvmVersion = -1; //indicates we think we've got kvm, but can't figure out what version + } + else +- kvmVersion = 0; ++ kvmVersion = 0; //must be QEMU + ++ //grab the rest of the help text and search for kvm and kqemu options... ++ ++ QString helpString = findVersion->readAll(); ++ ++ if(helpString.contains("kqemu")) ++ supportsKqemu = true; ++ else ++ supportsKqemu = false; ++ ++ if(helpString.contains("kvm")) ++ supportsKvm = true; ++ else ++ supportsKvm = false; ++ + delete findVersion; + #ifdef Q_OS_WIN32 + delete path; +@@ -129,7 +145,23 @@ + return hal; + } + ++bool QtEmuEnvironment::kvmSupport() ++{ ++ if(!versionChecked) ++ getVersion(); ++ return supportsKvm; ++} ++ ++bool QtEmuEnvironment::kqemuSupport() ++{ ++ if(!versionChecked) ++ getVersion(); ++ return supportsKqemu; ++} ++ + HalObject* QtEmuEnvironment::hal = 0; + int QtEmuEnvironment::qemuVersion[] = {-1, -1, -1}; + int QtEmuEnvironment::kvmVersion = -1; + bool QtEmuEnvironment::versionChecked = false; ++bool QtEmuEnvironment::supportsKvm = false; ++bool QtEmuEnvironment::supportsKqemu = false; +--- qtemu/qtemuenvironment.h (revision 316) ++++ qtemu/qtemuenvironment.h (working copy) +@@ -44,11 +44,16 @@ + + static HalObject* getHal(); + ++ static bool kvmSupport(); ++ static bool kqemuSupport(); ++ + private: + static void getVersion(); + static int qemuVersion[3]; + static int kvmVersion; + static bool versionChecked; ++ static bool supportsKvm; ++ static bool supportsKqemu; + static HalObject *hal; + }; + #endif --- qtemu-2.0~alpha1.orig/debian/patches/fix-no-add-needed-build.patch +++ qtemu-2.0~alpha1/debian/patches/fix-no-add-needed-build.patch @@ -0,0 +1,16 @@ +Description: add missing link against libQtNetwork + required when building with ld --no-add-needed +Author: Julian Taylor +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} + ) + --- qtemu-2.0~alpha1.orig/debian/patches/series +++ qtemu-2.0~alpha1/debian/patches/series @@ -0,0 +1,2 @@ +fix-no-kqemu.patch +fix-no-add-needed-build.patch