summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Tibbitts <zach@collegegeek.org>2007-06-12 16:28:57 +0000
committerZach Tibbitts <zach@collegegeek.org>2007-06-12 16:28:57 +0000
commit018943b210e96b31692bf451cf75ea23fc8646a7 (patch)
treed0cfff18ade7d35315d6b3714ab0b22054038964
parente07d17f6e39a5f62a4f842289b2ae5735b80f9b7 (diff)
downloaddeluge-018943b210e96b31692bf451cf75ea23fc8646a7.tar.gz
deluge-018943b210e96b31692bf451cf75ea23fc8646a7.tar.bz2
deluge-018943b210e96b31692bf451cf75ea23fc8646a7.zip
version number changes, hack to detect boost-mtdeluge-0.5.1.1
-rwxr-xr-xscripts/deluge10
-rw-r--r--setup.py19
-rw-r--r--src/common.py4
3 files changed, 28 insertions, 5 deletions
diff --git a/scripts/deluge b/scripts/deluge
index 9d94ca487..1a42030a0 100755
--- a/scripts/deluge
+++ b/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
diff --git a/setup.py b/setup.py
index 83e5deec1..7b721242d 100644
--- a/setup.py
+++ b/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:
- boosttype = 'nomt'
+ 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.path.exists('/usr/lib/libboost_filesystem-mt.so'):
+ boosttype = 'mt'
+ else:
+ boosttype = 'nomt'
else:
boosttype = 'mt'
elif OS == "freebsd":
diff --git a/src/common.py b/src/common.py
index 68afa8fc0..f91c54e86 100644
--- a/src/common.py
+++ b/src/common.py
@@ -34,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')