diff --git a/cockatrice/src/abstractclient.h b/cockatrice/src/abstractclient.h index 92b49826..507c3fdd 100644 --- a/cockatrice/src/abstractclient.h +++ b/cockatrice/src/abstractclient.h @@ -89,4 +89,4 @@ public: static PendingCommand *prepareAdminCommand(const ::google::protobuf::Message &cmd); }; -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/arrowtarget.h b/cockatrice/src/arrowtarget.h index f68ac335..ce3ca55c 100644 --- a/cockatrice/src/arrowtarget.h +++ b/cockatrice/src/arrowtarget.h @@ -32,4 +32,4 @@ public: void removeArrowTo(ArrowItem *arrow) { arrowsTo.removeAt(arrowsTo.indexOf(arrow)); } }; -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/chatview.h b/cockatrice/src/chatview.h index 37685e10..d5c35d38 100644 --- a/cockatrice/src/chatview.h +++ b/cockatrice/src/chatview.h @@ -50,4 +50,4 @@ signals: void deleteCardInfoPopup(QString cardName); }; -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/client_metatypes.h b/cockatrice/src/client_metatypes.h index 979054c4..db1c90f7 100644 --- a/cockatrice/src/client_metatypes.h +++ b/cockatrice/src/client_metatypes.h @@ -26,4 +26,4 @@ Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(Event_ReplayAdded) -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/counter_general.h b/cockatrice/src/counter_general.h index 58468aa8..d815f3c4 100644 --- a/cockatrice/src/counter_general.h +++ b/cockatrice/src/counter_general.h @@ -14,4 +14,4 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); }; -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/dlg_cardsearch.h b/cockatrice/src/dlg_cardsearch.h index 43f8fee3..4c2ccccf 100644 --- a/cockatrice/src/dlg_cardsearch.h +++ b/cockatrice/src/dlg_cardsearch.h @@ -21,4 +21,4 @@ public: QSet getCardColors() const; }; -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/gametypemap.h b/cockatrice/src/gametypemap.h index fce16175..0235b472 100644 --- a/cockatrice/src/gametypemap.h +++ b/cockatrice/src/gametypemap.h @@ -5,4 +5,4 @@ typedef QMap GameTypeMap; -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/localclient.h b/cockatrice/src/localclient.h index 2a8da910..6cf5382e 100644 --- a/cockatrice/src/localclient.h +++ b/cockatrice/src/localclient.h @@ -18,4 +18,4 @@ private slots: void itemFromServer(const ServerMessage &item); }; -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/localserverinterface.h b/cockatrice/src/localserverinterface.h index 0b4eb227..d9c9d8c6 100644 --- a/cockatrice/src/localserverinterface.h +++ b/cockatrice/src/localserverinterface.h @@ -20,4 +20,4 @@ public slots: void itemFromClient(const CommandContainer &item); }; -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/playertarget.h b/cockatrice/src/playertarget.h index 398c67b0..fa3c3e01 100644 --- a/cockatrice/src/playertarget.h +++ b/cockatrice/src/playertarget.h @@ -35,4 +35,4 @@ public: AbstractCounter *addCounter(int _counterId, const QString &_name, int _value); }; -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/soundengine.h b/cockatrice/src/soundengine.h index 313f4cd4..89dd6751 100644 --- a/cockatrice/src/soundengine.h +++ b/cockatrice/src/soundengine.h @@ -31,4 +31,4 @@ public slots: extern SoundEngine *soundEngine; -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/tab_admin.h b/cockatrice/src/tab_admin.h index f0cdd126..7d5e9175 100644 --- a/cockatrice/src/tab_admin.h +++ b/cockatrice/src/tab_admin.h @@ -46,4 +46,4 @@ public: bool getLocked() const { return locked; } }; -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/userinfobox.h b/cockatrice/src/userinfobox.h index 2f7643c3..186ca8ff 100644 --- a/cockatrice/src/userinfobox.h +++ b/cockatrice/src/userinfobox.h @@ -24,4 +24,4 @@ public slots: void updateInfo(const QString &userName); }; -#endif \ No newline at end of file +#endif diff --git a/cockatrice/src/userlist.h b/cockatrice/src/userlist.h index 32d576af..001db621 100644 --- a/cockatrice/src/userlist.h +++ b/cockatrice/src/userlist.h @@ -92,4 +92,4 @@ public: void sortItems(); }; -#endif \ No newline at end of file +#endif diff --git a/common/color.h b/common/color.h index ebf632c0..c96eda07 100644 --- a/common/color.h +++ b/common/color.h @@ -32,4 +32,4 @@ inline color makeColor(int r, int g, int b) return result; } -#endif \ No newline at end of file +#endif diff --git a/common/server_arrowtarget.h b/common/server_arrowtarget.h index 589dfa8a..f5783d5b 100644 --- a/common/server_arrowtarget.h +++ b/common/server_arrowtarget.h @@ -7,4 +7,4 @@ class Server_ArrowTarget : public QObject { Q_OBJECT }; -#endif \ No newline at end of file +#endif diff --git a/doc/usermanual/Usermanual.pdf b/doc/usermanual/Usermanual.pdf index de1b3a27..59638227 100644 Binary files a/doc/usermanual/Usermanual.pdf and b/doc/usermanual/Usermanual.pdf differ diff --git a/doc/usermanual/Usermanual.tex b/doc/usermanual/Usermanual.tex index 68d10048..a0821d61 100644 --- a/doc/usermanual/Usermanual.tex +++ b/doc/usermanual/Usermanual.tex @@ -194,13 +194,20 @@ Start the oracle.exe (the installer does this automatically) and let it generate \end{enumerate} Congratulations, you may now use Cockatrice! -\subsubsection{Install latest experimental on Linux} +\subsubsection{Linux and BSD} +The following procedures have been tested with Debian Wheezy, Fedora 18 and FreeBSD 9.1. +If you use Gentoo with KDE you have the needed prerequisites and may continue with downloading the source. +If you use Bodhi or Arch Linux (AUR) or another distribution that includes Cockatrice, you might install Cockatrice from the default packages -- though the package might be old, +so you probably should continue with this howto. + +Before you install new software, you should update your system. The following instructions failed on a fresh installation of Fedora 18 and FreeBSD 9.1 until the systems were updated. \begin{enumerate} \item You need to install the build tools and dependencies. This varies between the Linux distributions. \begin{description} - \item[Ubuntu] \shellcmd{sudo apt-get install build-essential git libqt4-dev qtmobility-dev libprotobuf-dev protobuf-compiler cmake} + \item[Debian, Ubuntu and spin-offs] \shellcmd{sudo apt-get install build-essential git libqt4-dev qtmobility-dev libprotobuf-dev protobuf-compiler cmake} \item[Fedora] \shellcmd{sudo yum groupinstall "Development Tools"\\ yum install qt-devel qt-mobility-devel protobuf-devel protobuf-compiler cmake} + \item[FreeBSD] \shellcmd{pkg\_add -r qt4 qt4-linguist qt4-moc qt4-qmake qt4-rcc qt4-uic git cmake protobuf} \end{description} \item Download the sources from github via \\ \shellcmd{cd\\ git clone https://github.com/Daenyth/Cockatrice.git} \item To compile the sources, change into the newly created directory, create a build directory and invoke cmake:\\ @@ -208,12 +215,11 @@ Congratulations, you may now use Cockatrice! mkdir build \\ cd build \\ cmake ..\\ -make\\ -sudo make install -}\\ +make}\\ If you have some issues with pthread\_* add 'pthread' to the ``target\_link\_libraries'' entry in the \shellcmd{CMakeFiles.txt} in \shellcmd{Cockatrice/common}. - - \item Finish up the installation: Run \shellcmd{oracle} and download available cards, denn run \shellcmd{cockatrice}. + \item You may install the program into the directory \shellcmd{/usr/local} by typing \shellcmd{sudo make install} but you should also be able to start + cockatrice and the oracle from the build directory. + \item Before you start Cockatrice for the first time, run \shellcmd{oracle -dlsets} and download available cards, denn run \shellcmd{cockatrice}. The default paths for decks, pics, cards and tokens are located in \\ \shellcmd{/home//.local/share/data/Cockatrice/Cockatrice}. \end{enumerate}