[Python-apps-commits] r4257 - in packages/autokey/trunk/debian (7 files)

[ffm-guest at users.alioth.debian.org]

    Date: Sunday, December 6, 2009 @ 19:40:37
  Author: ffm-guest
Revision: 4257

New upstream version, switch to dpatch, cherry pick l10n fix.

Added:
  packages/autokey/trunk/debian/README.source
  packages/autokey/trunk/debian/patches/
  packages/autokey/trunk/debian/patches/00list
  packages/autokey/trunk/debian/patches/1000-daemon-fix.dpatch
Modified:
  packages/autokey/trunk/debian/changelog
  packages/autokey/trunk/debian/control
  packages/autokey/trunk/debian/rules

Added: packages/autokey/trunk/debian/README.source
===================================================================
--- packages/autokey/trunk/debian/README.source	                        (rev 0)
+++ packages/autokey/trunk/debian/README.source	2009-12-06 19:40:37 UTC (rev 4257)
@@ -0,0 +1,4 @@
+This package uses dpatch. See /usr/share/doc/dpatch/README.source.gz 
+for an explanation of what that means and how to handle it.
+
+    -- Luke Faraone <luke at faraone.cc>, Sun Dec 6 14:37

Modified: packages/autokey/trunk/debian/changelog
===================================================================
--- packages/autokey/trunk/debian/changelog	2009-12-06 14:00:37 UTC (rev 4256)
+++ packages/autokey/trunk/debian/changelog	2009-12-06 19:40:37 UTC (rev 4257)
@@ -1,3 +1,10 @@
+autokey (0.61.0a-1) unstable; urgency=low
+
+  * New upstream version
+  * Patch daemon.py to fix bugs in non-english locales (LP: #479131) 
+
+ -- Luke Faraone <luke at faraone.cc>  Sun, 06 Dec 2009 14:21:22 -0500
+
 autokey (0.60.7a-1) unstable; urgency=low
 
   * New upstream version

Modified: packages/autokey/trunk/debian/control
===================================================================
--- packages/autokey/trunk/debian/control	2009-12-06 14:00:37 UTC (rev 4256)
+++ packages/autokey/trunk/debian/control	2009-12-06 19:40:37 UTC (rev 4257)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Luke Faraone <luke at faraone.cc>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: python (>= 2.5), cdbs (>= 0.4.49), debhelper (>= 6)
+Build-Depends: python (>= 2.5), cdbs (>= 0.4.49), debhelper (>= 6), dpatch
 Build-Depends-indep: python-central (>= 0.6.0)
 Standards-Version: 3.8.3
 XS-Python-Version: >= 2.5

Added: packages/autokey/trunk/debian/patches/00list
===================================================================
--- packages/autokey/trunk/debian/patches/00list	                        (rev 0)
+++ packages/autokey/trunk/debian/patches/00list	2009-12-06 19:40:37 UTC (rev 4257)
@@ -0,0 +1 @@
+1000-daemon-fix.dpatch

Added: packages/autokey/trunk/debian/patches/1000-daemon-fix.dpatch
===================================================================
--- packages/autokey/trunk/debian/patches/1000-daemon-fix.dpatch	                        (rev 0)
+++ packages/autokey/trunk/debian/patches/1000-daemon-fix.dpatch	2009-12-06 19:40:37 UTC (rev 4257)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 1000-daemon-fix.dpatch by  <luke at faraone.cc>
+##
+
+## From: Luke Faraone <luke at faraone.cc>
+## Description: Check error codes rather than error strings.
+## Bug: http://code.google.com/p/autokey/issues/detail?id=17
+
+ at DPATCH@
+diff -urNad trunk~/src/lib/daemon.py trunk/src/lib/daemon.py
+--- trunk~/src/lib/daemon.py	2009-07-03 23:50:07.000000000 -0400
++++ trunk/src/lib/daemon.py	2009-12-06 14:26:20.369707310 -0500
+@@ -107,8 +107,7 @@
+ 				os.kill(pid, SIGTERM)
+ 				time.sleep(0.1)
+ 		except OSError, err:
+-			err = str(err)
+-			if err.find("No such process") > 0:
++			if err.errno = 3:
+ 				if os.path.exists(self.pidfile):
+ 					os.remove(self.pidfile)
+ 			else:


Property changes on: packages/autokey/trunk/debian/patches/1000-daemon-fix.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/autokey/trunk/debian/rules
===================================================================
--- packages/autokey/trunk/debian/rules	2009-12-06 14:00:37 UTC (rev 4256)
+++ packages/autokey/trunk/debian/rules	2009-12-06 19:40:37 UTC (rev 4257)
@@ -5,6 +5,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
+include /usr/share/cdbs/1/rules/dpatch.mk
+# needed to use the dpatch tools (like dpatch-edit-patch)
+include /usr/share/dpatch/dpatch.make
 
 # Add here any variable or target overrides you need.
 DEB_INSTALL_MANPAGES_autokey = debian/autokey.1