Revert 369e859c1d706644760a35c2a4521f794f1797a3...c1f69a669efc0c00d658bfae14f4996ca786f658

Debian-Build-Instructions.md

@@ -0,0 +1,45 @@
+# Installing Dependencies
+
+On Debian 8.x (jessie) using Qt4:
+
+     sudo aptitude install build-essential cmake libtag1c2a libtag1-dev libqt4-dev libqt4-sql-sqlite \
+			libphonon-dev libboost-dev libboost-thread-dev zlib1g-dev libgnutls-dev libz-dev \
+			libqjson-dev libqca2-dev libx11-dev pkg-config libqca2-plugin-ossl \
+			libidn2-0-dev speex libsamplerate0-dev libfftw3-dev libgsasl7-dev liblastfm-dev \
+			libquazip-dev qtkeychain-dev libgnutls28-dev libsparsehash-dev libvlc-dev \
+			liblucene++-dev libechonest-dev libattica-dev libssl-dev libwebsocketpp-dev 
+			
+On Debian 9.x (stretch, the testing branch at the time of writing) you can use Qt5 installing the following additional dependencies:
+
+     sudo aptitude install qttools5-dev libqt5svg5-dev libqt5webkit5-dev libqca-qt5-2-dev \
+			libkf5attica-dev qt5keychain-dev  libtelepathy-qt5-dev \
+			libechonest5-dev libechonest5-2.3 libquazip5-1 libquazip5-dev \
+			libquazip5-headers liblastfm5-1 liblastfm5-dev
+
+# Manually built Dependencies
+## extra-cmake-modules
+
+     git clone git://anongit.kde.org/extra-cmake-modules
+     cd extra-cmake-modules
+     mkdir build && cd build
+     cmake ..
+     make && sudo make install
+
+
+# Compiling Tomahawk
+
+     git clone git://github.com/tomahawk-player/tomahawk.git
+     mkdir tomahawk/build && cd tomahawk/build
+
+If using Qt4:
+
+     cmake -DBUILD_WITH_QT4=ON ..
+
+else if using Qt5:
+
+     cmake ..
+
+Finally build:
+
+     make
+     ./tomahawk

Fedora-Build-Instructions.md

@@ -1,36 +0,0 @@
-# Update Your System
-
-     sudo dnf update
-
-# Installing Dependencies
-
-First, add the [rpm fusion free repository](https://rpmfusion.org/Configuration) 
-
-
-Next, install Fedora's development tools:
-
-     sudo dnf groupinstall development-tools
-​
-Finally, install the remaining dependencies:
-
-     sudo dnf install extra-cmake-modules qt5-qtsvg-devel qt5-qttools-static qt5-qtwebkit-devel gcc-c++ \
-			vlc-devel taglib-devel lucene++-devel sparsehash-devel qca-devel attica-devel \
-			quazip-devel liblastfm-devel qtkeychain-devel qca-qt5-devel qtkeychain-qt5-devel \
-			liblastfm-qt5-devel quazip-qt5-devel kf5-attica-devel websocketpp-devel gnutls-devel \
-			openssl-devel libechonest-devel websocketpp-devel \
-
-### Optional Dependencies
-
-     sudo dnf install jreen-devel telepathy-qt5-devel
-
-
-# Compiling Tomahawk
-
-     git clone git://github.com/tomahawk-player/tomahawk.git
-     mkdir tomahawk/build && cd tomahawk/build
-     cmake ..
-
-# Building Tomahawk:
-
-     make
-     ./tomahawk

Home.md

@@ -1,7 +1,6 @@
 # How to Build Tomahawk
 * [ArchLinux](/tomahawk-player/tomahawk/wiki/ArchLinux---Build-Instructions)
 * [Debian](/tomahawk-player/tomahawk/wiki/Debian-Build-Instructions)
-* [Fedora](/tomahawk-player/tomahawk/wiki/Fedora-Build-Instructions)
 * [OS X](/tomahawk-player/tomahawk/wiki/OS-X---Build-Instructions)
 * [Windows](/tomahawk-player/tomahawk/wiki/Windows-Build-Instructions)
 * [Ubuntu](/tomahawk-player/tomahawk/wiki/Ubuntu---Build-Instructions)

openSUSE---Build-Instructions.md

@@ -1,15 +0,0 @@
-# Installing Dependencies
-
-     sudo zypper in git-core cmake gcc-c++ libqt5-qttools-devel libqt5-qtbase-devel libqt5-qtsvg-devel libQt5WebKitWidgets-devel libechonest-qt5-devel boost-devel liblastfm-qt5-devel qtkeychain-qt5-devel quazip-qt5-devel attica-qt5-devel libqca-qt5-devel libgnutls-devel sparsehash-devel libtag-devel lucene++-devel libopenssl-devel websocketpp-devel vlc-devel
-
-# Optional Dependencies
-     sudo zypper in libjreen-qt5-devel telepathy-qt5-devel
-
-
-# Compiling Tomahawk
-
-     git clone git://github.com/tomahawk-player/tomahawk.git
-     mkdir tomahawk/build && cd tomahawk/build
-     cmake ..
-     make
-     ./tomahawk