[Python-apps-commits] r764 - in packages/phenny/trunk/debian (16 files)
nslater-guest at users.alioth.debian.org
nslater-guest at users.alioth.debian.org
Tue Mar 4 21:50:21 UTC 2008
Date: Tuesday, March 4, 2008 @ 21:50:19
Author: nslater-guest
Revision: 764
finnishing work on phenny package
Added:
packages/phenny/trunk/debian/dirs
packages/phenny/trunk/debian/manpages
packages/phenny/trunk/debian/patches/
packages/phenny/trunk/debian/patches/catch-exception.patch
packages/phenny/trunk/debian/patches/command-option.patch
packages/phenny/trunk/debian/patches/default-configuration.patch
packages/phenny/trunk/debian/patches/module-home.patch
packages/phenny/trunk/debian/patches/module-import.patch
packages/phenny/trunk/debian/patches/module-include-exclude.patch
packages/phenny/trunk/debian/patches/non-executable.patch
packages/phenny/trunk/debian/patches/python-version.patch
Modified:
packages/phenny/trunk/debian/changelog
packages/phenny/trunk/debian/control
packages/phenny/trunk/debian/copyright
packages/phenny/trunk/debian/pyversions
packages/phenny/trunk/debian/rules
Modified: packages/phenny/trunk/debian/changelog
===================================================================
--- packages/phenny/trunk/debian/changelog 2008-03-04 18:27:26 UTC (rev 763)
+++ packages/phenny/trunk/debian/changelog 2008-03-04 21:50:19 UTC (rev 764)
@@ -1,4 +1,4 @@
-phenny (hg3-1) unstable; urgency=low
+phenny (2~hg9-1) unstable; urgency=low
* Initial release. Closes: #458095
Modified: packages/phenny/trunk/debian/control
===================================================================
--- packages/phenny/trunk/debian/control 2008-03-04 18:27:26 UTC (rev 763)
+++ packages/phenny/trunk/debian/control 2008-03-04 21:50:19 UTC (rev 764)
@@ -5,7 +5,7 @@
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Standards-Version: 3.7.3
Build-Depends: cdbs (>= 0.4.42), debhelper (>= 5.0.37.2)
-Build-Depends-Indep: python
+Build-Depends-Indep: help2man, python-support (>= 0.6.4), python
Homepage: http://inamidst.com/phenny/
Vcs-Svn: svn://svn.debian.org/python-apps/packages/phenny/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/python-apps/packages/phenny/trunk/?op=log
Modified: packages/phenny/trunk/debian/copyright
===================================================================
--- packages/phenny/trunk/debian/copyright 2008-03-04 18:27:26 UTC (rev 763)
+++ packages/phenny/trunk/debian/copyright 2008-03-04 21:50:19 UTC (rev 764)
@@ -4,10 +4,10 @@
X-Source-Downloaded-From: http://inamidst.com/phenny/
X-Source-Get-Original: ./debian/rules get-orig-source
X-Source-Original-Depends: mercurial
-X-Upstream-Author: Sean B. Palmer <sean at miscoranda.com>
+X-Upstream-Author: Sean B. Palmer <http://inamidst.com/sbp/>
Files: *
-Copyright: Copyright (C) 2008 Sean B. Palmer <sean at miscoranda.com>
+Copyright: Copyright (C) 2008 Sean B. Palmer <http://inamidst.com/sbp/>
License: EFL-2
Licenced under the the Eiffel Forum License Version 2.
.
Added: packages/phenny/trunk/debian/dirs
===================================================================
--- packages/phenny/trunk/debian/dirs (rev 0)
+++ packages/phenny/trunk/debian/dirs 2008-03-04 21:50:19 UTC (rev 764)
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/python-support/phenny/phenny/modules
Added: packages/phenny/trunk/debian/manpages
===================================================================
--- packages/phenny/trunk/debian/manpages (rev 0)
+++ packages/phenny/trunk/debian/manpages 2008-03-04 21:50:19 UTC (rev 764)
@@ -0,0 +1 @@
+phenny.1
Added: packages/phenny/trunk/debian/patches/catch-exception.patch
===================================================================
--- packages/phenny/trunk/debian/patches/catch-exception.patch (rev 0)
+++ packages/phenny/trunk/debian/patches/catch-exception.patch 2008-03-04 21:50:19 UTC (rev 764)
@@ -0,0 +1,27 @@
+diff -Nur phenny-2~hg9.orig/irc.py phenny-2~hg9.orig.new/irc.py
+--- phenny-2~hg9.orig/irc.py 2008-03-03 21:06:25.000000000 +0000
++++ phenny-2~hg9.orig.new/irc.py 2008-03-03 21:06:31.000000000 +0000
+@@ -150,20 +150,9 @@
+ def error(self, origin):
+ try:
+ import traceback
+- trace = traceback.format_exc()
+- print trace
+- lines = list(reversed(trace.splitlines()))
+-
+- report = [lines[0].strip()]
+- for line in lines:
+- line = line.strip()
+- if line.startswith('File "/'):
+- report.append(line[0].lower() + line[1:])
+- break
+- else: report.append('source unknown')
+-
+- self.msg(origin.sender, report[0] + ' (' + report[1] + ')')
+- except: self.msg(origin.sender, "Got an error.")
++ print >> sys.stderr, traceback.format_exc()
++ except:
++ print >> sys.stderr, "Unknown error."
+
+ class TestBot(Bot):
+ def f_ping(self, origin, match, args):
Added: packages/phenny/trunk/debian/patches/command-option.patch
===================================================================
--- packages/phenny/trunk/debian/patches/command-option.patch (rev 0)
+++ packages/phenny/trunk/debian/patches/command-option.patch 2008-03-04 21:50:19 UTC (rev 764)
@@ -0,0 +1,162 @@
+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
+@@ -21,9 +21,10 @@
+ return text
+
+ class Phenny(irc.Bot):
+- def __init__(self, config):
++ def __init__(self, config, verbose):
+ irc.Bot.__init__(self, config.nick, config.name, config.channels)
+ self.config = config
++ self.verbose = verbose
+ self.doc = {}
+ self.stats = {}
+ self.setup()
+@@ -62,12 +63,16 @@
+ self.register(vars(module))
+ modules.append(name)
+
+- if modules:
+- print >> sys.stderr, 'Registered modules:', ', '.join(modules)
++ if modules:
++ if self.verbose:
++ print >> sys.stderr, 'Registered modules:', ', '.join(modules)
+ else: print >> sys.stderr, "Warning: Couldn't find any modules"
+
+ self.bind_commands()
+
++ if self.verbose:
++ print "Phenny has loaded config: %s" % self.config.__file__
++
+ def register(self, variables):
+ # This is used by reload.py, hence it being methodised
+ for name, obj in variables.iteritems():
+@@ -78,7 +83,8 @@
+ self.commands = {'high': {}, 'medium': {}, 'low': {}}
+
+ def bind(self, priority, regexp, func):
+- print priority, regexp.pattern.encode('utf-8'), func
++ if self.verbose:
++ print priority, regexp.pattern.encode('utf-8'), func
+ # register documentation
+ 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
+@@ -27,13 +27,13 @@
+ try: os.kill(self.child, signal.SIGKILL)
+ except OSError: pass
+
+-def run_phenny(config):
++def run_phenny(config, verbose):
+ if hasattr(config, 'delay'):
+ delay = config.delay
+ else: delay = 20
+
+ def connect(config):
+- p = bot.Phenny(config)
++ p = bot.Phenny(config, verbose)
+ p.run(config.host)
+
+ Watcher()
+@@ -49,8 +49,8 @@
+ print >> sys.stderr, warning
+ time.sleep(delay)
+
+-def run(config):
+- t = threading.Thread(target=run_phenny, args=(config,))
++def run(config, verbose):
++ t = threading.Thread(target=run_phenny, args=(config,verbose))
+ if hasattr(t, 'run'):
+ 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 @@
+
+ # Step Two: Parse The Command Line
+
+- parser = optparse.OptionParser('%prog [options]')
+- parser.add_option('-c', '--config', metavar='fn',
+- help='use this configuration file or directory')
+- opts, args = parser.parse_args(argv)
+- if args: print >> sys.stderr, 'Warning: ignoring spurious arguments'
++ def display_error(message):
++ print >> sys.stderr, message
++ print >> sys.stderr
++ print >> sys.stderr, "Try `phenny -h' for more information."
++ sys.exit(1)
++
++ verbose = False
++ config = None
++ for key, arg in enumerate(sys.argv[1:]):
++ if arg == "-h" or arg == "--help":
++ print """Usage: phenny [OPTION]...
++
++Options:
++
++ -h, --help display a short help message and exit
++ -V, --version display version information and exit
++ -v, --verbose display extended startup information
++ -c, --config CONFIG use CONFIG as the configuration file or directory
++
++Examples:
++
++To start using Phenny run the phenny command:
++
++ phenny
++
++Edit the default files created in your home directory:
++
++ sensible-editor ~/.phenny/default.py
++
++You can now start Phenny and try out your configuration:
++
++ phenny
++
++If you want to start Phenny as a background process you might run:
++
++ nohup phenny 2> ~/.phenny/log.txt &
++
++Report bugs using the `reportbug phenny' command."""
++ sys.exit(0)
++ elif arg == "-V" or arg == "--version":
++ print """phenny - Phenny 2
++
++Copyright (C) 2008 Sean B. Palmer <http://inamidst.com/sbp/>.
++
++Licensed under the Eiffel Forum License 2.
++
++Written by Sean B. Palmer <http://inamidst.com/sbp/>."""
++ sys.exit(0)
++ elif arg == "-v" or arg == "--verbose":
++ verbose = True
++ elif arg == "-c" or arg == "--config":
++ config = sys.argv[key + 2]
++ if not path.exists(config):
++ display_error("The file/directory does not exist: %s" % config)
++ elif arg.startswith("-"):
++ display_error("Unknown option: %s" % arg)
++ else:
++ display_error("Unknown argument: %s" % arg)
+
+ # Step Three: Load The Configurations
+
+ config_modules = []
+- for config_name in config_names(opts.config):
++ for config_name in config_names(config):
+ name = os.path.basename(config_name).split('.')[0] + '_config'
+ module = imp.load_source(name, config_name)
+ module.filename = config_name
+@@ -137,7 +190,7 @@
+
+ # @@ ignore SIGHUP
+ for config_module in config_modules:
+- run(config_module) # @@ thread this
++ run(config_module, verbose) # @@ thread this
+
+ if __name__ == '__main__':
+ main()
Added: packages/phenny/trunk/debian/patches/default-configuration.patch
===================================================================
--- packages/phenny/trunk/debian/patches/default-configuration.patch (rev 0)
+++ packages/phenny/trunk/debian/patches/default-configuration.patch 2008-03-04 21:50:19 UTC (rev 764)
@@ -0,0 +1,48 @@
+diff -Nur phenny-2~hg9.orig/phenny phenny-2~hg9.orig.new/phenny
+--- phenny-2~hg9.orig/phenny 2008-03-04 20:28:58.000000000 +0000
++++ phenny-2~hg9.orig.new/phenny 2008-03-04 20:58:56.000000000 +0000
+@@ -21,25 +21,28 @@
+ def create_default_config(fn):
+ f = open(fn, 'w')
+ print >> f, trim("""\
+- nick = 'phenny'
+- host = 'irc.example.net'
+- channels = ['#example', '#test']
+- owner = 'yournickname'
+-
+- # These are people who will be able to use admin.py's functions...
+- admins = [owner, 'someoneyoutrust']
+- # But admin.py is disabled by default, as follows:
+- exclude = ['admin']
+-
+- # If you want to enumerate a list of modules rather than disabling
+- # some, use "enable = ['example']", which takes precedent over disable
+- #
++ nick = "phenny"
++ host = "irc.example.net"
++ # password = "password"
++ channels = ["#example", "#test"]
++ owner = "your-nick"
++
++ # people allowed to use admin.py functions
++ admins = [owner, "other-nick"]
++
++ # For modules see: <file:///usr/share/python-support/phenny/phenny/modules>
++
++ # exclude modules
++ exclude = ["admin"]
++
++ # enable specific modules, trumps exclude
+ # enable = []
+
+- # Modules to load from the opt directory
+- extra = []
++ # extra modules to load by filename
++ # extra = ["~/.phenny/example-a.py", "~/.phenny/example-b.py"]
+
+- # EOF
++ # limit modules in specific channels
++ # limit = {"#channel": ["module-a", "module-b"]}
+ """)
+ f.close()
+
Added: packages/phenny/trunk/debian/patches/module-home.patch
===================================================================
--- packages/phenny/trunk/debian/patches/module-home.patch (rev 0)
+++ packages/phenny/trunk/debian/patches/module-home.patch 2008-03-04 21:50:19 UTC (rev 764)
@@ -0,0 +1,12 @@
+diff -Nur phenny-hg3.orig/bot.py phenny-hg3.orig.new/bot.py
+--- phenny-hg3.orig/bot.py 2008-03-01 17:39:59.000000000 +0000
++++ phenny-hg3.orig.new/bot.py 2008-03-01 17:40:15.000000000 +0000
+@@ -10,7 +10,7 @@
+ import sys, os, re, threading, imp
+ import irc
+
+-home = os.getcwd()
++home = "/var/lib/python-support/python2.5/phenny"
+
+ def decode(bytes):
+ try: text = bytes.decode('utf-8')
Added: packages/phenny/trunk/debian/patches/module-import.patch
===================================================================
--- packages/phenny/trunk/debian/patches/module-import.patch (rev 0)
+++ packages/phenny/trunk/debian/patches/module-import.patch 2008-03-04 21:50:19 UTC (rev 764)
@@ -0,0 +1,164 @@
+diff -Nur phenny-2~hg4.orig/modules/calc.py phenny-2~hg4.orig.new/modules/calc.py
+--- phenny-2~hg4.orig/modules/calc.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/calc.py 2008-03-02 14:13:34.000000000 +0000
+@@ -9,7 +9,7 @@
+ """
+
+ import re
+-import web
++from phenny import web
+
+ r_result = re.compile(r'(?i)<A NAME=results>(.*?)</A>')
+ r_tag = re.compile(r'<\S+.*?>')
+diff -Nur phenny-2~hg4.orig/modules/clock.py phenny-2~hg4.orig.new/modules/clock.py
+--- phenny-2~hg4.orig/modules/clock.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/clock.py 2008-03-02 14:13:34.000000000 +0000
+@@ -8,7 +8,7 @@
+ """
+
+ import math, time, urllib
+-from tools import deprecated
++from phenny.tools import deprecated
+
+ TimeZones = {'KST': 9, 'CADT': 10.5, 'EETDST': 3, 'MESZ': 2, 'WADT': 9,
+ 'EET': 2, 'MST': -7, 'WAST': 8, 'IST': 5.5, 'B': 2,
+diff -Nur phenny-2~hg4.orig/modules/dict.py phenny-2~hg4.orig.new/modules/dict.py
+--- phenny-2~hg4.orig/modules/dict.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/dict.py 2008-03-02 14:13:34.000000000 +0000
+@@ -8,8 +8,8 @@
+ """
+
+ import re, urllib
+-import web
+-from tools import deprecated
++from phenny import web
++from phenny.tools import deprecated
+
+ formuri = 'http://wordnet.princeton.edu/perl/webwn?s='
+
+diff -Nur phenny-2~hg4.orig/modules/etymology.py phenny-2~hg4.orig.new/modules/etymology.py
+--- phenny-2~hg4.orig/modules/etymology.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/etymology.py 2008-03-02 14:13:34.000000000 +0000
+@@ -8,8 +8,8 @@
+ """
+
+ import re
+-import web
+-from tools import deprecated
++from phenny import web
++from phenny.tools import deprecated
+
+ etyuri = 'http://etymonline.com/?term=%s'
+ etysearch = 'http://etymonline.com/?search=%s'
+diff -Nur phenny-2~hg4.orig/modules/head.py phenny-2~hg4.orig.new/modules/head.py
+--- phenny-2~hg4.orig/modules/head.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/head.py 2008-03-02 14:13:34.000000000 +0000
+@@ -9,8 +9,8 @@
+
+ import re, urllib, urlparse, time
+ from htmlentitydefs import name2codepoint
+-import web
+-from tools import deprecated
++from phenny import web
++from phenny.tools import deprecated
+
+ def head(phenny, input):
+ """Provide HTTP HEAD information."""
+diff -Nur phenny-2~hg4.orig/modules/reload.py phenny-2~hg4.orig.new/modules/reload.py
+--- phenny-2~hg4.orig/modules/reload.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/reload.py 2008-03-02 14:13:34.000000000 +0000
+@@ -7,7 +7,7 @@
+ http://inamidst.com/phenny/
+ """
+
+-import irc
++from phenny import irc
+
+ def f_reload(phenny, input):
+ """Reloads a module, for use by admins only."""
+diff -Nur phenny-2~hg4.orig/modules/search.py phenny-2~hg4.orig.new/modules/search.py
+--- phenny-2~hg4.orig/modules/search.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/search.py 2008-03-02 14:13:34.000000000 +0000
+@@ -8,7 +8,7 @@
+ """
+
+ import re
+-import web
++from phenny import web
+
+ r_string = re.compile(r'("(\\.|[^"\\])*")')
+ r_json = re.compile(r'^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]+$')
+diff -Nur phenny-2~hg4.orig/modules/seen.py phenny-2~hg4.orig.new/modules/seen.py
+--- phenny-2~hg4.orig/modules/seen.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/seen.py 2008-03-02 14:13:34.000000000 +0000
+@@ -8,7 +8,7 @@
+ """
+
+ import time
+-from tools import deprecated
++from phenny.tools import deprecated
+
+ @deprecated
+ def f_seen(self, origin, match, args):
+diff -Nur phenny-2~hg4.orig/modules/tell.py phenny-2~hg4.orig.new/modules/tell.py
+--- phenny-2~hg4.orig/modules/tell.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/tell.py 2008-03-02 14:13:34.000000000 +0000
+@@ -8,7 +8,7 @@
+ """
+
+ import os, re, time, random
+-import web
++from phenny import web
+
+ maximum = 4
+ lispchannels = frozenset([ '#lisp', '#scheme', '#opendarwin', '#macdev',
+diff -Nur phenny-2~hg4.orig/modules/translate.py phenny-2~hg4.orig.new/modules/translate.py
+--- phenny-2~hg4.orig/modules/translate.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/translate.py 2008-03-02 14:13:34.000000000 +0000
+@@ -9,7 +9,7 @@
+ """
+
+ import re, time
+-import web
++from phenny import web
+
+ r_translation = re.compile(r'<div style=padding:10px;>([^<]+)</div>')
+
+diff -Nur phenny-2~hg4.orig/modules/validate.py phenny-2~hg4.orig.new/modules/validate.py
+--- phenny-2~hg4.orig/modules/validate.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/validate.py 2008-03-02 14:13:34.000000000 +0000
+@@ -7,7 +7,7 @@
+ http://inamidst.com/phenny/
+ """
+
+-import web
++from phenny import web
+
+ def val(phenny, input):
+ """Check a webpage using the W3C Markup Validator."""
+diff -Nur phenny-2~hg4.orig/modules/weather.py phenny-2~hg4.orig.new/modules/weather.py
+--- phenny-2~hg4.orig/modules/weather.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/weather.py 2008-03-02 14:13:34.000000000 +0000
+@@ -8,8 +8,8 @@
+ """
+
+ import re, urllib
+-import web
+-from tools import deprecated
++from phenny import web
++from phenny.tools import deprecated
+
+ r_from = re.compile(r'(?i)([+-]\d+):00 from')
+
+diff -Nur phenny-2~hg4.orig/modules/wikipedia.py phenny-2~hg4.orig.new/modules/wikipedia.py
+--- phenny-2~hg4.orig/modules/wikipedia.py 2008-03-02 01:59:52.000000000 +0000
++++ phenny-2~hg4.orig.new/modules/wikipedia.py 2008-03-02 14:16:42.000000000 +0000
+@@ -8,7 +8,7 @@
+ """
+
+ import re, urllib
+-import web
++from phenny import web
+
+ wikiuri = 'http://en.wikipedia.org/wiki/%s'
+ wikisearch = 'http://en.wikipedia.org/wiki/Special:Search?' \
Added: packages/phenny/trunk/debian/patches/module-include-exclude.patch
===================================================================
--- packages/phenny/trunk/debian/patches/module-include-exclude.patch (rev 0)
+++ packages/phenny/trunk/debian/patches/module-include-exclude.patch 2008-03-04 21:50:19 UTC (rev 764)
@@ -0,0 +1,14 @@
+diff -Nur phenny-2~hg4.orig/bot.py phenny-2~hg4.orig.new/bot.py
+--- phenny-2~hg4.orig/bot.py 2008-03-02 01:38:23.000000000 +0000
++++ phenny-2~hg4.orig.new/bot.py 2008-03-02 01:41:03.000000000 +0000
+@@ -198,6 +198,10 @@
+ for regexp, funcs in items:
+ for func in funcs:
+ if event != func.event: continue
++
++ if args[-1].startswith("#"):
++ limit_list = getattr(self.config, "limit", {}).get(args[-1], [])
++ if limit_list and func.__module__ not in limit_list: continue
+
+ match = regexp.match(text)
+ if match:
Added: packages/phenny/trunk/debian/patches/non-executable.patch
===================================================================
--- packages/phenny/trunk/debian/patches/non-executable.patch (rev 0)
+++ packages/phenny/trunk/debian/patches/non-executable.patch 2008-03-04 21:50:19 UTC (rev 764)
@@ -0,0 +1,192 @@
+diff -Nur phenny-hg3.orig/bot.py phenny-hg3.orig.new/bot.py
+--- phenny-hg3.orig/bot.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/bot.py 2008-03-01 18:06:00.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ bot.py - Phenny IRC Bot
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/icao.py phenny-hg3.orig.new/icao.py
+--- phenny-hg3.orig/icao.py 2008-02-29 19:36:36.000000000 +0000
++++ phenny-hg3.orig.new/icao.py 2008-03-01 18:06:11.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ icao.py - Phenny ICAO Codes Data
+ This data and module are in the public domain.
+diff -Nur phenny-hg3.orig/__init__.py phenny-hg3.orig.new/__init__.py
+--- phenny-hg3.orig/__init__.py 2008-02-29 19:36:36.000000000 +0000
++++ phenny-hg3.orig.new/__init__.py 2008-03-01 18:05:52.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ __init__.py - Phenny Init Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/irc.py phenny-hg3.orig.new/irc.py
+--- phenny-hg3.orig/irc.py 2008-02-29 19:36:36.000000000 +0000
++++ phenny-hg3.orig.new/irc.py 2008-03-01 18:06:21.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ irc.py - A Utility IRC Bot
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/admin.py phenny-hg3.orig.new/modules/admin.py
+--- phenny-hg3.orig/modules/admin.py 2008-02-29 19:36:36.000000000 +0000
++++ phenny-hg3.orig.new/modules/admin.py 2008-03-01 18:06:29.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ admin.py - Phenny Admin Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/calc.py phenny-hg3.orig.new/modules/calc.py
+--- phenny-hg3.orig/modules/calc.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/calc.py 2008-03-01 18:06:43.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # coding=utf-8
+ """
+ calc.py - Phenny Calculator Module
+diff -Nur phenny-hg3.orig/modules/clock.py phenny-hg3.orig.new/modules/clock.py
+--- phenny-hg3.orig/modules/clock.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/clock.py 2008-03-01 18:06:51.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ clock.py - Phenny Clock Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/codepoints.py phenny-hg3.orig.new/modules/codepoints.py
+--- phenny-hg3.orig/modules/codepoints.py 2008-02-29 19:36:36.000000000 +0000
++++ phenny-hg3.orig.new/modules/codepoints.py 2008-03-01 18:07:00.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ codepoints.py - Phenny Codepoints Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/dict.py phenny-hg3.orig.new/modules/dict.py
+--- phenny-hg3.orig/modules/dict.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/dict.py 2008-03-01 18:07:08.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ dict.py - Phenny Dictionary Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/etymology.py phenny-hg3.orig.new/modules/etymology.py
+--- phenny-hg3.orig/modules/etymology.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/etymology.py 2008-03-01 18:07:21.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ etymology.py - Phenny Etymology Module
+ Copyright 2007, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/head.py phenny-hg3.orig.new/modules/head.py
+--- phenny-hg3.orig/modules/head.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/head.py 2008-03-01 18:07:28.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ head.py - Phenny HTTP Metadata Utilities
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/info.py phenny-hg3.orig.new/modules/info.py
+--- phenny-hg3.orig/modules/info.py 2008-02-29 19:36:36.000000000 +0000
++++ phenny-hg3.orig.new/modules/info.py 2008-03-01 18:07:34.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ info.py - Phenny Information Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/ping.py phenny-hg3.orig.new/modules/ping.py
+--- phenny-hg3.orig/modules/ping.py 2008-02-29 19:36:36.000000000 +0000
++++ phenny-hg3.orig.new/modules/ping.py 2008-03-01 18:07:43.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ ping.py - Phenny Ping Module
+ Author: Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/reload.py phenny-hg3.orig.new/modules/reload.py
+--- phenny-hg3.orig/modules/reload.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/reload.py 2008-03-01 18:07:51.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ reload.py - Phenny Module Reloader Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/search.py phenny-hg3.orig.new/modules/search.py
+--- phenny-hg3.orig/modules/search.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/search.py 2008-03-01 18:08:04.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ search.py - Phenny Web Search Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/seen.py phenny-hg3.orig.new/modules/seen.py
+--- phenny-hg3.orig/modules/seen.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/seen.py 2008-03-01 18:08:11.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ seen.py - Phenny Seen Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/startup.py phenny-hg3.orig.new/modules/startup.py
+--- phenny-hg3.orig/modules/startup.py 2008-02-29 19:36:36.000000000 +0000
++++ phenny-hg3.orig.new/modules/startup.py 2008-03-01 18:08:17.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ startup.py - Phenny Startup Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/tell.py phenny-hg3.orig.new/modules/tell.py
+--- phenny-hg3.orig/modules/tell.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/tell.py 2008-03-01 18:08:25.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ tell.py - Phenny Tell and Ask Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/translate.py phenny-hg3.orig.new/modules/translate.py
+--- phenny-hg3.orig/modules/translate.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/translate.py 2008-03-01 18:08:33.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # coding=utf-8
+ """
+ translate.py - Phenny Translation Module
+diff -Nur phenny-hg3.orig/modules/validate.py phenny-hg3.orig.new/modules/validate.py
+--- phenny-hg3.orig/modules/validate.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/validate.py 2008-03-01 18:08:40.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ validate.py - Phenny Validation Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/weather.py phenny-hg3.orig.new/modules/weather.py
+--- phenny-hg3.orig/modules/weather.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/weather.py 2008-03-01 18:08:46.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ weather.py - Phenny Weather Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/modules/wikipedia.py phenny-hg3.orig.new/modules/wikipedia.py
+--- phenny-hg3.orig/modules/wikipedia.py 2008-03-01 18:04:39.000000000 +0000
++++ phenny-hg3.orig.new/modules/wikipedia.py 2008-03-01 18:08:57.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ wikipedia.py - Phenny Wikipedia Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/tools.py phenny-hg3.orig.new/tools.py
+--- phenny-hg3.orig/tools.py 2008-02-29 19:36:36.000000000 +0000
++++ phenny-hg3.orig.new/tools.py 2008-03-01 18:09:05.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ tools.py - Phenny Tools
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -Nur phenny-hg3.orig/web.py phenny-hg3.orig.new/web.py
+--- phenny-hg3.orig/web.py 2008-02-29 19:36:36.000000000 +0000
++++ phenny-hg3.orig.new/web.py 2008-03-01 18:09:12.000000000 +0000
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ """
+ web.py - Web Facilities
+ Author: Sean B. Palmer, inamidst.com
Added: packages/phenny/trunk/debian/patches/python-version.patch
===================================================================
--- packages/phenny/trunk/debian/patches/python-version.patch (rev 0)
+++ packages/phenny/trunk/debian/patches/python-version.patch 2008-03-04 21:50:19 UTC (rev 764)
@@ -0,0 +1,9 @@
+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
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.5
+ """
+ phenny - An IRC Bot
+ Copyright 2008, Sean B. Palmer, inamidst.com
Modified: packages/phenny/trunk/debian/pyversions
===================================================================
--- packages/phenny/trunk/debian/pyversions 2008-03-04 18:27:26 UTC (rev 763)
+++ packages/phenny/trunk/debian/pyversions 2008-03-04 21:50:19 UTC (rev 764)
@@ -1 +1 @@
-2.4-
+2.5-
Modified: packages/phenny/trunk/debian/rules
===================================================================
--- packages/phenny/trunk/debian/rules 2008-03-04 18:27:26 UTC (rev 763)
+++ packages/phenny/trunk/debian/rules 2008-03-04 21:50:19 UTC (rev 764)
@@ -17,10 +17,21 @@
REPOSITORY_URI = static-http://inamidst.com/phenny/
PACKAGE_NAME = phenny
-PACKAGE_VERSION = 3
-PACKAGE_DIRECTORY=$(PACKAGE_NAME)-hg$(PACKAGE_VERSION).orig
-PACKAGE_FILENAME=$(PACKAGE_NAME)_hg$(PACKAGE_VERSION).orig.tar.gz
+PACKAGE_VERSION = 9
+PACKAGE_DIRECTORY=$(PACKAGE_NAME)-2~hg$(PACKAGE_VERSION).orig
+PACKAGE_FILENAME=$(PACKAGE_NAME)_2~hg$(PACKAGE_VERSION).orig.tar.gz
+common-install-prehook-impl::
+ cp *.py debian/phenny/usr/share/python-support/phenny/phenny
+ cp modules/*.py debian/phenny/usr/share/python-support/phenny/phenny/modules
+ chmod -R 644 debian/phenny/usr/share/python-support/phenny/phenny/*.py
+ chmod -R 644 debian/phenny/usr/share/python-support/phenny/phenny/modules/*.py
+ cp phenny debian/phenny/usr/bin
+ help2man -N -n "An extensible IRC bot written in Python" ./phenny > phenny.1
+
+binary-install/phenny::
+ dh_pysupport -pphenny
+
get-orig-source:
hg clone -r $(PACKAGE_VERSION) $(REPOSITORY_URI) $(PACKAGE_DIRECTORY)
tar -czf $(PACKAGE_FILENAME) $(PACKAGE_DIRECTORY)
More information about the Python-apps-commits
mailing list