[Python-apps-commits] r782 - in packages/phenny/trunk/debian (3 files)

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

    Date: Saturday, March 8, 2008 @ 16:00:13
  Author: nslater-guest
Revision: 782

Updated to newest version and fixed phenny command

Modified:
  packages/phenny/trunk/debian/changelog
  packages/phenny/trunk/debian/patches/command-option.patch
  packages/phenny/trunk/debian/patches/python-version.patch

Modified: packages/phenny/trunk/debian/changelog
===================================================================
--- packages/phenny/trunk/debian/changelog	2008-03-08 15:40:11 UTC (rev 781)
+++ packages/phenny/trunk/debian/changelog	2008-03-08 16:00:13 UTC (rev 782)
@@ -1,4 +1,4 @@
-phenny (2~hg9-1) unstable; urgency=low
+phenny (2~hg11-1) unstable; urgency=low
 
   * Initial release. Closes: #458095
 

Modified: packages/phenny/trunk/debian/patches/command-option.patch
===================================================================
--- packages/phenny/trunk/debian/patches/command-option.patch	2008-03-08 15:40:11 UTC (rev 781)
+++ packages/phenny/trunk/debian/patches/command-option.patch	2008-03-08 16:00:13 UTC (rev 782)
@@ -1,6 +1,6 @@
 diff -Nur phenny-2~hg9.orig/bot.py phenny-2~hg9.orig.new/bot.py
---- phenny-2~hg9.orig/bot.py	2008-03-04 19:54:03.000000000 +0000
-+++ phenny-2~hg9.orig.new/bot.py	2008-03-04 20:03:00.000000000 +0000
+--- phenny-2~hg9.orig/bot.py	2008-03-08 15:48:40.000000000 +0000
++++ phenny-2~hg9.orig.new/bot.py	2008-03-08 15:49:48.000000000 +0000
 @@ -21,9 +21,10 @@
     return text
  
@@ -43,8 +43,8 @@
           if not hasattr(func, 'name'): 
              func.name = func.__name__
 diff -Nur phenny-2~hg9.orig/__init__.py phenny-2~hg9.orig.new/__init__.py
---- phenny-2~hg9.orig/__init__.py	2008-03-04 19:54:03.000000000 +0000
-+++ phenny-2~hg9.orig.new/__init__.py	2008-03-04 20:03:00.000000000 +0000
+--- phenny-2~hg9.orig/__init__.py	2008-03-08 15:48:40.000000000 +0000
++++ phenny-2~hg9.orig.new/__init__.py	2008-03-08 15:49:48.000000000 +0000
 @@ -27,13 +27,13 @@
        try: os.kill(self.child, signal.SIGKILL)
        except OSError: pass
@@ -73,10 +73,14 @@
        t.run()
     else: t.start()
 diff -Nur phenny-2~hg9.orig/phenny phenny-2~hg9.orig.new/phenny
---- phenny-2~hg9.orig/phenny	2008-03-04 19:54:03.000000000 +0000
-+++ phenny-2~hg9.orig.new/phenny	2008-03-04 20:11:34.000000000 +0000
-@@ -98,16 +98,69 @@
+--- phenny-2~hg9.orig/phenny	2008-03-08 15:48:41.000000000 +0000
++++ phenny-2~hg9.orig.new/phenny	2008-03-08 15:50:49.000000000 +0000
+@@ -94,20 +94,74 @@
+    # Step One: Check Dependencies
  
+    check_python_version() # require python2.4 or later
+-   check_dotdir() # require ~/.phenny, or make it and exit
+ 
     # Step Two: Parse The Command Line
  
 -   parser = optparse.OptionParser('%prog [options]')
@@ -142,6 +146,8 @@
 +          display_error("Unknown option: %s" % arg)
 +       else:
 +          display_error("Unknown argument: %s" % arg)
++
++   check_dotdir() # require ~/.phenny, or make it and exit
  
     # Step Three: Load The Configurations
  
@@ -151,7 +157,7 @@
        name = os.path.basename(config_name).split('.')[0] + '_config'
        module = imp.load_source(name, config_name)
        module.filename = config_name
-@@ -137,7 +190,7 @@
+@@ -137,7 +191,7 @@
  
     # @@ ignore SIGHUP
     for config_module in config_modules: 

Modified: packages/phenny/trunk/debian/patches/python-version.patch
===================================================================
--- packages/phenny/trunk/debian/patches/python-version.patch	2008-03-08 15:40:11 UTC (rev 781)
+++ packages/phenny/trunk/debian/patches/python-version.patch	2008-03-08 16:00:13 UTC (rev 782)
@@ -1,9 +1,20 @@
 diff -Nur phenny-2~hg9.orig/phenny phenny-2~hg9.orig.new/phenny
---- phenny-2~hg9.orig/phenny	2008-03-02 16:08:16.000000000 +0000
-+++ phenny-2~hg9.orig.new/phenny	2008-03-02 16:08:34.000000000 +0000
+--- phenny-2~hg9.orig/phenny	2008-03-08 15:51:58.000000000 +0000
++++ phenny-2~hg9.orig.new/phenny	2008-03-08 15:52:19.000000000 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python2.5
  """
  phenny - An IRC Bot
  Copyright 2008, Sean B. Palmer, inamidst.com
+@@ -13,8 +13,8 @@
+ dotdir = os.path.expanduser('~/.phenny')
+ 
+ def check_python_version(): 
+-   if sys.version_info < (2, 4): 
+-      error = 'Error: Requires Python 2.4 or later, from www.python.org'
++   if sys.version_info < (2, 5): 
++      error = 'Error: Requires Python 2.5 or later, from www.python.org'
+       print >> sys.stderr, error
+       sys.exit(1)
+