version number changes, hack to detect boost-mt

LICENSE

@@ -338,3 +338,14 @@ proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
+
+  In addition, as a special exception, the copyright holders give
+  permission to link the code of portions of this program with the OpenSSL
+  library.
+  You must obey the GNU General Public License in all respects for all of
+  the code used other than OpenSSL. If you modify file(s) with this
+  exception, you may extend this exception to your version of the file(s),
+  but you are not obligated to do so. If you do not wish to do so, delete
+  this exception statement from your version. If you delete this exception
+  statement from all source files in the program, then also delete it here.
+  

MANIFEST.in

@@ -1,5 +1,6 @@
 include LICENSE
 include README
+include README.Packagers
 include Makefile
 include deluge.desktop
 include deluge.xpm

scripts/deluge

@@ -23,6 +23,16 @@
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
 # 	Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 from optparse import OptionParser
 import sys

setup.py

@@ -15,6 +15,16 @@
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
 # 	Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 import os, platform
 print "Attempting to detect your system information"
@@ -62,7 +72,7 @@ python_version = platform.python_version()[0:3]
 
 NAME		= "deluge"
 FULLNAME	= "Deluge BitTorrent Client"
-VERSION		= "0.5.1"
+VERSION		= "0.5.1.1"
 AUTHOR		= "Zach Tibbitts, Alon Zakai, Marcos Pinto"
 EMAIL		= "zach@collegegeek.org, kripkensteiner@gmail.com, marcospinto@dipconsultants.com"
 DESCRIPTION	= "A bittorrent client written in PyGTK"
@@ -91,8 +101,11 @@ if ARCH == "x64":
 
 if not OS == "win":
 	if OS == "linux":
-		if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1" /etc/issue')) == 0:
+		if os.WEXITSTATUS(os.system('grep -iq "Debian GNU/Linux 4.0\|Ubuntu 7.04\|Ubuntu 6.06\|Fedora Core release 6\|openSUSE 10.2\|Mandriva Linux release 2007.1" /etc/issue')) == 0
-			boosttype = 'nomt'
+			if os.path.exists('/usr/lib/libboost_filesystem-mt.so'):
+				boosttype = 'mt'
+			else:
+				boosttype = 'nomt'
 		else:
 			boosttype = 'mt'
 	elif OS == "freebsd":

src/common.py

@@ -17,6 +17,16 @@
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
 # 	Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 import sys, os, os.path, webbrowser
 import xdg, xdg.BaseDirectory
@@ -24,10 +34,10 @@ import xdg, xdg.BaseDirectory
 import gettext
 
 PROGRAM_NAME = "Deluge"
-PROGRAM_VERSION = "0.5.1"
+PROGRAM_VERSION = "0.5.1.1"
 
 CLIENT_CODE = "DE"
-CLIENT_VERSION = "0510"
+CLIENT_VERSION = "0511"
 
 CONFIG_DIR = xdg.BaseDirectory.save_config_path('deluge')
 

src/core.py

@@ -16,6 +16,16 @@
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
 # 	Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 # Deluge Library, previously known as python-libtorrent:
 #

src/deluge_core.cpp

@@ -17,6 +17,16 @@
  *
  *  Thank You: Some code portions were derived from BSD-licensed work by
  *             Arvid Norberg, and GPL-licensed work by Christophe Dumez
+ *
+ *   In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the OpenSSL
+ *  library.
+ *  You must obey the GNU General Public License in all respects for all of
+ *  the code used other than OpenSSL. If you modify file(s) with this
+ *  exception, you may extend this exception to your version of the file(s),
+ *  but you are not obligated to do so. If you do not wish to do so, delete
+ *  this exception statement from your version. If you delete this exception
+ *  statement from all source files in the program, then also delete it here.
  */
 
 //------------------

src/deluge_stats.py

@@ -16,6 +16,16 @@
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
 # 	Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 import time
 

src/dgtk.py

@@ -17,6 +17,16 @@
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
 # 	Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 # Similar to common, this contains any common functions
 # related to gtk that are needed by the client

src/dialogs.py

@@ -17,6 +17,16 @@
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
 # 	Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 import common, dgtk
 import gtk, gtk.glade

src/interface.py

@@ -19,6 +19,16 @@
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
 # 	Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 import sys, os, os.path, urllib
 import core, common, dgtk, ipc_manager, dialogs

src/ipc_manager.py

@@ -17,6 +17,16 @@
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
 # 	Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 
 # Code for dbus_importing borrowed from Listen (http://listen-project.org)

src/plugins.py

@@ -19,6 +19,16 @@
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
 # 	Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 import os
 

src/pref.py

@@ -17,6 +17,16 @@
 # 	The Free Software Foundation, Inc.,
 # 	51 Franklin Street, Fifth Floor
 # 	Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the OpenSSL
+#  library.
+#  You must obey the GNU General Public License in all respects for all of
+#  the code used other than OpenSSL. If you modify file(s) with this
+#  exception, you may extend this exception to your version of the file(s),
+#  but you are not obligated to do so. If you do not wish to do so, delete
+#  this exception statement from your version. If you delete this exception
+#  statement from all source files in the program, then also delete it here.
 
 
 # Preferences is basically a wrapper around a simple Python dictionary