diff -Nru conkyemail-2.12/.bzr/branch/last-revision conkyemail-2.13/.bzr/branch/last-revision --- conkyemail-2.12/.bzr/branch/last-revision 2010-11-21 10:41:23.000000000 +0000 +++ conkyemail-2.13/.bzr/branch/last-revision 2010-11-21 10:52:31.000000000 +0000 @@ -1 +1 @@ -29 mark@towerpc1-20101121103910-cgp35dcop1ymhmrv +30 mark@towerpc1-20101121105030-8vl3kj19liaplj3v Binary files /tmp/iPJCIpbvh6/conkyemail-2.12/.bzr/checkout/dirstate and /tmp/XlBw5ZGT41/conkyemail-2.13/.bzr/checkout/dirstate differ Binary files /tmp/iPJCIpbvh6/conkyemail-2.12/.bzr/repository/indices/6e3125546e5e388de68fed50c08b4c9c.iix and /tmp/XlBw5ZGT41/conkyemail-2.13/.bzr/repository/indices/6e3125546e5e388de68fed50c08b4c9c.iix differ Binary files /tmp/iPJCIpbvh6/conkyemail-2.12/.bzr/repository/indices/6e3125546e5e388de68fed50c08b4c9c.rix and /tmp/XlBw5ZGT41/conkyemail-2.13/.bzr/repository/indices/6e3125546e5e388de68fed50c08b4c9c.rix differ diff -Nru conkyemail-2.12/.bzr/repository/indices/6e3125546e5e388de68fed50c08b4c9c.six conkyemail-2.13/.bzr/repository/indices/6e3125546e5e388de68fed50c08b4c9c.six --- conkyemail-2.12/.bzr/repository/indices/6e3125546e5e388de68fed50c08b4c9c.six 1970-01-01 00:00:00.000000000 +0000 +++ conkyemail-2.13/.bzr/repository/indices/6e3125546e5e388de68fed50c08b4c9c.six 2010-11-21 10:52:31.000000000 +0000 @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + Binary files /tmp/iPJCIpbvh6/conkyemail-2.12/.bzr/repository/indices/6e3125546e5e388de68fed50c08b4c9c.tix and /tmp/XlBw5ZGT41/conkyemail-2.13/.bzr/repository/indices/6e3125546e5e388de68fed50c08b4c9c.tix differ Binary files /tmp/iPJCIpbvh6/conkyemail-2.12/.bzr/repository/indices/bb83ce7c90bd14ca4372950cb285d6a2.iix and /tmp/XlBw5ZGT41/conkyemail-2.13/.bzr/repository/indices/bb83ce7c90bd14ca4372950cb285d6a2.iix differ Binary files /tmp/iPJCIpbvh6/conkyemail-2.12/.bzr/repository/indices/bb83ce7c90bd14ca4372950cb285d6a2.rix and /tmp/XlBw5ZGT41/conkyemail-2.13/.bzr/repository/indices/bb83ce7c90bd14ca4372950cb285d6a2.rix differ diff -Nru conkyemail-2.12/.bzr/repository/indices/bb83ce7c90bd14ca4372950cb285d6a2.six conkyemail-2.13/.bzr/repository/indices/bb83ce7c90bd14ca4372950cb285d6a2.six --- conkyemail-2.12/.bzr/repository/indices/bb83ce7c90bd14ca4372950cb285d6a2.six 2010-11-21 10:41:23.000000000 +0000 +++ conkyemail-2.13/.bzr/repository/indices/bb83ce7c90bd14ca4372950cb285d6a2.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/iPJCIpbvh6/conkyemail-2.12/.bzr/repository/indices/bb83ce7c90bd14ca4372950cb285d6a2.tix and /tmp/XlBw5ZGT41/conkyemail-2.13/.bzr/repository/indices/bb83ce7c90bd14ca4372950cb285d6a2.tix differ Binary files /tmp/iPJCIpbvh6/conkyemail-2.12/.bzr/repository/pack-names and /tmp/XlBw5ZGT41/conkyemail-2.13/.bzr/repository/pack-names differ Binary files /tmp/iPJCIpbvh6/conkyemail-2.12/.bzr/repository/packs/6e3125546e5e388de68fed50c08b4c9c.pack and /tmp/XlBw5ZGT41/conkyemail-2.13/.bzr/repository/packs/6e3125546e5e388de68fed50c08b4c9c.pack differ Binary files /tmp/iPJCIpbvh6/conkyemail-2.12/.bzr/repository/packs/bb83ce7c90bd14ca4372950cb285d6a2.pack and /tmp/XlBw5ZGT41/conkyemail-2.13/.bzr/repository/packs/bb83ce7c90bd14ca4372950cb285d6a2.pack differ diff -Nru conkyemail-2.12/CHANGELOG conkyemail-2.13/CHANGELOG --- conkyemail-2.12/CHANGELOG 2010-11-21 10:41:23.000000000 +0000 +++ conkyemail-2.13/CHANGELOG 2010-11-21 10:52:31.000000000 +0000 @@ -1,3 +1,9 @@ +conkyemail (2.13) 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) Sun, 21 November 2010 10:45:00 +0000 + conkyemail (2.12) 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) diff -Nru conkyemail-2.12/conkyEmail conkyemail-2.13/conkyEmail --- conkyemail-2.12/conkyEmail 2010-11-21 10:41:23.000000000 +0000 +++ conkyemail-2.13/conkyEmail 2010-11-21 10:52:31.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh cd /usr/share/conkyemail/ -pythoncmd="/usr/share/conkyemail/conkyEmail.py "$@" +pythoncmd="/usr/share/conkyemail/conkyEmail.py $@" if [ -f /usr/bin/python2 ]; then cmd="/usr/bin/python2 $pythoncmd" diff -Nru conkyemail-2.12/conkyEmail.py conkyemail-2.13/conkyEmail.py --- conkyemail-2.12/conkyEmail.py 2010-11-21 10:41:23.000000000 +0000 +++ conkyemail-2.13/conkyEmail.py 2010-11-21 10:52:31.000000000 +0000 @@ -509,7 +509,7 @@ if options.version == True: - print >> sys.stdout,"conkyEmail v.2.12" + print >> sys.stdout,"conkyEmail v.2.13" else: diff -Nru conkyemail-2.12/debian/changelog conkyemail-2.13/debian/changelog --- conkyemail-2.12/debian/changelog 2010-11-21 10:41:27.000000000 +0000 +++ conkyemail-2.13/debian/changelog 2010-11-21 10:52:35.000000000 +0000 @@ -1,3 +1,9 @@ +conkyemail (2.13) 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) Sun, 21 November 2010 10:45:00 +0000 + conkyemail (2.12) 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) Binary files /tmp/iPJCIpbvh6/conkyemail-2.12/dist/conkyemail-2.12.tar.gz and /tmp/XlBw5ZGT41/conkyemail-2.13/dist/conkyemail-2.12.tar.gz differ Binary files /tmp/iPJCIpbvh6/conkyemail-2.12/dist/conkyemail-2.13.tar.gz and /tmp/XlBw5ZGT41/conkyemail-2.13/dist/conkyemail-2.13.tar.gz differ diff -Nru conkyemail-2.12/setup.py conkyemail-2.13/setup.py --- conkyemail-2.12/setup.py 2010-11-21 10:41:23.000000000 +0000 +++ conkyemail-2.13/setup.py 2010-11-21 10:52:31.000000000 +0000 @@ -32,7 +32,7 @@ setup( name = 'conkyemail', - version = '2.12', + version = '2.13', description = 'Conky Email', long_description = "Email inbox count script with ssl capabilities, for use in Conky", author = 'Mark Buck (Kaivalagi)',