[Python-apps-commits] r8290 - in packages/autokey/trunk/debian (9 files)

lfaraone at users.alioth.debian.org lfaraone at users.alioth.debian.org
Sun Mar 11 05:04:55 UTC 2012 

    Date: Sunday, March 11, 2012 @ 05:04:51
  Author: lfaraone
Revision: 8290

* New upstream version.
* Merge in packaging updates from upstream. (Closes: #634823)
* Update copyright information

Modified:
  packages/autokey/trunk/debian/autokey-common.init
  packages/autokey/trunk/debian/autokey-common.install
  packages/autokey/trunk/debian/autokey-common.postinst
  packages/autokey/trunk/debian/autokey-gtk.install
  packages/autokey/trunk/debian/autokey-qt.install
  packages/autokey/trunk/debian/changelog
  packages/autokey/trunk/debian/control
  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	2012-03-10 21:17:43 UTC (rev 8289)
+++ packages/autokey/trunk/debian/autokey-common.init	2012-03-11 05:04:51 UTC (rev 8290)
@@ -13,7 +13,7 @@
 
 import sys, os, socket, glob, shutil, time
 try:
-    from autokey import evdev, daemon
+    from autokey import evdev, daemon, configmanager
     from autokey.common import DOMAIN_SOCKET_PATH, PACKET_SIZE
 except ImportError:
     # Per DPM § 9.3.2 script should fail gracefully if not installed.
@@ -33,6 +33,9 @@
     def __init__(self):
         logFile = "/var/log/autokey-daemon.log"
         daemon.Daemon.__init__(self, '/var/run/autokey-daemon.pid', stdout=logFile, stderr=logFile)
+        
+    def canrecord(self):
+        return configmanager._chooseInterface() == "XRecord"
 
     def get_device_paths(self):
         keyboardLocations = glob.glob("/dev/input/by-path/*-event-kbd")
@@ -145,6 +148,12 @@
             else:
                 print "AutoKey daemon is stopped"
                 sys.exit(3)
+        elif 'status-xrecord' == sys.argv[1]:
+            if not daemon.canrecord():
+                print "XRecord not available"
+                sys.exit(1)
+            else:
+                print "XRecord is available"
         else:
             print "Unknown command"
             sys.exit(2)

Modified: packages/autokey/trunk/debian/autokey-common.install
===================================================================
--- packages/autokey/trunk/debian/autokey-common.install	2012-03-10 21:17:43 UTC (rev 8289)
+++ packages/autokey/trunk/debian/autokey-common.install	2012-03-11 05:04:51 UTC (rev 8290)
@@ -1,13 +1,20 @@
-usr/lib/python*/site-packages/autokey/common.py
-usr/lib/python*/site-packages/autokey/configmanager.py
-usr/lib/python*/site-packages/autokey/daemon.py 
-usr/lib/python*/site-packages/autokey/evdev.py
-usr/lib/python*/site-packages/autokey/__init__.py
-usr/lib/python*/site-packages/autokey/interface.py
-usr/lib/python*/site-packages/autokey/iomediator.py
-usr/lib/python*/site-packages/autokey/model.py
-usr/lib/python*/site-packages/autokey/nogui.py
-usr/lib/python*/site-packages/autokey/scripting.py
-usr/lib/python*/site-packages/autokey/service.py
-usr/lib/python*/site-packages/autokey-*.egg-info
-usr/share/pixmaps/akicon.png
+usr/lib/python*/*-packages/autokey/common.py
+usr/lib/python*/*-packages/autokey/configmanager.py
+usr/lib/python*/*-packages/autokey/daemon.py 
+usr/lib/python*/*-packages/autokey/evdev.py
+usr/lib/python*/*-packages/autokey/__init__.py
+usr/lib/python*/*-packages/autokey/interface.py
+usr/lib/python*/*-packages/autokey/iomediator.py
+usr/lib/python*/*-packages/autokey/model.py
+usr/lib/python*/*-packages/autokey/scripting.py
+usr/lib/python*/*-packages/autokey/service.py
+usr/lib/python*/*-packages/autokey/monitor.py
+usr/lib/python*/*-packages/autokey/macro.py
+usr/lib/python*/*-packages/autokey-*.egg-info
+usr/share/icons/hicolor/scalable/apps/autokey*.svg
+usr/share/icons/hicolor/scalable/apps/autokey.png
+usr/share/icons/Humanity/scalable/apps/*.svg
+usr/share/icons/ubuntu-mono-dark/scalable/apps/*.svg
+usr/share/icons/ubuntu-mono-light/scalable/apps/*.svg
+usr/bin/autokey-run
+usr/share/man/man1/autokey-run.1

Modified: packages/autokey/trunk/debian/autokey-common.postinst
===================================================================
--- packages/autokey/trunk/debian/autokey-common.postinst	2012-03-10 21:17:43 UTC (rev 8289)
+++ packages/autokey/trunk/debian/autokey-common.postinst	2012-03-11 05:04:51 UTC (rev 8290)
@@ -5,10 +5,6 @@
 
 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>
@@ -29,10 +25,15 @@
 
 # Automatically added by dh_installinit
 if [ -x "/etc/init.d/autokey" ]; then
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d autokey start || exit $?
-	else
-		/etc/init.d/autokey start || exit $?
+    /etc/init.d/autokey status-xrecord
+    if [ $? -eq 0 ]; then
+        update-rc.d autokey disable
+    else
+	    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+		    invoke-rc.d autokey start || exit $?
+	    else
+		    /etc/init.d/autokey start || exit $?
+	    fi
 	fi
 fi
 # End automatically added section

Modified: packages/autokey/trunk/debian/autokey-gtk.install
===================================================================
--- packages/autokey/trunk/debian/autokey-gtk.install	2012-03-10 21:17:43 UTC (rev 8289)
+++ packages/autokey/trunk/debian/autokey-gtk.install	2012-03-11 05:04:51 UTC (rev 8290)
@@ -1,6 +1,5 @@
-usr/lib/python*/site-packages/autokey/gtkui/
-usr/lib/python*/site-packages/autokey/gtkapp.py
+usr/lib/python*/*-packages/autokey/gtkui/
+usr/lib/python*/*-packages/autokey/gtkapp.py
 usr/bin/autokey-gtk
 usr/share/applications/autokey-gtk.desktop
-usr/share/man/man1/autokey-gtk.1
-usr/share/pixmaps/akicon-status.png
+usr/share/man/man1/autokey-gtk.1
\ No newline at end of file

Modified: packages/autokey/trunk/debian/autokey-qt.install
===================================================================
--- packages/autokey/trunk/debian/autokey-qt.install	2012-03-10 21:17:43 UTC (rev 8289)
+++ packages/autokey/trunk/debian/autokey-qt.install	2012-03-11 05:04:51 UTC (rev 8290)
@@ -1,5 +1,6 @@
-usr/lib/python*/site-packages/autokey/qtui/
-usr/lib/python*/site-packages/autokey/qtapp.py
+usr/lib/python*/*-packages/autokey/qtui/
+usr/lib/python*/*-packages/autokey/qtapp.py
 usr/bin/autokey-qt
 usr/share/applications/autokey-qt.desktop
 usr/share/man/man1/autokey-qt.1
+usr/share/kde4/apps/autokey/autokeyui.rc
\ No newline at end of file

Modified: packages/autokey/trunk/debian/changelog
===================================================================
--- packages/autokey/trunk/debian/changelog	2012-03-10 21:17:43 UTC (rev 8289)
+++ packages/autokey/trunk/debian/changelog	2012-03-11 05:04:51 UTC (rev 8290)
@@ -1,3 +1,11 @@
+autokey (0.82.2) unstable; urgency=low
+
+  * New upstream version.
+  * Merge in packaging updates from upstream. (Closes: #634823)
+  * Update copyright information
+
+ -- Luke Faraone <lfaraone at debian.org>  Sun, 11 Mar 2012 00:00:17 -0500
+
 autokey (0.71.3-1) unstable; urgency=low
 
   * New upstream version.

Modified: packages/autokey/trunk/debian/control
===================================================================
--- packages/autokey/trunk/debian/control	2012-03-10 21:17:43 UTC (rev 8289)
+++ packages/autokey/trunk/debian/control	2012-03-11 05:04:51 UTC (rev 8290)
@@ -3,27 +3,21 @@
 Section: utils
 Maintainer: Luke Faraone <lfaraone at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: python-all (>= 2.6.6-3~), cdbs (>= 0.4.90~), debhelper (>= 7)
-Build-Depends-indep: python-central
-Standards-Version: 3.9.1
-XS-Python-Version: >= 2.5
+Build-Depends: python (>= 2.5), cdbs (>= 0.4.49), debhelper (>= 7)
+Build-Depends-indep: python-central (>= 0.6.0)
+Standards-Version: 3.8.4
+ XS-Python-Version: >= 2.5
 Homepage: http://code.google.com/p/autokey/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/autokey/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/autokey/trunk/
 
-Package: autokey
-Architecture: all
-Depends: ${misc:Depends}, autokey-${akdefaulttype}, autokey-common
-Description: dummy transitional package for autokey-${akdefaulttype}
- This transitional package helps users transition to the autokey-${akdefaulttype} package. 
- Once this package and its dependencies are installed you can safely remove it.
-
 Package: autokey-common
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-xlib, wmctrl, python (>= 2.6) | python-simplejson
-Replaces: autokey (<<0.61.4-0~0)
-Breaks: autokey (<<0.61.4-0~0)
+Depends: ${python:Depends}, ${misc:Depends}, python-xlib, python-simplejson, python-pyinotify, wmctrl
+Replaces: autokey (<<0.61.4-0~0), autokey-gtk (<<0.70.4-0~0)
+Breaks: autokey (<<0.61.4-0~0), autokey-gtk (<<0.70.4-0~0)
 XB-Python-Version: ${python:Versions}
+Section: utils
 Description: desktop automation utility - common data
  AutoKey is a desktop automation utility for Linux and X11. It allows the 
  automation of virtually any task by responding to typed abbreviations and 
@@ -36,11 +30,11 @@
 Package: autokey-qt
 Section: kde
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-kde4, python-qt4, python-qscintilla2, python-xlib, wmctrl, autokey-common
+Depends: ${python:Depends}, ${misc:Depends}, python-kde4, python-qt4, python-qscintilla2, python-notify, autokey-common
 Replaces: autokey (<<0.61.4-0~0)
 Breaks: autokey (<<0.61.4-0~0)
 XB-Python-Version: ${python:Versions}
-Description: desktop automation utility - QT version
+Description: desktop automation utility - KDE version
  AutoKey is a desktop automation utility for Linux and X11. It allows the 
  automation of virtually any task by responding to typed abbreviations and 
  hotkeys. It offers a full-featured GUI that makes it highly accessible for 
@@ -52,7 +46,7 @@
 Package: autokey-gtk
 Section: gnome
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-gtk2, python-gtksourceview2, python-glade2, python-xlib, python-notify, wmctrl, autokey-common
+Depends: ${python:Depends}, ${misc:Depends}, python-gtk2, python-gtksourceview2, python-glade2, python-notify, python-dbus, zenity, autokey-common
 Replaces: autokey (<<0.61.4-0~0)
 Breaks: autokey (<<0.61.4-0~0)
 XB-Python-Version: ${python:Versions}

Modified: packages/autokey/trunk/debian/copyright
===================================================================
--- packages/autokey/trunk/debian/copyright	2012-03-10 21:17:43 UTC (rev 8289)
+++ packages/autokey/trunk/debian/copyright	2012-03-11 05:04:51 UTC (rev 8290)
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ 
 Upstream-Name: autokey
 Source: http://autokey.googlecode.com/
 
@@ -45,6 +45,6 @@
  `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
-Copyright: © 2009, Chris Dekter <cdekter at gmail.com> 
-           © 2009-2011, Luke Faraone <luke at faraone.cc>
+Copyright: © 2009-2012, Chris Dekter <cdekter at gmail.com> 
+           © 2009-2012, Luke Faraone <lfaraone at debian.org>
 License: GPL-2+

Modified: packages/autokey/trunk/debian/rules
===================================================================
--- packages/autokey/trunk/debian/rules	2012-03-10 21:17:43 UTC (rev 8289)
+++ packages/autokey/trunk/debian/rules	2012-03-11 05:04:51 UTC (rev 8290)
@@ -1,26 +1,12 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON2_MODULE_PACKAGES=autokey
+DEB_PYTHON_SYSTEM=pycentral
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
+
 # 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
-
-DEB_INSTALL_CHANGELOGS_ALL = debian/changelog.upstream
-
-build/autokey::
-	if [ "$$(lsb_release -is)" = "Ubuntu" ]; then \
-		echo akdefaulttype=gtk | tee debian/autokey.substvars; \
-	else \
-		echo akdefaulttype=qt | tee debian/autokey.substvars; \
-	fi
-	echo "$$(lsb_release -is)"
-	dh_python2
-	
-
-clean/autokey::
-	rm debian/substvars
+DEB_DH_INSTALLINIT_ARGS := --no-start --init-script=autokey --error-handler=init_failure

More information about the Python-apps-commits mailing list