← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/torchat/oneiric-updates

« back to all changes in this revision

Viewing changes to debian/patches/use-system-lib-fix-versions.patch

  • Committer: Package Import Robot
  • Author(s): Jamie Strandboge
  • Date: 2012-06-22 17:07:43 UTC
  • Revision ID: package-import@ubuntu.com-20120622170743-4m6brc4wdsx3ixd5
Tags: 0.9.9.534-1ubuntu0.1
https://launchpad.net/bugs/1010420
Remove fixed versioning handling (LP: #1010420)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/use-system-lib-fix-versions.patch
1
1
Author: Dererk <dererk@debian.org>
2
2
Date: 2011-04-17
3
 
Description: Use system socksipy library and fix release versions
 
3
Description: Use system socksipy library 
4
4
 
5
 
--- torchat-0.9.9.530.orig/tc_client.py
6
 
+++ torchat-0.9.9.530/tc_client.py
 
5
Index: torchat-0.9.9.550/tc_client.py
 
6
===================================================================
 
7
--- torchat-0.9.9.550.orig/tc_client.py 2011-11-10 21:14:18.000000000 -0300
 
8
+++ torchat-0.9.9.550/tc_client.py      2011-11-18 11:19:31.000000000 -0300
7
9
@@ -17,7 +17,7 @@
8
10
 # This is the TorChat client library. Import this module, make an instance
9
11
 # of BuddyList, give it your call-back function and your client is running.
13
15
 import socket
14
16
 import threading
15
17
 import random
16
 
@@ -29,7 +29,6 @@ import subprocess
17
 
 import tempfile
18
 
 import hashlib
19
 
 import config
20
 
-import version
21
 
 
22
 
 TORCHAT_PORT = 11009 #do NOT change this.
23
 
 TOR_CONFIG = "tor" #the name of the active section in the .ini file
24
 
@@ -191,7 +190,7 @@ class Buddy(object):
25
 
         self.conn_in = None
26
 
         self.status = STATUS_OFFLINE
27
 
         self.client = ""
28
 
-        self.version = ""
29
 
+        self.version = "0.9.9.530"
30
 
         self.timer = False
31
 
         self.last_status_time = 0
32
 
         self.count_failed_connects = 0
33
 
@@ -505,9 +504,9 @@ class Buddy(object):
34
 
 
35
 
     def sendVersion(self):
36
 
         if self.isAlreadyPonged():
37
 
-            msg = ProtocolMsg_client(self, version.NAME)
38
 
+            msg = ProtocolMsg_client(self, self.name)
39
 
             msg.send()
40
 
-            msg = ProtocolMsg_version(self, version.VERSION)
41
 
+            msg = ProtocolMsg_version(self, self.version)
42
 
             msg.send()
43
 
         else:
44
 
             print "(2) not connected, not sending version to %s" % self.address
45
 
 
46
 
--- torchat-0.9.9.530.orig/tc_gui.py
47
 
+++ torchat-0.9.9.530/tc_gui.py
48
 
@@ -25,7 +25,6 @@ import shutil
49
 
 import time
50
 
 import subprocess
51
 
 import textwrap
52
 
-import version
53
 
 import dlg_settings
54
 
 import translations
55
 
 import tc_notification
56
 
@@ -379,8 +378,8 @@ class PopupMenu(wx.Menu):
57
 
         dialog.ShowModal()
58
 
 
59
 
     def onAbout(self, evt):
60
 
-        wx.MessageBox(lang.ABOUT_TEXT % {"version":version.VERSION,
61
 
-                                         "svn":version.VERSION_SVN,
62
 
+        wx.MessageBox(lang.ABOUT_TEXT % {"version":"0.9.9.530",
63
 
+                                         "svn":"530",
64
 
                                          "copyright":config.COPYRIGHT,
65
 
                                          "python":".".join(str(x) for x in sys.version_info),
66
 
                                          "wx":wx.version(),