[Pkg-running-devel] [SCM] Debian package for pytrainer branch, master, updated. debian/1.8.0-3-1-g812011b

[Christian Perrier]

The following commit has been merged in the master branch:
commit 812011ba4123148eece1076c97871e6c2b7186f4
Author: Christian Perrier <bubulle at debian.org>
Date:   Sun Oct 9 15:28:04 2011 +0200

    No longer check gpsbabel version number in the code (LP: #694603) but depend on version >= 1.3.5 instead.  Thanks to Xavier Bassery for the patch. Closes: #644210

diff --git a/debian/changelog b/debian/changelog
index 84707a6..c8fafbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pytrainer (1.8.0-4) UNRELEASED; urgency=low
+
+  * No longer check gpsbabel version number in the code (LP: #694603)
+    but depend on version >= 1.3.5 instead.  Thanks to Xavier Bassery for
+    the patch. Closes: #644210
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 09 Oct 2011 15:26:06 +0200
+
 pytrainer (1.8.0-3) unstable; urgency=low
 
   * No longer depend on python-gtkmozembed and depend on python-webkit
diff --git a/debian/patches/02_remove_gpsbabel_version_req.patch b/debian/patches/02_remove_gpsbabel_version_req.patch
new file mode 100644
index 0000000..510b953
--- /dev/null
+++ b/debian/patches/02_remove_gpsbabel_version_req.patch
@@ -0,0 +1,41 @@
+Description: Upstream changes introduced in version 1.8.0-3ubuntu1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ pytrainer (1.8.0-3ubuntu1) oneiric; urgency=low
+ .
+   * No longer check gpsbabel version number in the code (LP: #694603) but
+     depend on version >= 1.3.5 instead.  Thanks to Xavier Bassery for the
+     patch.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Brian Murray <brian at ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/694603
+
+--- pytrainer-1.8.0.orig/plugins/garmin-hr/conf.xml
++++ pytrainer-1.8.0/plugins/garmin-hr/conf.xml
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" ?>
+ <pytrainer-plugin 
+-	name="Garmin via GPSBabel 1.3.5" 
+-	description="Import your records directly from your Garmin GPS device (e.g. Forerunner 205 or 305) using GPSBabel (version 1.3.5)" 
++	name="Garmin via GPSBabel" 
++	description="Import your records directly from your Garmin GPS device (e.g. Forerunner 205 or 305) using GPSBabel" 
+ 	plugincode="garminhr"
+ 	pluginbutton="Import from Garmin GPS device (via GPSBabel)" 
+ 	executable="garminhr" 
+--- pytrainer-1.8.0.orig/plugins/garmin-hr/garminhr.py
++++ pytrainer-1.8.0/plugins/garmin-hr/garminhr.py
+@@ -54,10 +54,7 @@ class garminhr():
+ 	def run(self):
+ 		logging.debug(">>")
+ 		importfiles = []
+-		if not self.checkGPSBabelVersion("1.3.5"):
+-			#TODO Remove Zenity below
+-			os.popen("zenity --error --text='Must be using version 1.3.5 of GPSBabel for this plugin'");
+-		elif self.garminDeviceExists():
++		if self.garminDeviceExists():
+ 			try:
+ 				gpsbabelOutputFile = "%s/file.gtrnctr" % (self.tmpdir)
+ 				#TODO Remove Zenity below
diff --git a/debian/patches/series b/debian/patches/series
index 2da30e3..cc0efed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_port_to_webkit.patch
+02_remove_gpsbabel_version_req.patch

-- 
Debian package for pytrainer