--- dc-qt-0.2.0.alpha.orig/debian/changelog +++ dc-qt-0.2.0.alpha/debian/changelog @@ -0,0 +1,65 @@ +dc-qt (0.2.0.alpha-4.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with gcc5. + + -- Dimitri John Ledkov Mon, 31 Aug 2015 23:04:39 +0100 + +dc-qt (0.2.0.alpha-4.2) unstable; urgency=low + + * Non-maintainer upload. + * Update boost-linking patch, to link with boost1.53 (Closes: #709254) + + -- Dmitrijs Ledkovs Fri, 05 Jul 2013 23:23:01 +0100 + +dc-qt (0.2.0.alpha-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix build with gcc-4.4 using patch from Martin Michlmayr (Closes: + 504956) + + -- Christoph Egger Fri, 25 Dec 2009 14:30:32 +0100 + +dc-qt (0.2.0.alpha-4) unstable; urgency=medium + + * Acknowledge NMU (Thanks to Moritz) + * Add build-dependency against zlib1g-dev to avoid FTBFS + (Closes: #477028) (Thanks to Sune for the patch and Sebastian + for the patch) + * Bump standards version to 3.7.3 (no changes needed) + * Bump debhelper level to 6 (no changes needed) + * Remove obsolete directory /usr/sbin in the package + * Now use Homepage field in debian/control + * Change Apps/Net to Applications/Network/File Transfer in debian/menu + according to new policy + + -- Steffen Joeris Tue, 06 May 2008 11:45:30 +0000 + +dc-qt (0.2.0.alpha-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix GCC 4.3 compatibility, patch by Cyril Boulebois (Closes: #455636) + + -- Moritz Muehlenhoff Wed, 19 Mar 2008 21:18:04 +0100 + +dc-qt (0.2.0.alpha-3) unstable; urgency=low + + * Fix FTBFS with newer boost libraries (Closes: #425074) + Thanks to William Grant + + -- Steffen Joeris Sat, 19 May 2007 22:49:34 +1000 + +dc-qt (0.2.0.alpha-2) unstable; urgency=low + + * Include 20-gcc-fix.patch to avoid FTBFS with newer gcc version + (Closes: #417495) Thanks to Martin Michlmayr + * Change my maintainer address + + -- Steffen Joeris Fri, 06 Apr 2007 12:57:59 +1000 + +dc-qt (0.2.0.alpha-1) unstable; urgency=low + + * Initial release (Closes: #382349) + + -- Steffen Joeris Fri, 11 Aug 2006 13:50:52 +1000 + --- dc-qt-0.2.0.alpha.orig/debian/compat +++ dc-qt-0.2.0.alpha/debian/compat @@ -0,0 +1 @@ +6 --- dc-qt-0.2.0.alpha.orig/debian/control +++ dc-qt-0.2.0.alpha/debian/control @@ -0,0 +1,24 @@ +Source: dc-qt +Section: kde +Priority: optional +Maintainer: Steffen Joeris +Build-Depends: cdbs, debhelper (>= 5), libqt4-dev, libboost-dev, libboost-filesystem-dev, libboost-thread-dev, scons, libboost-program-options-dev, libbz2-dev, zlib1g-dev +Standards-Version: 3.7.3 +Homepage: http://dc-qt.sourceforge.net + +Package: dc-qt +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: GUI frontend for the dc protocol + dc-qt is a qt front-end for the dctc program. dctc handles all + communication with dc hubs and clients, while dc-qt presents an + interface that has many of the features of the original directconnect + client, plus some really useful improvements. + . + It is intended for peer-based file-sharing. In practise it works better than + gnutella and other similar systems as it allows dc hubs (servers) + administators to require clients to share specified amount of data. The + amount is usually based on type of client's connection and it is used not + to hurt or exclude anybody but to make file sharing "fair play". + . + dc-qt is still alpha, so some care has to be taken - try it out! --- dc-qt-0.2.0.alpha.orig/debian/copyright +++ dc-qt-0.2.0.alpha/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Steffen Joeris on +Fri, 11 Aug 2006 13:50:52 +1000. + +It was downloaded from http://dc-qt.sourceforge.net + +Upstream Authors: Rikard Björklind (olof@users.sourceforge.net) + Mikael Gransell (mickeg@users.sourceforge.net) + Arsenij Vodjanov (arsenij@gmail.com) + + +Copyright: (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + j_s@telia.com + (C) 1997 Makoto Matsumoto and Takuji Nishimura + +License: + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License, version 2 +as published by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANDABILITY of FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for details. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in /usr/share/common-licenses/GPL. + + +The Debian packaging is (C) 2006, Steffen Joeris and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- dc-qt-0.2.0.alpha.orig/debian/dc-qt.desktop +++ dc-qt-0.2.0.alpha/debian/dc-qt.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=dc-qt +Comment=GUI for Direct Connect Protocol +Exec=dc-qt +Icon=/usr/share/pixmaps/dc-qt.xpm +Terminal=false +Type=Application +Categories=Application;Network;Qt; --- dc-qt-0.2.0.alpha.orig/debian/dc-qt.xpm +++ dc-qt-0.2.0.alpha/debian/dc-qt.xpm @@ -0,0 +1,48 @@ +/* XPM */ +static char *dcgui_my2[] = { +/* columns rows colors chars-per-pixel */ +"32 32 10 1", +" c black", +". c gray20", +"X c #7F0000", +"o c red", +"O c yellow", +"+ c gray60", +"@ c #b2b2b2", +"# c gray80", +"$ c gray90", +"% c None", +/* pixels */ +"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%", +"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%", +"%% %%%%%%%%%%%%% %%%%%", +"% %%%%%%%%%% %%", +"% OOOOOOOO %%%%%% .OOOOOO. %", +"% OOOOOOOOOO %%%% .OOOOOOOOOO %", +"% OOOOOOOOOOO %% OOOOO..OOO. %", +"% OOO. .oOoO % .OOO. .. %%", +"% OOO. % .OOOO Ooo. %% %", +"% OoO. %%% .OOo. .OoO. %%%%%%%%%", +"% OOO. %%% .Ooo. .OoO %%%%%%%%%", +"% oOO. %%%% OoO. .Ooo %%%%%%%%%%", +"% ooo. %%%% oOO. .oOO %%%%%%%%%%", +"% oOo. %%% .ooo. .ooo %%%%%%%%%", +"% ooo. %%% .oOo. .ooO. %%%%%%%%%", +"% oOO. .Oooo Ooo. %%%% %", +"% ooo.. .oooo % oooo#+ ... %", +"% oooooooooooo.%% .ooo++ ..ooo %", +"% oooooooooo..%%%% .oooXXooooo %", +"% o#@@@@@@@.#@%%%%#@..#@oooo. %", +"% @@@@@@@@.@@%%%%@@%.@@.. %%", +"%%%@@%%%%@@%@@%%%%@@%%@@%%%%%%%%", +"%%%##%%%%##%##%%%%##%%##%%%%%%%%", +"%%%########%##%%%%##%%##%%%%%%%%", +"%%%%#######%########%%##%%%%%%%%", +"%%%%%%%%%%$%$$$$$$$$%%$$%%%%%%%%", +"%%%%%%%%%%$%%%%%%%%%%%%%%%%%%%%%", +"%%%$$$$$$$$%%%%%%%%%%%%%%%%%%%%%", +"%%%$$$$$$$$%%%%%%%%%%%%%%%%%%%%%", +"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%", +"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%", +"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" +}; --- dc-qt-0.2.0.alpha.orig/debian/dirs +++ dc-qt-0.2.0.alpha/debian/dirs @@ -0,0 +1 @@ +usr/bin --- dc-qt-0.2.0.alpha.orig/debian/menu +++ dc-qt-0.2.0.alpha/debian/menu @@ -0,0 +1,7 @@ +?package(dc-qt):needs="X11" \ + section="Applications/Network/File Transfer" \ + hints="KDE" \ + title="DC-Qt" \ + longtitle="GUI for Direct Connect Protocol" \ + command="/usr/bin/dc-qt" \ + icon="/usr/share/pixmaps/dc-qt.xpm" --- dc-qt-0.2.0.alpha.orig/debian/patches/10-path.patch +++ dc-qt-0.2.0.alpha/debian/patches/10-path.patch @@ -0,0 +1,14 @@ +--- mainwindow.cpp.orig 2006-08-11 14:45:37.000000000 +1000 ++++ ui/mainwindow.cpp 2006-08-11 14:48:38.000000000 +1000 +@@ -192,6 +192,11 @@ + { + path = dir+"/../Resources/backend"; + } ++ // Debian path to the backend ++ else if(QFile::exists("/usr/bin/dc-backend")) ++ { ++ path = "/usr/bin/dc-backend"; ++ } + else + QMessageBox::critical(this,"Error","Could not find backend executable (installation problem?)."); + --- dc-qt-0.2.0.alpha.orig/debian/patches/20-gcc-fix.patch +++ dc-qt-0.2.0.alpha/debian/patches/20-gcc-fix.patch @@ -0,0 +1,29 @@ +--- commandhandlers.cpp~ 2007-04-06 12:54:22.000000000 +1000 ++++ dc-qt-0.2.0.alpha/backend/commandhandlers.cpp 2007-04-06 12:54:40.000000000 +1000 +@@ -551,4 +551,4 @@ + driver->stopSender(); + } + +-} +\ No newline at end of file ++} +--- socketmanager.cpp.orig 2007-04-06 12:53:16.000000000 +1000 ++++ dc-qt-0.2.0.alpha/rpcdriver/socketmanager.cpp 2007-04-06 12:53:37.000000000 +1000 +@@ -1,5 +1,7 @@ + #include "socketmanager.h" + ++#include ++#include + + using namespace std; + +--- Util.h.orig 2007-04-06 12:50:38.000000000 +1000 ++++ dc-qt-0.2.0.alpha/dcpp/Util.h 2007-04-06 12:50:56.000000000 +1000 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #endif + + #include "Text.h" --- dc-qt-0.2.0.alpha.orig/debian/patches/30-libboost-linking.patch +++ dc-qt-0.2.0.alpha/debian/patches/30-libboost-linking.patch @@ -0,0 +1,34 @@ +Description: link with boost_system +Author: Dmitrijs Ledkovs + +--- dc-qt-0.2.0.alpha.orig/ui/ui.pro ++++ dc-qt-0.2.0.alpha/ui/ui.pro +@@ -78,5 +78,5 @@ CONFIG += qt release + INCPATH += . ../rpcdriver ../ ../backend /usr/include + RESOURCES += res.qrc + unix{ +- LIBS = -L../rpcdriver -L/usr/local/lib -lrpc -lboost_thread -lboost_program_options ++ LIBS = -L../rpcdriver -L/usr/local/lib -lrpc -lboost_thread -lboost_program_options -lboost_system + } +--- dc-qt-0.2.0.alpha.orig/backend/SConscript ++++ dc-qt-0.2.0.alpha/backend/SConscript +@@ -3,7 +3,7 @@ + Import('env') + + ## Copy the parent environment and att some libraries and linker paths +-backende = env.Copy(CPPPATH = ['#rpcdriver/', '#dcpp'], LIBS = ['dcpp', 'rpc', 'boost_thread', 'pthread', 'z', 'bz2', 'boost_program_options','boost_filesystem'], LIBPATH = ['/usr/local/lib', '#rpcdriver', '#dcpp']) ++backende = env.Copy(CPPPATH = ['#rpcdriver/', '#dcpp'], LIBS = ['dcpp', 'rpc', 'boost_thread', 'pthread', 'z', 'bz2', 'boost_program_options','boost_filesystem','boost_system'], LIBPATH = ['/usr/local/lib', '#rpcdriver', '#dcpp']) + + ## Build the backend executable + backende.Program('backend', Split('main.cpp commandhandlers.cpp ClientNotifier.cpp SessionManager.cpp Session.cpp TransferManager.cpp Selecter.cpp filelog.cpp SettingsMapper.cpp')) +--- dc-qt-0.2.0.alpha.orig/rpcdriver/SConscript ++++ dc-qt-0.2.0.alpha/rpcdriver/SConscript +@@ -3,7 +3,7 @@ Import('env') + + rpce = env.Copy(CCFLAGS = '-g -O0 -Wall') + rpce.Append(CXXFLAGS = '-I. -I/usr/local/include') +-rpce.Append(LIBS = 'libboost_thread') ++rpce.Append(LIBS = ['boost_thread', 'boost_system']) + + rpce.Program('server',Split('socket.cpp socketmanager.cpp datainputstream.cpp commanddispatcher.cpp rpcdriver.cpp main.cpp dataoutputstream.cpp')) + --- dc-qt-0.2.0.alpha.orig/debian/patches/40_gcc43_compat.diff +++ dc-qt-0.2.0.alpha/debian/patches/40_gcc43_compat.diff @@ -0,0 +1,32 @@ +--- a/dcpp/ShareManager.cpp ++++ b/dcpp/ShareManager.cpp +@@ -42,6 +42,7 @@ + #endif + + #include ++#include + + ShareManager::ShareManager() : hits(0), listLen(0), bzXmlListLen(0), + xmlDirty(true), nmdcDirty(false), refreshDirs(false), update(false), initial(true), listN(0), lFile(NULL), +--- a/rpcdriver/datainputstream.cpp ++++ b/rpcdriver/datainputstream.cpp +@@ -16,6 +16,8 @@ + + #include + ++#include ++ + using std::string; + + namespace rpc +--- a/rpcdriver/outputbuffer.h ++++ b/rpcdriver/outputbuffer.h +@@ -6,6 +6,8 @@ + using namespace std; + #include + ++#include ++ + namespace rpc { + + /** --- dc-qt-0.2.0.alpha.orig/debian/patches/50_gcc44_compat.diff +++ dc-qt-0.2.0.alpha/debian/patches/50_gcc44_compat.diff @@ -0,0 +1,12 @@ +diff -ur ../dc-qt-0.2.0.alpha.old/ui/blockallocator.h ./ui/blockallocator.h +--- a/ui/blockallocator.h 2009-12-25 15:04:06.435792622 +0100 ++++ b/ui/blockallocator.h 2009-12-25 15:04:29.946791296 +0100 +@@ -1,6 +1,7 @@ + #ifndef __blockallocator_h__ + #define __blockallocator_h__ + ++#include + #include + #include + +Nur in ./ui: blockallocator.h~. --- dc-qt-0.2.0.alpha.orig/debian/patches/60_gcc5_compat.patch +++ dc-qt-0.2.0.alpha/debian/patches/60_gcc5_compat.patch @@ -0,0 +1,349 @@ +diff --git a/backend/SessionManager.h b/backend/SessionManager.h +index f2fcab4..6ee359f 100644 +--- a/backend/SessionManager.h ++++ b/backend/SessionManager.h +@@ -18,7 +18,9 @@ + #include + #include "Stack.h" + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + namespace dcqt_backend { + +diff --git a/backend/SettingsMapper.h b/backend/SettingsMapper.h +index 94273e8..098cd92 100644 +--- a/backend/SettingsMapper.h ++++ b/backend/SettingsMapper.h +@@ -5,7 +5,9 @@ + #include + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + using namespace std; + + //! Maps settings between dc-qt and dc++ format, keys have same names but as strings. +diff --git a/backend/log.h b/backend/log.h +index b0acc5f..ef5b830 100644 +--- a/backend/log.h ++++ b/backend/log.h +@@ -13,7 +13,9 @@ + #define LOG_H__ + + ++#ifndef Q_MOC_RUN + #include ++#endif + //! Logging interface + class Log + { +diff --git a/dcpp/StringDefs.h b/dcpp/StringDefs.h +index fb9b0dc..cc2cf61 100644 +--- a/dcpp/StringDefs.h ++++ b/dcpp/StringDefs.h +@@ -485,7 +485,7 @@ enum Strings { // @DontAdd + SHARED, // "Shared" + SHARED_FILES, // "Shared Files" + SIZE, // "Size" +- SIZE_MAX, // "Max Size" ++ SIZE_MAXIMUM, // "Max Size" + SIZE_MIN, // "Min Size" + SKIP_RENAME, // "New virtual name matches old name, skipping..." + SLOT_GRANTED, // "Slot granted" +diff --git a/rpcdriver/commanddispatcher.h b/rpcdriver/commanddispatcher.h +index f6a5f01..ca77377 100644 +--- a/rpcdriver/commanddispatcher.h ++++ b/rpcdriver/commanddispatcher.h +@@ -3,11 +3,13 @@ + #ifndef _COMMAND_DISPATCHER_H_ + #define _COMMAND_DISPATCHER_H_ + ++#ifndef Q_MOC_RUN + #include + #include + #include + #include + #include ++#endif + + #include + #include +diff --git a/rpcdriver/datainputstream.h b/rpcdriver/datainputstream.h +index 7649285..6b0e9d4 100644 +--- a/rpcdriver/datainputstream.h ++++ b/rpcdriver/datainputstream.h +@@ -13,8 +13,9 @@ + #define RPCDATAINPUTSTREAM_H + + #include +- ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "inputbuffer.h" + #include "types.h" +diff --git a/rpcdriver/inputbuffer.h b/rpcdriver/inputbuffer.h +index 77f8578..b7b22fd 100644 +--- a/rpcdriver/inputbuffer.h ++++ b/rpcdriver/inputbuffer.h +@@ -12,9 +12,11 @@ + #ifndef RPCINPUTBUFFER_H + #define RPCINPUTBUFFER_H + ++#ifndef Q_MOC_RUN + #include + #include + #include ++#endif + + namespace rpc + { +diff --git a/rpcdriver/outputbuffer.h b/rpcdriver/outputbuffer.h +index ca1d0bf..96bfbf1 100644 +--- a/rpcdriver/outputbuffer.h ++++ b/rpcdriver/outputbuffer.h +@@ -4,7 +4,9 @@ + #include + #include + using namespace std; ++#ifndef Q_MOC_RUN + #include ++#endif + + namespace rpc { + +diff --git a/rpcdriver/protectedbuffer.h b/rpcdriver/protectedbuffer.h +index e7f0dd0..0385c79 100644 +--- a/rpcdriver/protectedbuffer.h ++++ b/rpcdriver/protectedbuffer.h +@@ -10,7 +10,9 @@ + #ifndef _BUFFER_H_ + #define _BUFFER_H_ + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +diff --git a/rpcdriver/rpccommandhandler.h b/rpcdriver/rpccommandhandler.h +index 8009e73..8ab89b1 100644 +--- a/rpcdriver/rpccommandhandler.h ++++ b/rpcdriver/rpccommandhandler.h +@@ -9,10 +9,11 @@ + + #ifndef _RPC_COMMAND_H_ + #define _RPC_COMMAND_H_ +- ++#ifndef Q_MOC_RUN + #include + #include + #include ++#endif + + #include + #include +diff --git a/rpcdriver/rpcdriver.h b/rpcdriver/rpcdriver.h +index 289d09a..8120d24 100644 +--- a/rpcdriver/rpcdriver.h ++++ b/rpcdriver/rpcdriver.h +@@ -2,11 +2,13 @@ + #ifndef _RPC_DRIVER_H_ + #define _RPC_DRIVER_H_ + ++#ifndef Q_MOC_RUN + #include + #include + #include + #include + #include ++#endif + + #include + #include +diff --git a/rpcdriver/types.h b/rpcdriver/types.h +index f030264..230ab8c 100644 +--- a/rpcdriver/types.h ++++ b/rpcdriver/types.h +@@ -1,6 +1,8 @@ + #ifndef types_h__ + #define types_h__ ++#ifndef Q_MOC_RUN + #include ++#endif + typedef boost::int64_t int64; + typedef int int32; + typedef short int16; +diff --git a/ui/backendconnection.h b/ui/backendconnection.h +index 37fafd2..45a0984 100644 +--- a/ui/backendconnection.h ++++ b/ui/backendconnection.h +@@ -14,7 +14,9 @@ + #include + #include + #include "global.h" ++#ifndef Q_MOC_RUN + #include ++#endif + #include + #include "rpctypes.h" + +diff --git a/ui/commandhandlersinclude.h b/ui/commandhandlersinclude.h +index 307107a..776e602 100644 +--- a/ui/commandhandlersinclude.h ++++ b/ui/commandhandlersinclude.h +@@ -3,8 +3,10 @@ + + #include + #include ++#ifndef Q_MOC_RUN + #include + #include ++#endif + #include "rpcdriver/rpccommandhandler.h" + #include "global.h" + #include "rpctypes.h" +diff --git a/ui/favouritehubswidget.h b/ui/favouritehubswidget.h +index b3a7c0f..e7a468c 100644 +--- a/ui/favouritehubswidget.h ++++ b/ui/favouritehubswidget.h +@@ -11,7 +11,9 @@ + #ifndef FAVOURITE_HUBS_H__ + #define FAVOURITE_HUBS_H__ + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +diff --git a/ui/global.h b/ui/global.h +index 2dd769c..53c2040 100644 +--- a/ui/global.h ++++ b/ui/global.h +@@ -2,7 +2,9 @@ + #define GLOBAL_H__ + + #include ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + //typedef qint64 int64; +diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp +index a61302e..c2dff60 100644 +--- a/ui/mainwindow.cpp ++++ b/ui/mainwindow.cpp +@@ -2,7 +2,9 @@ + #include + + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + #include "mainwindow.h" + #include "connectdialog.h" +diff --git a/ui/mainwindow.h b/ui/mainwindow.h +index cabf380..c18b71f 100644 +--- a/ui/mainwindow.h ++++ b/ui/mainwindow.h +@@ -15,7 +15,9 @@ + + #include + #include ++#ifndef Q_MOC_RUN + #include ++#endif + #include + + class ConnectDialog; +diff --git a/ui/publichubswidget.h b/ui/publichubswidget.h +index af44004..93456ce 100644 +--- a/ui/publichubswidget.h ++++ b/ui/publichubswidget.h +@@ -6,7 +6,9 @@ + * + */ + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include +diff --git a/ui/queuemodel.h b/ui/queuemodel.h +index eaec780..ffe86b3 100644 +--- a/ui/queuemodel.h ++++ b/ui/queuemodel.h +@@ -10,7 +10,9 @@ + #include + #include "queueitem.h" + #include "globalusermodel.h" ++#ifndef Q_MOC_RUN + #include ++#endif + + //! Transfer queue data model. + class QueueModel : public QAbstractTableModel +diff --git a/ui/session.h b/ui/session.h +index c276a6c..339c3cf 100644 +--- a/ui/session.h ++++ b/ui/session.h +@@ -12,7 +12,9 @@ + #ifndef SESSION_H + #define SESSION_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include "ui_hub.h" +diff --git a/ui/settingsdialog.h b/ui/settingsdialog.h +index f64aff8..afa93be 100644 +--- a/ui/settingsdialog.h ++++ b/ui/settingsdialog.h +@@ -13,7 +13,9 @@ + #define SETTINGSDIALOG_H + + #include ++#ifndef Q_MOC_RUN + #include ++#endif + #include "ui_settings.h" + #include "backendconnection.h" + #include "shareitemmodel.h" +diff --git a/ui/userfiledialog.h b/ui/userfiledialog.h +index 9fa001f..efceddf 100644 +--- a/ui/userfiledialog.h ++++ b/ui/userfiledialog.h +@@ -11,7 +11,9 @@ + #ifndef USER_FILE_DIALOG_H + #define USER_FILE_DIALOG_H + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + +diff --git a/ui/userfilemodel.h b/ui/userfilemodel.h +index 767c146..f8aa443 100644 +--- a/ui/userfilemodel.h ++++ b/ui/userfilemodel.h +@@ -13,7 +13,9 @@ + #ifndef USER_FILE_TREE_MODEL_H_ + #define USER_FILE_TREE_MODEL_H_ + ++#ifndef Q_MOC_RUN + #include ++#endif + + #include + #include --- dc-qt-0.2.0.alpha.orig/debian/rules +++ dc-qt-0.2.0.alpha/debian/rules @@ -0,0 +1,28 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/langcore.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/qmake.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +SCONS = scons + +DEB_BUILDDIR = $(CURDIR)/ui + +QMAKE = qmake-qt4 + +DEB_INSTALL_DOCS_ALL = + +common-configure-arch:: + $(SCONS) + +clean:: + -$(SCONS) -c + rm -f .sconsign.dblite + +common-install-arch:: + $(SCONS) install PREFIX=$(CURDIR)/debian/dc-qt/usr + mv $(CURDIR)/debian/dc-qt/usr/bin/backend $(CURDIR)/debian/dc-qt/usr/bin/dc-backend + mv $(CURDIR)/debian/dc-qt/usr/bin/ui $(CURDIR)/debian/dc-qt/usr/bin/dc-qt + install -D -m 644 $(CURDIR)/debian/dc-qt.xpm $(CURDIR)/debian/dc-qt/usr/share/pixmaps/dc-qt.xpm + install -D -m 644 $(CURDIR)/debian/dc-qt.desktop $(CURDIR)/debian/dc-qt/usr/share/applications/dc-qt.desktop