From fb44bdd905808fb7df5fb724e371719c0fb8e1d9 Mon Sep 17 00:00:00 2001
From: Olivier <Olivier@WindowsPC>
Date: Tue, 2 Apr 2013 08:54:07 +0200
Subject: [PATCH 1/2] do not crash in tracker when math3d is not installed

---
 urx/tracker.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/urx/tracker.py b/urx/tracker.py
index cdcdb87..5008dff 100644
--- a/urx/tracker.py
+++ b/urx/tracker.py
@@ -2,8 +2,13 @@ import time
 from multiprocessing import Process, Queue, Event
 
 from urx import urrtmon
-from math3d import Transform
 
+MATH3D = True
+try:
+    import math3d
+except ImportError:
+    MATH3D = False
+    print("pymath3d library could not be found on this computer, disabling use of matrices")
 
 class Tracker(Process):
     def __init__(self, robot_host):
@@ -13,19 +18,22 @@ class Tracker(Process):
         self._stop = Event()
         self._finished = Event()
         self._data = []
-        self.calibration = Transform()
-        self.inverse = self.calibration.inverse()
+	if MATH3D:
+            self.calibration = Transform()
+            self.inverse = self.calibration.inverse()
 
     def _log(self, *args):
         print(self.__class__.__name__, ": ".join([str(i) for i in args]))
 
     def set_calibration_matrix(self, cal):
-        self.calibration = cal
-        self.inverse = self.calibration.inverse()
+	if MATH3D:
+            self.calibration = cal
+            self.inverse = self.calibration.inverse()
 
     def _save_data(self):
-        for data in self._data:
-            data["transform"] = self.inverse * Transform(data["tcp"])
+	if MATH3D:
+            for data in self._data:
+                data["transform"] = self.inverse * Transform(data["tcp"])
         self._queue.put(self._data)
 
 

From 5e9f769ed98ceff1a23f4adc6e951e04fc404f17 Mon Sep 17 00:00:00 2001
From: Olivier R-D <olivier@dummy.com>
Date: Tue, 2 Apr 2013 09:51:29 +0200
Subject: [PATCH 2/2] packaging

---
 make_deb.py | 9 ++++++---
 setup.py    | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/make_deb.py b/make_deb.py
index 2a860c0..96eb05c 100755
--- a/make_deb.py
+++ b/make_deb.py
@@ -8,10 +8,13 @@ from email.utils import formatdate
 
 DEBVERSION = "0.5"
 
-#rev = subprocess.check_output("bzr version-info --check-clean --custom --template='{revno}'", shell=True)
-#bzrstring = "bzr" + str(rev).replace("'","")
-vcsstring = "gitxxx"
+rev = subprocess.check_output("git log -1 --format=\'%ad--%h\' --date=short", shell=True)
+rev = rev.strip()
+rev = str(rev).replace("'","")
+#rev = rev.replace(" ", "T", 1)
+#ev = rev.replace(" ", "Z", 1)
 
+vcsstring = "git" + rev
 
 def get_changelog(progname, version, changelog, date):
     """
diff --git a/setup.py b/setup.py
index 7f4244a..fc157bf 100644
--- a/setup.py
+++ b/setup.py
@@ -4,11 +4,11 @@ from distutils.command.install_data import install_data
 
 import make_deb
 
-setup (name = "python-ur", 
+setup (name = "python-urx", 
         version = make_deb.vcsstring,
         description = "Python library to control an UR robot",
         author = "Olivier Roulet-Dubonnet",
-        url = 'http://launchpad.net/XXX',
+        url = 'https://github.com/oroulet/python-urx',
         packages = ["urx"],
         provides = ["urx"],
         license = "GNU General Public License v3",