[Python-apps-commits] r1001 - in packages/phenny/trunk/debian (4 files)
nslater-guest at users.alioth.debian.org
nslater-guest at users.alioth.debian.org
Mon Apr 28 16:50:31 UTC 2008
Date: Monday, April 28, 2008 @ 16:50:29
Author: nslater-guest
Revision: 1001
new upstream release, fixed #478033
Modified:
packages/phenny/trunk/debian/changelog
packages/phenny/trunk/debian/patches/command-option.patch
packages/phenny/trunk/debian/patches/default-configuration.patch
Deleted:
packages/phenny/trunk/debian/patches/module-include-exclude.patch
Modified: packages/phenny/trunk/debian/changelog
===================================================================
--- packages/phenny/trunk/debian/changelog 2008-04-27 22:30:04 UTC (rev 1000)
+++ packages/phenny/trunk/debian/changelog 2008-04-28 16:50:29 UTC (rev 1001)
@@ -1,8 +1,10 @@
-phenny (2~hg11-3) UNRELEASED; urgency=low
+phenny (2~hg14-1) unstable; urgency=low
+ * New upstream version.
+ * Imported the required module in the phenny command. Closes: #478033
* Improved debian/copyright file per the proposed standard.
- -- Noah Slater <nslater at bytesexual.org> Mon, 21 Apr 2008 18:13:10 +0100
+ -- Noah Slater <nslater at bytesexual.org> Mon, 28 Apr 2008 17:49:58 +0100
phenny (2~hg11-2) unstable; urgency=medium
Modified: packages/phenny/trunk/debian/patches/command-option.patch
===================================================================
--- packages/phenny/trunk/debian/patches/command-option.patch 2008-04-27 22:30:04 UTC (rev 1000)
+++ packages/phenny/trunk/debian/patches/command-option.patch 2008-04-28 16:50:29 UTC (rev 1001)
@@ -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-08 15:48:40.000000000 +0000
-+++ phenny-2~hg9.orig.new/bot.py 2008-03-08 15:49:48.000000000 +0000
+diff -Nur -x '*.orig' -x '*~' phenny-2~hg14.orig/bot.py phenny-2~hg14.orig.new/bot.py
+--- phenny-2~hg14.orig/bot.py 2008-04-28 17:43:29.000000000 +0100
++++ phenny-2~hg14.orig.new/bot.py 2008-04-28 17:43:32.000000000 +0100
@@ -21,9 +21,10 @@
return text
@@ -42,9 +42,9 @@
# 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-08 15:48:40.000000000 +0000
-+++ phenny-2~hg9.orig.new/__init__.py 2008-03-08 15:49:48.000000000 +0000
+diff -Nur -x '*.orig' -x '*~' phenny-2~hg14.orig/__init__.py phenny-2~hg14.orig.new/__init__.py
+--- phenny-2~hg14.orig/__init__.py 2008-04-28 17:43:15.000000000 +0100
++++ phenny-2~hg14.orig.new/__init__.py 2008-04-28 17:43:32.000000000 +0100
@@ -27,13 +27,13 @@
try: os.kill(self.child, signal.SIGKILL)
except OSError: pass
@@ -58,7 +58,7 @@
def connect(config):
- p = bot.Phenny(config)
+ p = bot.Phenny(config, verbose)
- p.run(config.host)
+ p.run(config.host, config.port)
Watcher()
@@ -49,8 +49,8 @@
@@ -72,10 +72,18 @@
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-08 15:48:41.000000000 +0000
-+++ phenny-2~hg9.orig.new/phenny 2008-03-08 15:50:49.000000000 +0000
-@@ -94,20 +94,74 @@
+diff -Nur -x '*.orig' -x '*~' phenny-2~hg14.orig/phenny phenny-2~hg14.orig.new/phenny
+--- phenny-2~hg14.orig/phenny 2008-04-28 17:43:15.000000000 +0100
++++ phenny-2~hg14.orig.new/phenny 2008-04-28 17:43:54.000000000 +0100
+@@ -12,6 +12,7 @@
+ """
+
+ import sys, os, imp, optparse
++from os import path
+ from textwrap import dedent as trim
+
+ dotdir = os.path.expanduser('~/.phenny')
+@@ -99,20 +100,74 @@
# Step One: Check Dependencies
check_python_version() # require python2.4 or later
@@ -141,7 +149,7 @@
+ 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)
++ display_error("The file or directory does not exist: %s" % config)
+ elif arg.startswith("-"):
+ display_error("Unknown option: %s" % arg)
+ else:
@@ -157,7 +165,7 @@
name = os.path.basename(config_name).split('.')[0] + '_config'
module = imp.load_source(name, config_name)
module.filename = config_name
-@@ -137,7 +191,7 @@
+@@ -147,7 +202,7 @@
# @@ ignore SIGHUP
for config_module in config_modules:
Modified: packages/phenny/trunk/debian/patches/default-configuration.patch
===================================================================
--- packages/phenny/trunk/debian/patches/default-configuration.patch 2008-04-27 22:30:04 UTC (rev 1000)
+++ packages/phenny/trunk/debian/patches/default-configuration.patch 2008-04-28 16:50:29 UTC (rev 1001)
@@ -1,7 +1,7 @@
-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 @@
+diff -Nur -x '*.orig' -x '*~' phenny-2~hg14.orig/phenny phenny-2~hg14.orig.new/phenny
+--- phenny-2~hg14.orig/phenny 2008-04-28 17:44:19.000000000 +0100
++++ phenny-2~hg14.orig.new/phenny 2008-04-28 17:44:58.000000000 +0100
+@@ -26,26 +26,28 @@
def create_default_config(fn):
f = open(fn, 'w')
print >> f, trim("""\
@@ -9,6 +9,7 @@
- host = 'irc.example.net'
- channels = ['#example', '#test']
- owner = 'yournickname'
+- # serverpass = 'yourserverpassword'
-
- # These are people who will be able to use admin.py's functions...
- admins = [owner, 'someoneyoutrust']
@@ -16,7 +17,7 @@
- exclude = ['admin']
-
- # If you want to enumerate a list of modules rather than disabling
-- # some, use "enable = ['example']", which takes precedent over disable
+- # some, use "enable = ['example']", which takes precedent over exclude
- #
+ nick = "phenny"
+ host = "irc.example.net"
@@ -27,7 +28,7 @@
+ # people allowed to use admin.py functions
+ admins = [owner, "other-nick"]
+
-+ # For modules see: <file:///usr/share/python-support/phenny/phenny/modules>
++ # for available modules see /usr/share/python-support/phenny/phenny/modules
+
+ # exclude modules
+ exclude = ["admin"]
Deleted: packages/phenny/trunk/debian/patches/module-include-exclude.patch
===================================================================
--- packages/phenny/trunk/debian/patches/module-include-exclude.patch 2008-04-27 22:30:04 UTC (rev 1000)
+++ packages/phenny/trunk/debian/patches/module-include-exclude.patch 2008-04-28 16:50:29 UTC (rev 1001)
@@ -1,14 +0,0 @@
-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:
More information about the Python-apps-commits
mailing list