[Python-apps-commits] r5012 - in packages/autokey/trunk/debian (5 files)

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

    Date: Tuesday, March 23, 2010 @ 16:11:50
  Author: ffm-guest
Revision: 5012

Trigger python-support before starting the autokey-common daemon. Include uncommited fix from last security upload.

Modified:
  packages/autokey/trunk/debian/autokey-common.init
  packages/autokey/trunk/debian/autokey-common.postinst
  packages/autokey/trunk/debian/changelog
  packages/autokey/trunk/debian/copyright
  packages/autokey/trunk/debian/rules

Modified: packages/autokey/trunk/debian/autokey-common.init
===================================================================
--- packages/autokey/trunk/debian/autokey-common.init	2010-03-23 16:11:20 UTC (rev 5011)
+++ packages/autokey/trunk/debian/autokey-common.init	2010-03-23 16:11:50 UTC (rev 5012)
@@ -34,7 +34,7 @@
         logFile = "/var/log/autokey-daemon.log"
         if os.path.exists(logFile):
             shutil.move(logFile, logFile + '.old')
-        daemon.Daemon.__init__(self, '/tmp/autokey-daemon.pid', stdout=logFile, stderr=logFile)
+        daemon.Daemon.__init__(self, '/var/run/autokey-daemon.pid', stdout=logFile, stderr=logFile)
 
     def get_device_paths(self):
         keyboardLocations = glob.glob("/dev/input/by-path/*-event-kbd")

Modified: packages/autokey/trunk/debian/autokey-common.postinst
===================================================================
--- packages/autokey/trunk/debian/autokey-common.postinst	2010-03-23 16:11:20 UTC (rev 5011)
+++ packages/autokey/trunk/debian/autokey-common.postinst	2010-03-23 16:11:50 UTC (rev 5012)
@@ -5,6 +5,10 @@
 
 set -e
 
+
+# We need python-support triggers activated before we start the daemon.
+update-python-modules -p
+
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
 #        * <old-postinst> `abort-upgrade' <new version>

Modified: packages/autokey/trunk/debian/changelog
===================================================================
--- packages/autokey/trunk/debian/changelog	2010-03-23 16:11:20 UTC (rev 5011)
+++ packages/autokey/trunk/debian/changelog	2010-03-23 16:11:50 UTC (rev 5012)
@@ -4,8 +4,9 @@
      - Combine GTK and QT versions into single source tree 
   * Provide "autokey" as a transitional package to autokey-common
     and autokey-qt
+  * Trigger python-support before starting the autokey-common daemon.
 
- -- Luke Faraone <luke at faraone.cc>  Sat, 20 Mar 2010 13:34:08 -0400
+ -- Luke Faraone <luke at faraone.cc>  Tue, 23 Mar 2010 10:19:47 -0400
 
 autokey (0.61.3-2) unstable; urgency=high
 

Modified: packages/autokey/trunk/debian/copyright
===================================================================
--- packages/autokey/trunk/debian/copyright	2010-03-23 16:11:20 UTC (rev 5011)
+++ packages/autokey/trunk/debian/copyright	2010-03-23 16:11:50 UTC (rev 5012)
@@ -34,6 +34,6 @@
 The Debian packaging is 
 
     Copyright © 2009, Chris Dekter <cdekter at gmail.com> 
-    Copyright © 2009, Luke Faraone <luke at faraone.cc>
+    Copyright © 2009 - 2010, Luke Faraone <luke at faraone.cc>
 
 and is licensed under the GPL, see above.

Modified: packages/autokey/trunk/debian/rules
===================================================================
--- packages/autokey/trunk/debian/rules	2010-03-23 16:11:20 UTC (rev 5011)
+++ packages/autokey/trunk/debian/rules	2010-03-23 16:11:50 UTC (rev 5012)
@@ -7,4 +7,6 @@
 
 
 # Add here any variable or target overrides you need.
+DEB_INSTALL_MANPAGES_autokey_qt = debian/autokey-qt.1
+DEB_INSTALL_MANPAGES_autokey_gtk = debian/autokey-gtk.1
 DEB_DH_INSTALLINIT_ARGS := --no-start --init-script=autokey --error-handler=true