diff -Nru conkytext-2.03/.bzr/branch/last-revision conkytext-2.04/.bzr/branch/last-revision
--- conkytext-2.03/.bzr/branch/last-revision	2010-10-25 20:38:44.000000000 +0000
+++ conkytext-2.04/.bzr/branch/last-revision	2010-11-21 11:22:08.000000000 +0000
@@ -1 +1 @@
-6 mark@towerpc1-20101025203737-58vrh8aeyb8s11kh
+7 mark@towerpc1-20101121111651-1gnalk3rfbk1d7xg
Binary files /tmp/q7uxZ4A2gf/conkytext-2.03/.bzr/checkout/dirstate and /tmp/Q8YDKEUoRd/conkytext-2.04/.bzr/checkout/dirstate differ
Binary files /tmp/q7uxZ4A2gf/conkytext-2.03/.bzr/repository/indices/7846fd4faca8521b6bd11e0183dc9384.iix and /tmp/Q8YDKEUoRd/conkytext-2.04/.bzr/repository/indices/7846fd4faca8521b6bd11e0183dc9384.iix differ
Binary files /tmp/q7uxZ4A2gf/conkytext-2.03/.bzr/repository/indices/7846fd4faca8521b6bd11e0183dc9384.rix and /tmp/Q8YDKEUoRd/conkytext-2.04/.bzr/repository/indices/7846fd4faca8521b6bd11e0183dc9384.rix differ
diff -Nru conkytext-2.03/.bzr/repository/indices/7846fd4faca8521b6bd11e0183dc9384.six conkytext-2.04/.bzr/repository/indices/7846fd4faca8521b6bd11e0183dc9384.six
--- conkytext-2.03/.bzr/repository/indices/7846fd4faca8521b6bd11e0183dc9384.six	2010-10-25 20:38:44.000000000 +0000
+++ conkytext-2.04/.bzr/repository/indices/7846fd4faca8521b6bd11e0183dc9384.six	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-
Binary files /tmp/q7uxZ4A2gf/conkytext-2.03/.bzr/repository/indices/7846fd4faca8521b6bd11e0183dc9384.tix and /tmp/Q8YDKEUoRd/conkytext-2.04/.bzr/repository/indices/7846fd4faca8521b6bd11e0183dc9384.tix differ
Binary files /tmp/q7uxZ4A2gf/conkytext-2.03/.bzr/repository/indices/be9fb8a8f1cf2c10ba78f16596f5d692.iix and /tmp/Q8YDKEUoRd/conkytext-2.04/.bzr/repository/indices/be9fb8a8f1cf2c10ba78f16596f5d692.iix differ
Binary files /tmp/q7uxZ4A2gf/conkytext-2.03/.bzr/repository/indices/be9fb8a8f1cf2c10ba78f16596f5d692.rix and /tmp/Q8YDKEUoRd/conkytext-2.04/.bzr/repository/indices/be9fb8a8f1cf2c10ba78f16596f5d692.rix differ
diff -Nru conkytext-2.03/.bzr/repository/indices/be9fb8a8f1cf2c10ba78f16596f5d692.six conkytext-2.04/.bzr/repository/indices/be9fb8a8f1cf2c10ba78f16596f5d692.six
--- conkytext-2.03/.bzr/repository/indices/be9fb8a8f1cf2c10ba78f16596f5d692.six	1970-01-01 00:00:00.000000000 +0000
+++ conkytext-2.04/.bzr/repository/indices/be9fb8a8f1cf2c10ba78f16596f5d692.six	2010-11-21 11:22:08.000000000 +0000
@@ -0,0 +1,5 @@
+Bazaar Graph Index 1
+node_ref_lists=0
+key_elements=1
+len=0
+
Binary files /tmp/q7uxZ4A2gf/conkytext-2.03/.bzr/repository/indices/be9fb8a8f1cf2c10ba78f16596f5d692.tix and /tmp/Q8YDKEUoRd/conkytext-2.04/.bzr/repository/indices/be9fb8a8f1cf2c10ba78f16596f5d692.tix differ
Binary files /tmp/q7uxZ4A2gf/conkytext-2.03/.bzr/repository/pack-names and /tmp/Q8YDKEUoRd/conkytext-2.04/.bzr/repository/pack-names differ
Binary files /tmp/q7uxZ4A2gf/conkytext-2.03/.bzr/repository/packs/7846fd4faca8521b6bd11e0183dc9384.pack and /tmp/Q8YDKEUoRd/conkytext-2.04/.bzr/repository/packs/7846fd4faca8521b6bd11e0183dc9384.pack differ
Binary files /tmp/q7uxZ4A2gf/conkytext-2.03/.bzr/repository/packs/be9fb8a8f1cf2c10ba78f16596f5d692.pack and /tmp/Q8YDKEUoRd/conkytext-2.04/.bzr/repository/packs/be9fb8a8f1cf2c10ba78f16596f5d692.pack differ
diff -Nru conkytext-2.03/CHANGELOG conkytext-2.04/CHANGELOG
--- conkytext-2.03/CHANGELOG	2010-10-25 20:38:44.000000000 +0000
+++ conkytext-2.04/CHANGELOG	2010-11-21 11:22:08.000000000 +0000
@@ -1,3 +1,9 @@
+conkytext (2.04) hardy; urgency=low
+
+  * Updated the /usr/bin/ script to dynamically call the available python exec as /usr/bin/python is linked to Python 3 (Arch) or will be at some point (Ubuntu)
+    
+ -- Mark Buck (Kaivalagi) <m_buck@hotmail.com>  Sun, 21 November 2010 10:45:00 +0000
+ 
 conkytext (2.03) hardy; urgency=low
 
   * Updated the /usr/bin/ script to use the python2 sym link instead of python as Python 3 is either here (Arch) or coming (Ubuntu)
diff -Nru conkytext-2.03/conkyText conkytext-2.04/conkyText
--- conkytext-2.03/conkyText	2010-10-25 20:38:44.000000000 +0000
+++ conkytext-2.04/conkyText	2010-11-21 11:22:08.000000000 +0000
@@ -1,3 +1,18 @@
 #! /bin/sh
 cd /usr/share/conkytext/
-/usr/bin/python2 /usr/share/conkytext/conkyText.py "$@"
+
+pythoncmd="/usr/share/conkytext/conkyText.py $@"
+
+if [ -f /usr/bin/python2 ]; then
+	cmd="/usr/bin/python2 $pythoncmd"
+elif [ -f /usr/bin/python2.7 ] ; then
+	cmd="/usr/bin/python2.7 $pythoncmd"
+elif [ -f /usr/bin/python2.6 ] ; then
+	cmd="/usr/bin/python2.6 $pythoncmd"
+else
+	# here's hoping!
+	cmd="/usr/bin/python $pythoncmd"
+fi
+
+exec $cmd
+
diff -Nru conkytext-2.03/conkyText.py conkytext-2.04/conkyText.py
--- conkytext-2.03/conkyText.py	2010-10-25 20:38:44.000000000 +0000
+++ conkytext-2.04/conkyText.py	2010-11-21 11:22:08.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 ###############################################################################
 # conkyText.py is a simple python script to format a delimited text file with
@@ -116,7 +116,7 @@
     (options, args) = parser.parse_args()
 
     if options.version == True:
-        print >> sys.stdout,"conkyText v.2.03"
+        print >> sys.stdout,"conkyText v.2.04"
     else:
         if options.verbose == True:
             print >> sys.stdout, "*** INITIAL OPTIONS:"
diff -Nru conkytext-2.03/debian/changelog conkytext-2.04/debian/changelog
--- conkytext-2.03/debian/changelog	2010-10-25 20:38:47.000000000 +0000
+++ conkytext-2.04/debian/changelog	2010-11-21 11:22:12.000000000 +0000
@@ -1,3 +1,9 @@
+conkytext (2.04) hardy; urgency=low
+
+  * Updated the /usr/bin/ script to dynamically call the available python exec as /usr/bin/python is linked to Python 3 (Arch) or will be at some point (Ubuntu)
+    
+ -- Mark Buck (Kaivalagi) <m_buck@hotmail.com>  Sun, 21 November 2010 10:45:00 +0000
+ 
 conkytext (2.03) hardy; urgency=low
 
   * Updated the /usr/bin/ script to use the python2 sym link instead of python as Python 3 is either here (Arch) or coming (Ubuntu)
Binary files /tmp/q7uxZ4A2gf/conkytext-2.03/dist/conkytext-2.03.tar.gz and /tmp/Q8YDKEUoRd/conkytext-2.04/dist/conkytext-2.03.tar.gz differ
Binary files /tmp/q7uxZ4A2gf/conkytext-2.03/dist/conkytext-2.04.tar.gz and /tmp/Q8YDKEUoRd/conkytext-2.04/dist/conkytext-2.04.tar.gz differ
diff -Nru conkytext-2.03/setup.py conkytext-2.04/setup.py
--- conkytext-2.03/setup.py	2010-10-25 20:38:44.000000000 +0000
+++ conkytext-2.04/setup.py	2010-11-21 11:22:08.000000000 +0000
@@ -32,7 +32,7 @@
 
 setup(
 		name             = 'conkytext',
-		version          = '2.03',
+		version          = '2.04',
 		description      = 'Conky Text',
 		long_description = "Delimited text file formatting using a template, for use in Conky",
 		author           = 'Mark Buck (Kaivalagi)',