From 4eaebdcfc41b8b3b69f778da2f4c76de904a79c5 Mon Sep 17 00:00:00 2001
From: hallsofmirrors <fbilling@mail.nccu.edu>
Date: Thu, 20 Oct 2016 16:09:27 -0400
Subject: [PATCH 1/6] Revert "Merge branch 'pull-request-python2-shebang'"

This reverts commit 14c9cbecffd52309a76bf9f6c348fb0cca46f0b2.
---
 mucous/mucous                | 2 +-
 mucous/setup.py              | 2 +-
 muqt/muqt.py                 | 2 +-
 murmur/encode_bitmaps.py     | 2 +-
 murmur/murmur                | 2 +-
 murmur/setup.py              | 2 +-
 python-clients/mulog         | 2 +-
 python-clients/museekchat    | 2 +-
 python-clients/museekcontrol | 2 +-
 python-clients/musirc.py     | 2 +-
 scripts/sdist                | 2 +-
 setup/musetup                | 2 +-
 setup/musetup-gtk            | 2 +-
 setup/musetup-qt             | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mucous/mucous b/mucous/mucous
index 6996cf6..5266ff4 100755
--- a/mucous/mucous
+++ b/mucous/mucous
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#! /usr/bin/env python
 #-*- coding: utf-8 -*-
  
 ##########################################################################
diff --git a/mucous/setup.py b/mucous/setup.py
index e2a547a..26fe7e4 100644
--- a/mucous/setup.py
+++ b/mucous/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
 
 """To use this setup script to install Mucous:
 
diff --git a/muqt/muqt.py b/muqt/muqt.py
index 2125e2b..eb8a4ef 100755
--- a/muqt/muqt.py
+++ b/muqt/muqt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
 import sys, os, ConfigParser, time
 from PyQt4 import QtCore, QtGui
 from PyQt4.QtCore import *
diff --git a/murmur/encode_bitmaps.py b/murmur/encode_bitmaps.py
index 351248b..ed9eab7 100755
--- a/murmur/encode_bitmaps.py
+++ b/murmur/encode_bitmaps.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
 import os
 import sys, string
 print "Copy theme icons from images/theme subdirectory to images/ directory before running this script."
diff --git a/murmur/murmur b/murmur/murmur
index 6dec1de..66c378b 100755
--- a/murmur/murmur
+++ b/murmur/murmur
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#! /usr/bin/env python
 #-*- coding: utf-8 -*-
 # Murmur - a PyGTK2 client for museek 
 # Code fragments taken from mucous, musetup-gtk, and nicotine
diff --git a/murmur/setup.py b/murmur/setup.py
index 914dd36..1018e04 100755
--- a/murmur/setup.py
+++ b/murmur/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
 
 """To use this setup script to install Murmur:
 
diff --git a/python-clients/mulog b/python-clients/mulog
index c00f075..f3e3e2b 100755
--- a/python-clients/mulog
+++ b/python-clients/mulog
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#! /usr/bin/env python
 
 # pymuseekd - Python tools for museekd
 #
diff --git a/python-clients/museekchat b/python-clients/museekchat
index 3674671..bdea7af 100755
--- a/python-clients/museekchat
+++ b/python-clients/museekchat
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#! /usr/bin/env python
 
 # pymuseekd - Python tools for museekd
 #
diff --git a/python-clients/museekcontrol b/python-clients/museekcontrol
index 7bff8d9..e559f59 100755
--- a/python-clients/museekcontrol
+++ b/python-clients/museekcontrol
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#! /usr/bin/env python
 
 # museekcontrol -- command-line control of museekd
 #
diff --git a/python-clients/musirc.py b/python-clients/musirc.py
index 5f40190..0bd2a21 100644
--- a/python-clients/musirc.py
+++ b/python-clients/musirc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 from museek import messages, driver
 import socket
 import os, sys, select, urllib
diff --git a/scripts/sdist b/scripts/sdist
index 3fdf2e3..fee8f44 100644
--- a/scripts/sdist
+++ b/scripts/sdist
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#! /usr/bin/env python
 
 # This is a release script for museek+
 
diff --git a/setup/musetup b/setup/musetup
index a857a34..22d7b90 100755
--- a/setup/musetup
+++ b/setup/musetup
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2
+#! /usr/bin/env python
 
 import os, sys
 DATADIR = os.path.realpath(sys.argv[0])
diff --git a/setup/musetup-gtk b/setup/musetup-gtk
index 4e8f0f6..02811ba 100755
--- a/setup/musetup-gtk
+++ b/setup/musetup-gtk
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 # Museek GTK Setup
 # Requires: Python, PyGTK2
diff --git a/setup/musetup-qt b/setup/musetup-qt
index cbd0da3..2449901 100755
--- a/setup/musetup-qt
+++ b/setup/musetup-qt
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 # Museek Qt Setup
 # Requires: Python, PyQt

From 9ddfa648eace6506181ae4a5aeee71ba89f38098 Mon Sep 17 00:00:00 2001
From: hallsofmirrors <fbilling@mail.nccu.edu>
Date: Thu, 20 Oct 2016 16:09:40 -0400
Subject: [PATCH 2/6] Revert "change example to MUCOUS=1 since off by default"

This reverts commit 0959b649abbe3a24079e460983b2b5a8a1b91ac9.
---
 INSTALL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL b/INSTALL
index 212343c..658a592 100755
--- a/INSTALL
+++ b/INSTALL
@@ -56,7 +56,7 @@ Museeq options:
 # cd build/
 # cmake -CMAKE_INSTALL_DPREFIX=/usr ..
 # (or) cmake -DEVERYTHING=1 -DCMAKE_INSTALL_PREFIX=/usr ..
-# (or) cmake -DMUCOUS=1 -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_MANDIR=/usr/share/man ..
+# (or) cmake -DMUCOUS=0 -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_MANDIR=/usr/share/man ..
 # make
 # (or) make VERBOSE=1
 # make install

From 626450ce88f2a789953eb1d75a2cced52f9567ec Mon Sep 17 00:00:00 2001
From: hallsofmirrors <fbilling@mail.nccu.edu>
Date: Thu, 20 Oct 2016 16:09:52 -0400
Subject: [PATCH 3/6] Revert "enable CXX language early for GNUInstallDirs on
 recent cmake"

This reverts commit b2b23045e4f78aa9ae8715470910ea9a625f1ac4.
---
 CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a8fd97..b0d061e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,6 @@ cmake_minimum_required(VERSION 2.8.0)
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
-enable_language(CXX)
-
 # Include some cmake checks.
 include(CheckIncludeFiles)
 include(CheckTypeSize)

From dfa06a213d27b3045eab9f4c1ddd348cfa78a1fa Mon Sep 17 00:00:00 2001
From: hallsofmirrors <fbilling@mail.nccu.edu>
Date: Thu, 20 Oct 2016 16:09:54 -0400
Subject: [PATCH 4/6] Revert "update INSTALL instructions"

This reverts commit 791deb778a05609ef1b4f30a9400da3bb9b86e0c.
---
 INSTALL | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/INSTALL b/INSTALL
index 658a592..1a3986e 100755
--- a/INSTALL
+++ b/INSTALL
@@ -14,10 +14,12 @@ libogg-dev
 SWIG (for the mucipher Python bindings)
 
 
+
 Get binaries and help for Museek+ there:
 http://www.museek-plus.org
 
 
+
 -----------------------
 I - Install using CMake
 -----------------------
@@ -25,43 +27,39 @@ CMake is the recommended way to build everything
 
    I.1 - DECLARATIONS (prefix with -D, set bool options on with 1; off with 0):
    ----------------------------------------------------------------------------
+PREFIX: Where museek+ should be installed (default is /usr)
+MANDIR: Where man files should be installed (default is PREFIX/man)
 
-To customize the installation location, different variables can be set. For an exhaustive list please see the GNUInstallDirs module documentation which is part of cmake.
-
-Examples:
-CMAKE_INSTALL_PREFIX: Where museek+ should be installed (default is /usr/local)
-CMAKE_INSTALL_MANDIR: Where man files should be installed (default is share/man)
-CMAKE_INSTALL_DATADIR: Where data files should be installed (default is share). Museek will put it's data in a museek/ subfolder relative to this.
-Relative paths are appended to CMAKE_INSTALL_PREFIX. Absolute paths are also possible.
-
-EVERYTHING: Install every components of museek+ (daemon, clients, bindings, etc.) (default 0)
-MUSEEKD: Build museekd soulseek daemon (default 1)
-MUSETUP: Build musetup configuration interface for museekd (default 1)
-MUSEEQ:  Build museeq Qt client (default 1)
-MUSCAN:  Build muscan shared file index generator (default 1)
-MUCOUS:  Build mucous curses client (default 0)
-MURMUR:  Build murmur PyGTK client (default 0)
-PYMUCIPHER:      Generate PyMucipher bindings (default 0)
-PYTHON_BINDINGS: Generate python bindings (default 0)
-PYTHON_CLIENTS:  Build python clients (mulog, museekchat, museekcontrol, musirc) (default 0)
+EVERYTHING: Install every components of museek+ (daemon, clients, bindings, etc.)
+NO_MUSEEKD: don't install museekd
+NO_MUSCAN: don't install muscan
+NO_SETUP: don't install musetup, musetup-gtk and musetup-qt
+NO_PYMUCIPHER: don't install python bindings for mucipher (hashing library: SHA1, MD5, ...)
+NO_MUSEEQ: don't install museeq (Qt4 client)
+BINDINGS: install python bindings for museek
+MURMUR: install PyGTK client
+MUCOUS: install Curses Python client
+CLIENTS: install some Python tools to museekd, featuring a command line client and a very primitive curses chat client.
 
 Museeq options:
   BINRELOC: Use binary relocation
+  DATADIR: Change default data dir
   RELOAD_TRANSLATIONS: Update .ts files in src/museeq/translations
 
    I.2 - Commands
    --------------
 # cd /path/to/src
-# mkdir build/
-# cd build/
-# cmake -CMAKE_INSTALL_DPREFIX=/usr ..
-# (or) cmake -DEVERYTHING=1 -DCMAKE_INSTALL_PREFIX=/usr ..
-# (or) cmake -DMUCOUS=0 -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_MANDIR=/usr/share/man ..
+# mkdir workdir
+# cd workdir/
+# cmake -DPREFIX=/usr ..
+# (or) cmake -DEVERYTHING=1 -DPREFIX=/usr ..
+# (or) cmake -DMUCOUS=0 -DPREFIX=/usr/local -DMANDIR=share/man
 # make
 # (or) make VERBOSE=1
 # make install
 
 
+
 ----------------------------------------------------
 II - Distutils (Python's built-in installation tool)
 ----------------------------------------------------
@@ -88,3 +86,4 @@ Setup tools (musetup, musetup-gtk, musetup-qt)
 Mucous
 Requires: PyMucipher or PyCrypto, Python Bindings
 # cd mucous/
+

From 78caa3fa068829b9655dcf243a48df4d0acebe79 Mon Sep 17 00:00:00 2001
From: hallsofmirrors <fbilling@mail.nccu.edu>
Date: Thu, 20 Oct 2016 16:09:57 -0400
Subject: [PATCH 5/6] Revert "use CMAKE_INSTALL_FULL_DATADIR to allow for
 absolute paths"

This reverts commit 1020ef260db919353ab0cad7d3ca02f133141b76.
---
 museeq/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/museeq/CMakeLists.txt b/museeq/CMakeLists.txt
index 7666d06..0b25943 100644
--- a/museeq/CMakeLists.txt
+++ b/museeq/CMakeLists.txt
@@ -17,7 +17,7 @@ include(CheckIncludeFiles)
 include(CheckTypeSize)
 include(CheckCXXSourceCompiles)
 
-add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}")
+add_definitions(-DDATADIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}")
 
 if(BINRELOC)
     add_definitions(-DENABLE_BINRELOC=1)

From aa0ea76577ff896ecea81ef77670b76af4e601ad Mon Sep 17 00:00:00 2001
From: hallsofmirrors <fbilling@mail.nccu.edu>
Date: Thu, 20 Oct 2016 16:09:59 -0400
Subject: [PATCH 6/6] Revert "pass absolute path for DATADIR"

This reverts commit d42376ecb67388aef609341ac1ed453143d50482.
---
 museeq/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/museeq/CMakeLists.txt b/museeq/CMakeLists.txt
index 0b25943..333b70d 100644
--- a/museeq/CMakeLists.txt
+++ b/museeq/CMakeLists.txt
@@ -8,7 +8,7 @@ set(QT_USE_QTUITOOLS TRUE)
 # find and setup Qt4 for this project
 find_package(Qt4 REQUIRED)
 
-add_definitions(${QT_DEFINITIONS})
+add_definitions(${QT_DEFINITIONS} )
 
 # tell cmake where to search for headers:v
 include_directories(.)
@@ -17,7 +17,7 @@ include(CheckIncludeFiles)
 include(CheckTypeSize)
 include(CheckCXXSourceCompiles)
 
-add_definitions(-DDATADIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}")
+add_definitions(-DDATADIR="\""${CMAKE_INSTALL_DATADIR}"\"")
 
 if(BINRELOC)
     add_definitions(-DENABLE_BINRELOC=1)