From: Ed Page <eopage@byu.net>
Date: Sun, 20 Jun 2010 04:08:22 +0000 (-0500)
Subject: Fixing two issues and bumping to 0.8.13-2
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;ds=sidebyside;h=a471c16a9c4de121b731505af4d0db1a07521ace;p=theonering

Fixing two issues and bumping to 0.8.13-2
---

diff --git a/src/constants.py b/src/constants.py
index d76276e..de53beb 100644
--- a/src/constants.py
+++ b/src/constants.py
@@ -3,7 +3,7 @@ import os
 __pretty_app_name__ = "Telepathy-TheOneRing"
 __app_name__ = "telepathy-theonering"
 __version__ = "0.8.13"
-__build__ = 0
+__build__ = 2
 __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".telepathy-theonering")
 _user_settings_ = "%s/settings.ini" % _data_path_
diff --git a/src/gvoice/addressbook.py b/src/gvoice/addressbook.py
index 2a61213..5d29a06 100644
--- a/src/gvoice/addressbook.py
+++ b/src/gvoice/addressbook.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 
+from __future__ import with_statement
+
 
 import logging
 
diff --git a/support/builddeb.py b/support/builddeb.py
index 66ba091..f71edd6 100755
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -34,14 +34,7 @@ __email__ = "eopage@byu.net"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
-* Speed up: login through cookies
-* Speed up: by default TOR disallows DND.  When DND is allowed TOR will not do duplicate work now
-* Adjusted the timeout for hung connections
-* Allowing longer phone calls to kick off a voicemail check (accounted for rejected but not ignored calls originally)
-* Lengthened auto-disconnect from 20-60 seconds
-* Imitating telepathy-butterfly in some changes that have been made
-* Reduced some log noise
-* Optified
+* Fixing a bug introduced in the previous build that prevented launching
 """.strip()
 
 
@@ -125,7 +118,7 @@ def build_package(distribution):
 		p["/usr/share/mission-control/profiles"] = ["theonering.profile.%s|theonering.profile"% distribution]
 	elif distribution in ("diablo", "fremantle"):
 		p["/usr/share/osso-rtcom"] = ["theonering.profile.%s|theonering.profile"% distribution]
-	p["/opt/theonering/bin"] = ["telepathy-theonering"]
+	p["/usr/lib/telepathy"] = ["telepathy-theonering"]
 	p["/usr/share/telepathy/managers"] = ["theonering.manager"]
 	if distribution in ("debian", ):
 		iconBasePath = "/usr/share/icons/gnome/%s/apps"
diff --git a/www/telepathy-theonering.deb b/www/telepathy-theonering.deb
index 99c4eef..ae27197 100644
Binary files a/www/telepathy-theonering.deb and b/www/telepathy-theonering.deb differ