[Python-apps-commits] r5080 - in packages/autokey/trunk/debian (changelog control rules)

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

    Date: Monday, April 5, 2010 @ 14:40:35
  Author: ffm-guest
Revision: 5080

Fix dependency substitution for Ubuntu.

Modified:
  packages/autokey/trunk/debian/changelog
  packages/autokey/trunk/debian/control
  packages/autokey/trunk/debian/rules

Modified: packages/autokey/trunk/debian/changelog
===================================================================
--- packages/autokey/trunk/debian/changelog	2010-04-04 10:18:48 UTC (rev 5079)
+++ packages/autokey/trunk/debian/changelog	2010-04-05 14:40:35 UTC (rev 5080)
@@ -1,3 +1,9 @@
+autokey (0.61.7-2) unstable; urgency=low
+
+  * Fix dependency substitution for Ubuntu.
+
+ -- Luke Faraone <luke at faraone.cc>  Mon, 05 Apr 2010 08:38:03 -0400
+
 autokey (0.61.7-1) unstable; urgency=medium
 
   * New upstream version:

Modified: packages/autokey/trunk/debian/control
===================================================================
--- packages/autokey/trunk/debian/control	2010-04-04 10:18:48 UTC (rev 5079)
+++ packages/autokey/trunk/debian/control	2010-04-05 14:40:35 UTC (rev 5080)
@@ -4,7 +4,7 @@
 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 (>= 7)
-Build-Depends-indep: python-central, dpatch
+Build-Depends-indep: python-central
 Standards-Version: 3.8.4
 DM-Upload-Allowed: yes
 XS-Python-Version: >= 2.5
@@ -14,9 +14,9 @@
 
 Package: autokey
 Architecture: all
-Depends: ${misc:Depends}, autokey-qt, autokey-common
-Description: dummy transitional package for autokey-qt
- This transitional package helps users transition to the autokey-qt package. 
+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

Modified: packages/autokey/trunk/debian/rules
===================================================================
--- packages/autokey/trunk/debian/rules	2010-04-04 10:18:48 UTC (rev 5079)
+++ packages/autokey/trunk/debian/rules	2010-04-05 14:40:35 UTC (rev 5080)
@@ -10,3 +10,15 @@
 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
+
+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)"
+	
+
+clean/autokey::
+	rm debian/substvars