[Python-apps-commits] r4860 - in packages/autokey/trunk/debian (4 files)

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

    Date: Saturday, February 27, 2010 @ 16:54:45
  Author: ffm-guest
Revision: 4860

New upstream version

Modified:
  packages/autokey/trunk/debian/changelog
  packages/autokey/trunk/debian/patches/00list
  packages/autokey/trunk/debian/rules
Deleted:
  packages/autokey/trunk/debian/patches/0001-daemon-handle-invalid-pids.dpatch

Modified: packages/autokey/trunk/debian/changelog
===================================================================
--- packages/autokey/trunk/debian/changelog	2010-02-25 20:42:21 UTC (rev 4859)
+++ packages/autokey/trunk/debian/changelog	2010-02-27 16:54:45 UTC (rev 4860)
@@ -1,3 +1,12 @@
+autokey (0.61.3-1) unstable; urgency=low
+
+  * debian/rules: call dh_installinit with --error-handler so that install
+    doesn't fail if Autokey cannot be restarted during configure (LP: #479131)
+  * New upstream version:
+    - Merge changes to interface.py from GTK branch that were missed
+
+ -- Luke Faraone <luke at faraone.cc>  Sat, 27 Feb 2010 11:05:08 -0500
+
 autokey (0.61.2-2) unstable; urgency=low
 
   * Set DM-Upload-Allowed to Yes in control

Deleted: packages/autokey/trunk/debian/patches/0001-daemon-handle-invalid-pids.dpatch
===================================================================
--- packages/autokey/trunk/debian/patches/0001-daemon-handle-invalid-pids.dpatch	2010-02-25 20:42:21 UTC (rev 4859)
+++ packages/autokey/trunk/debian/patches/0001-daemon-handle-invalid-pids.dpatch	2010-02-27 16:54:45 UTC (rev 4860)
@@ -1,60 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 0001-daemon-handle-invalid-pids.dpatch by  <luke at faraone.cc>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad trunk~/src/lib/daemon.py trunk/src/lib/daemon.py
---- trunk~/src/lib/daemon.py	2009-12-06 14:20:07.000000000 -0500
-+++ trunk/src/lib/daemon.py	2010-02-03 09:09:34.200496881 -0500
-@@ -62,18 +62,27 @@
- 	
- 	def delpid(self):
- 		os.remove(self.pidfile)
--
--	def start(self):
--		"""
--		Start the daemon
--		"""
--		# Check for a pidfile to see if the daemon already runs
-+	def checkpid(self):
-+		"""Check for a pidfile to see if the daemon already runs
-+		
-+		@references self.pidfile
-+		@returns pid, an int representing the running daemon or None"""
- 		try:
- 			pf = file(self.pidfile,'r')
- 			pid = int(pf.read().strip())
- 			pf.close()
- 		except IOError:
- 			pid = None
-+		except ValueError: 
-+			# the pidfile doesn't match our syntax, ignore it
-+			pid = None
-+		return pid
-+	
-+	def start(self):
-+		"""
-+		Start the daemon
-+		"""
-+		pid = self.checkpid()
- 	
- 		if pid:
- 			message = "pidfile %s already exist. Daemon already running?\n"
-@@ -89,13 +98,8 @@
- 		Stop the daemon
- 		"""
- 		# Get the pid from the pidfile
--		try:
--			pf = file(self.pidfile,'r')
--			pid = int(pf.read().strip())
--			pf.close()
--		except IOError:
--			pid = None
--	
-+		pid = self.checkpid()
-+		
- 		if not pid:
- 			message = "pidfile %s does not exist. Daemon not running?\n"
- 			sys.stderr.write(message % self.pidfile)

Modified: packages/autokey/trunk/debian/patches/00list
===================================================================
--- packages/autokey/trunk/debian/patches/00list	2010-02-25 20:42:21 UTC (rev 4859)
+++ packages/autokey/trunk/debian/patches/00list	2010-02-27 16:54:45 UTC (rev 4860)
@@ -1,2 +1 @@
 # no comment
-0001-daemon-handle-invalid-pids

Modified: packages/autokey/trunk/debian/rules
===================================================================
--- packages/autokey/trunk/debian/rules	2010-02-25 20:42:21 UTC (rev 4859)
+++ packages/autokey/trunk/debian/rules	2010-02-27 16:54:45 UTC (rev 4860)
@@ -11,5 +11,5 @@
 
 # Add here any variable or target overrides you need.
 DEB_INSTALL_MANPAGES_autokey = debian/autokey.1
-DEB_DH_INSTALLINIT_ARGS := --no-start
+DEB_DH_INSTALLINIT_ARGS := --no-start --error-handler=true