[Python-apps-commits] r2849 - in packages/phenny/trunk/debian/patches (8 files)
nslater-guest at users.alioth.debian.org
nslater-guest at users.alioth.debian.org
Mon May 4 17:39:59 UTC 2009
Date: Monday, May 4, 2009 @ 17:39:57
Author: nslater-guest
Revision: 2849
converted to dpatch scripts
Modified:
packages/phenny/trunk/debian/patches/01_non-executable.dpatch
packages/phenny/trunk/debian/patches/02_expand-home.dpatch
packages/phenny/trunk/debian/patches/03_module-home.dpatch
packages/phenny/trunk/debian/patches/04_module-import.dpatch
packages/phenny/trunk/debian/patches/05_python-version.dpatch
packages/phenny/trunk/debian/patches/06_catch-exception.dpatch
packages/phenny/trunk/debian/patches/07_command-option.dpatch
packages/phenny/trunk/debian/patches/08_default-configuration.dpatch
Modified: packages/phenny/trunk/debian/patches/01_non-executable.dpatch
===================================================================
--- packages/phenny/trunk/debian/patches/01_non-executable.dpatch 2009-05-04 17:11:00 UTC (rev 2848)
+++ packages/phenny/trunk/debian/patches/01_non-executable.dpatch 2009-05-04 17:39:57 UTC (rev 2849)
@@ -1,192 +1,199 @@
-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
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_non-executable.dpatch by <nslater at tumbolia.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad phenny-2~hg28~/__init__.py phenny-2~hg28/__init__.py
+--- phenny-2~hg28~/__init__.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/__init__.py 2009-05-04 18:27:50.000000000 +0100
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
"""
+ __init__.py - Phenny Init Module
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -urNad phenny-2~hg28~/bot.py phenny-2~hg28/bot.py
+--- phenny-2~hg28~/bot.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/bot.py 2009-05-04 18:27:50.000000000 +0100
+@@ -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
+diff -urNad phenny-2~hg28~/icao.py phenny-2~hg28/icao.py
+--- phenny-2~hg28~/icao.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/icao.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/irc.py phenny-2~hg28/irc.py
+--- phenny-2~hg28~/irc.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/irc.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/admin.py phenny-2~hg28/modules/admin.py
+--- phenny-2~hg28~/modules/admin.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/admin.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/calc.py phenny-2~hg28/modules/calc.py
+--- phenny-2~hg28~/modules/calc.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/calc.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/clock.py phenny-2~hg28/modules/clock.py
+--- phenny-2~hg28~/modules/clock.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/clock.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/codepoints.py phenny-2~hg28/modules/codepoints.py
+--- phenny-2~hg28~/modules/codepoints.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/codepoints.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/dict.py phenny-2~hg28/modules/dict.py
+--- phenny-2~hg28~/modules/dict.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/dict.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/etymology.py phenny-2~hg28/modules/etymology.py
+--- phenny-2~hg28~/modules/etymology.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/etymology.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/head.py phenny-2~hg28/modules/head.py
+--- phenny-2~hg28~/modules/head.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/head.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/info.py phenny-2~hg28/modules/info.py
+--- phenny-2~hg28~/modules/info.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/info.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/oblique.py phenny-2~hg28/modules/oblique.py
+--- phenny-2~hg28~/modules/oblique.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/oblique.py 2009-05-04 18:27:50.000000000 +0100
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
"""
+ oblique.py - Web Services Interface
+ Copyright 2008, Sean B. Palmer, inamidst.com
+diff -urNad phenny-2~hg28~/modules/ping.py phenny-2~hg28/modules/ping.py
+--- phenny-2~hg28~/modules/ping.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/ping.py 2009-05-04 18:27:50.000000000 +0100
+@@ -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
+diff -urNad phenny-2~hg28~/modules/reload.py phenny-2~hg28/modules/reload.py
+--- phenny-2~hg28~/modules/reload.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/reload.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/search.py phenny-2~hg28/modules/search.py
+--- phenny-2~hg28~/modules/search.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/search.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/seen.py phenny-2~hg28/modules/seen.py
+--- phenny-2~hg28~/modules/seen.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/seen.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/startup.py phenny-2~hg28/modules/startup.py
+--- phenny-2~hg28~/modules/startup.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/startup.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/tell.py phenny-2~hg28/modules/tell.py
+--- phenny-2~hg28~/modules/tell.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/tell.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/translate.py phenny-2~hg28/modules/translate.py
+--- phenny-2~hg28~/modules/translate.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/translate.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/validate.py phenny-2~hg28/modules/validate.py
+--- phenny-2~hg28~/modules/validate.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/validate.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/weather.py phenny-2~hg28/modules/weather.py
+--- phenny-2~hg28~/modules/weather.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/weather.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/wikipedia.py phenny-2~hg28/modules/wikipedia.py
+--- phenny-2~hg28~/modules/wikipedia.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/wikipedia.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+diff -urNad phenny-2~hg28~/modules/wiktionary.py phenny-2~hg28/modules/wiktionary.py
+--- phenny-2~hg28~/modules/wiktionary.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/wiktionary.py 2009-05-04 18:27:50.000000000 +0100
@@ -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
+ wiktionary.py - Phenny Wiktionary Module
+ Copyright 2009, Sean B. Palmer, inamidst.com
Modified: packages/phenny/trunk/debian/patches/02_expand-home.dpatch
===================================================================
--- packages/phenny/trunk/debian/patches/02_expand-home.dpatch 2009-05-04 17:11:00 UTC (rev 2848)
+++ packages/phenny/trunk/debian/patches/02_expand-home.dpatch 2009-05-04 17:39:57 UTC (rev 2849)
@@ -1,6 +1,13 @@
-diff -Nur phenny-2~hg9.orig/bot.py phenny-2~hg9.orig.new/bot.py
---- phenny-2~hg9.orig/bot.py 2008-03-04 21:59:47.000000000 +0000
-+++ phenny-2~hg9.orig.new/bot.py 2008-03-04 22:00:34.000000000 +0000
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_expand-home.dpatch by <nslater at tumbolia.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad phenny-2~hg28~/bot.py phenny-2~hg28/bot.py
+--- phenny-2~hg28~/bot.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/bot.py 2009-05-04 18:21:57.000000000 +0100
@@ -8,6 +8,7 @@
"""
@@ -9,7 +16,7 @@
import irc
home = os.getcwd()
-@@ -44,6 +45,7 @@
+@@ -43,6 +44,7 @@
if hasattr(self.config, 'extra'):
for fn in self.config.extra:
Modified: packages/phenny/trunk/debian/patches/03_module-home.dpatch
===================================================================
--- packages/phenny/trunk/debian/patches/03_module-home.dpatch 2009-05-04 17:11:00 UTC (rev 2848)
+++ packages/phenny/trunk/debian/patches/03_module-home.dpatch 2009-05-04 17:39:57 UTC (rev 2849)
@@ -1,8 +1,15 @@
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/bot.py phenny-2~hg28.new/bot.py
---- phenny-2~hg28/bot.py 2009-03-17 18:21:38.000000000 +0000
-+++ phenny-2~hg28.new/bot.py 2009-03-17 18:22:02.000000000 +0000
-@@ -11,7 +11,7 @@
- from os import path
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_module-home.dpatch by <nslater at tumbolia.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad phenny-2~hg28~/bot.py phenny-2~hg28/bot.py
+--- phenny-2~hg28~/bot.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/bot.py 2009-05-04 18:22:33.000000000 +0100
+@@ -10,7 +10,7 @@
+ import sys, os, re, threading, imp
import irc
-home = os.getcwd()
Modified: packages/phenny/trunk/debian/patches/04_module-import.dpatch
===================================================================
--- packages/phenny/trunk/debian/patches/04_module-import.dpatch 2009-05-04 17:11:00 UTC (rev 2848)
+++ packages/phenny/trunk/debian/patches/04_module-import.dpatch 2009-05-04 17:39:57 UTC (rev 2849)
@@ -1,6 +1,13 @@
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/calc.py phenny-2~hg28.new/modules/calc.py
---- phenny-2~hg28/modules/calc.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/calc.py 2009-03-17 19:02:53.000000000 +0000
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_module-import.dpatch by <nslater at tumbolia.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad phenny-2~hg28~/modules/calc.py phenny-2~hg28/modules/calc.py
+--- phenny-2~hg28~/modules/calc.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/calc.py 2009-05-04 18:23:29.000000000 +0100
@@ -9,7 +9,7 @@
"""
@@ -10,9 +17,9 @@
r_result = re.compile(r'(?i)<A NAME=results>(.*?)</A>')
r_tag = re.compile(r'<\S+.*?>')
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/clock.py phenny-2~hg28.new/modules/clock.py
---- phenny-2~hg28/modules/clock.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/clock.py 2009-03-17 19:02:53.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/clock.py phenny-2~hg28/modules/clock.py
+--- phenny-2~hg28~/modules/clock.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/clock.py 2009-05-04 18:23:41.000000000 +0100
@@ -8,7 +8,7 @@
"""
@@ -22,9 +29,9 @@
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 -x '*.orig' -x '*~' phenny-2~hg28/modules/dict.py phenny-2~hg28.new/modules/dict.py
---- phenny-2~hg28/modules/dict.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/dict.py 2009-03-17 19:02:53.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/dict.py phenny-2~hg28/modules/dict.py
+--- phenny-2~hg28~/modules/dict.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/dict.py 2009-05-04 18:24:06.000000000 +0100
@@ -8,8 +8,8 @@
"""
@@ -36,9 +43,9 @@
formuri = 'http://wordnet.princeton.edu/perl/webwn?s='
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/etymology.py phenny-2~hg28.new/modules/etymology.py
---- phenny-2~hg28/modules/etymology.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/etymology.py 2009-03-17 19:02:53.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/etymology.py phenny-2~hg28/modules/etymology.py
+--- phenny-2~hg28~/modules/etymology.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/etymology.py 2009-05-04 18:24:15.000000000 +0100
@@ -8,8 +8,8 @@
"""
@@ -50,9 +57,9 @@
etyuri = 'http://etymonline.com/?term=%s'
etysearch = 'http://etymonline.com/?search=%s'
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/head.py phenny-2~hg28.new/modules/head.py
---- phenny-2~hg28/modules/head.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/head.py 2009-03-17 19:02:53.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/head.py phenny-2~hg28/modules/head.py
+--- phenny-2~hg28~/modules/head.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/head.py 2009-05-04 18:24:25.000000000 +0100
@@ -9,8 +9,8 @@
import re, urllib, urllib2, httplib, urlparse, time
@@ -64,9 +71,9 @@
def head(phenny, input):
"""Provide HTTP HEAD information."""
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/oblique.py phenny-2~hg28.new/modules/oblique.py
---- phenny-2~hg28/modules/oblique.py 2009-03-17 18:19:27.000000000 +0000
-+++ phenny-2~hg28.new/modules/oblique.py 2009-03-17 19:03:08.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/oblique.py phenny-2~hg28/modules/oblique.py
+--- phenny-2~hg28~/modules/oblique.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/oblique.py 2009-05-04 18:24:38.000000000 +0100
@@ -8,7 +8,7 @@
"""
@@ -76,9 +83,9 @@
definitions = 'http://code.google.com/p/phenny-ws/wiki/ServiceDefinitions'
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/reload.py phenny-2~hg28.new/modules/reload.py
---- phenny-2~hg28/modules/reload.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/reload.py 2009-03-17 19:02:53.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/reload.py phenny-2~hg28/modules/reload.py
+--- phenny-2~hg28~/modules/reload.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/reload.py 2009-05-04 18:25:32.000000000 +0100
@@ -7,7 +7,7 @@
http://inamidst.com/phenny/
"""
@@ -100,9 +107,9 @@
reload(module)
if hasattr(module, '__file__'):
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/search.py phenny-2~hg28.new/modules/search.py
---- phenny-2~hg28/modules/search.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/search.py 2009-03-17 19:02:53.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/search.py phenny-2~hg28/modules/search.py
+--- phenny-2~hg28~/modules/search.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/search.py 2009-05-04 18:25:57.000000000 +0100
@@ -8,7 +8,7 @@
"""
@@ -112,9 +119,9 @@
r_string = re.compile(r'("(\\.|[^"\\])*")')
r_json = re.compile(r'^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]+$')
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/seen.py phenny-2~hg28.new/modules/seen.py
---- phenny-2~hg28/modules/seen.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/seen.py 2009-03-17 19:02:53.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/seen.py phenny-2~hg28/modules/seen.py
+--- phenny-2~hg28~/modules/seen.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/seen.py 2009-05-04 18:26:08.000000000 +0100
@@ -8,7 +8,7 @@
"""
@@ -124,9 +131,9 @@
@deprecated
def f_seen(self, origin, match, args):
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/tell.py phenny-2~hg28.new/modules/tell.py
---- phenny-2~hg28/modules/tell.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/tell.py 2009-03-17 19:02:53.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/tell.py phenny-2~hg28/modules/tell.py
+--- phenny-2~hg28~/modules/tell.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/tell.py 2009-05-04 18:26:23.000000000 +0100
@@ -8,7 +8,7 @@
"""
@@ -136,9 +143,9 @@
maximum = 4
lispchannels = frozenset([ '#lisp', '#scheme', '#opendarwin', '#macdev',
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/translate.py phenny-2~hg28.new/modules/translate.py
---- phenny-2~hg28/modules/translate.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/translate.py 2009-03-17 19:02:53.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/translate.py phenny-2~hg28/modules/translate.py
+--- phenny-2~hg28~/modules/translate.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/translate.py 2009-05-04 18:26:28.000000000 +0100
@@ -9,7 +9,7 @@
"""
@@ -148,9 +155,9 @@
r_json = re.compile(r'^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]+$')
r_string = re.compile(r'("(\\.|[^"\\])*")')
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/validate.py phenny-2~hg28.new/modules/validate.py
---- phenny-2~hg28/modules/validate.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/validate.py 2009-03-17 19:02:53.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/validate.py phenny-2~hg28/modules/validate.py
+--- phenny-2~hg28~/modules/validate.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/validate.py 2009-05-04 18:26:33.000000000 +0100
@@ -7,7 +7,7 @@
http://inamidst.com/phenny/
"""
@@ -160,9 +167,9 @@
def val(phenny, input):
"""Check a webpage using the W3C Markup Validator."""
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/weather.py phenny-2~hg28.new/modules/weather.py
---- phenny-2~hg28/modules/weather.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/weather.py 2009-03-17 19:02:53.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/weather.py phenny-2~hg28/modules/weather.py
+--- phenny-2~hg28~/modules/weather.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/weather.py 2009-05-04 18:26:42.000000000 +0100
@@ -8,8 +8,8 @@
"""
@@ -174,9 +181,9 @@
r_from = re.compile(r'(?i)([+-]\d+):00 from')
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg28/modules/wikipedia.py phenny-2~hg28.new/modules/wikipedia.py
---- phenny-2~hg28/modules/wikipedia.py 2009-03-17 19:02:46.000000000 +0000
-+++ phenny-2~hg28.new/modules/wikipedia.py 2009-03-17 19:02:53.000000000 +0000
+diff -urNad phenny-2~hg28~/modules/wikipedia.py phenny-2~hg28/modules/wikipedia.py
+--- phenny-2~hg28~/modules/wikipedia.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/wikipedia.py 2009-05-04 18:26:50.000000000 +0100
@@ -8,7 +8,7 @@
"""
@@ -186,3 +193,15 @@
wikiuri = 'http://en.wikipedia.org/wiki/%s'
wikisearch = 'http://en.wikipedia.org/wiki/Special:Search?' \
+diff -urNad phenny-2~hg28~/modules/wiktionary.py phenny-2~hg28/modules/wiktionary.py
+--- phenny-2~hg28~/modules/wiktionary.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/modules/wiktionary.py 2009-05-04 18:27:36.000000000 +0100
+@@ -8,7 +8,7 @@
+ """
+
+ import re
+-import web
++from phenny import web
+
+ uri = 'http://en.wiktionary.org/w/index.php?title=%s&printable=yes'
+ r_tag = re.compile(r'<[^>]+>')
Modified: packages/phenny/trunk/debian/patches/05_python-version.dpatch
===================================================================
--- packages/phenny/trunk/debian/patches/05_python-version.dpatch 2009-05-04 17:11:00 UTC (rev 2848)
+++ packages/phenny/trunk/debian/patches/05_python-version.dpatch 2009-05-04 17:39:57 UTC (rev 2849)
@@ -1,6 +1,13 @@
-diff -Nur phenny-2~hg11.orig/phenny phenny-2~hg11.orig.new/phenny
---- phenny-2~hg11.orig/phenny 2008-03-30 22:01:49.000000000 +0100
-+++ phenny-2~hg11.orig.new/phenny 2008-03-30 22:02:09.000000000 +0100
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_python-version.dpatch by <nslater at tumbolia.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad phenny-2~hg28~/phenny phenny-2~hg28/phenny
+--- phenny-2~hg28~/phenny 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/phenny 2009-05-04 18:29:04.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2.5
@@ -13,7 +20,7 @@
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):
++ 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)
Modified: packages/phenny/trunk/debian/patches/06_catch-exception.dpatch
===================================================================
--- packages/phenny/trunk/debian/patches/06_catch-exception.dpatch 2009-05-04 17:11:00 UTC (rev 2848)
+++ packages/phenny/trunk/debian/patches/06_catch-exception.dpatch 2009-05-04 17:39:57 UTC (rev 2849)
@@ -1,7 +1,14 @@
-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 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_catch-exception.dpatch by <nslater at tumbolia.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad phenny-2~hg28~/irc.py phenny-2~hg28/irc.py
+--- phenny-2~hg28~/irc.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/irc.py 2009-05-04 18:30:56.000000000 +0100
+@@ -157,20 +157,9 @@
def error(self, origin):
try:
import traceback
Modified: packages/phenny/trunk/debian/patches/07_command-option.dpatch
===================================================================
--- packages/phenny/trunk/debian/patches/07_command-option.dpatch 2009-05-04 17:11:00 UTC (rev 2848)
+++ packages/phenny/trunk/debian/patches/07_command-option.dpatch 2009-05-04 17:39:57 UTC (rev 2849)
@@ -1,12 +1,49 @@
-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
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_command-option.dpatch by <nslater at tumbolia.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad phenny-2~hg28~/__init__.py phenny-2~hg28/__init__.py
+--- phenny-2~hg28~/__init__.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/__init__.py 2009-05-04 18:35:26.000000000 +0100
+@@ -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, config.port)
+
+ try: Watcher()
+@@ -52,8 +52,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 -urNad phenny-2~hg28~/bot.py phenny-2~hg28/bot.py
+--- phenny-2~hg28~/bot.py 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/bot.py 2009-05-04 18:34:47.000000000 +0100
@@ -21,9 +21,10 @@
return text
class Phenny(irc.Bot):
- def __init__(self, config):
-+ def __init__(self, config, verbose):
++ def __init__(self, config, verbose):
irc.Bot.__init__(self, config.nick, config.name, config.channels)
self.config = config
+ self.verbose = verbose
@@ -42,39 +79,9 @@
# register documentation
if not hasattr(func, 'name'):
func.name = func.__name__
-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
-
--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, config.port)
-
- 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 -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
+diff -urNad phenny-2~hg28~/phenny phenny-2~hg28/phenny
+--- phenny-2~hg28~/phenny 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/phenny 2009-05-04 18:37:59.000000000 +0100
@@ -12,6 +12,7 @@
"""
@@ -83,7 +90,7 @@
from textwrap import dedent as trim
dotdir = os.path.expanduser('~/.phenny')
-@@ -99,20 +100,74 @@
+@@ -101,20 +102,74 @@
# Step One: Check Dependencies
check_python_version() # require python2.4 or later
@@ -165,7 +172,7 @@
name = os.path.basename(config_name).split('.')[0] + '_config'
module = imp.load_source(name, config_name)
module.filename = config_name
-@@ -147,7 +202,7 @@
+@@ -149,7 +204,7 @@
# @@ ignore SIGHUP
for config_module in config_modules:
Modified: packages/phenny/trunk/debian/patches/08_default-configuration.dpatch
===================================================================
--- packages/phenny/trunk/debian/patches/08_default-configuration.dpatch 2009-05-04 17:11:00 UTC (rev 2848)
+++ packages/phenny/trunk/debian/patches/08_default-configuration.dpatch 2009-05-04 17:39:57 UTC (rev 2849)
@@ -1,7 +1,14 @@
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg19.orig/phenny phenny-2~hg19.orig.new/phenny
---- phenny-2~hg19.orig/phenny 2008-06-25 19:44:58.000000000 +0100
-+++ phenny-2~hg19.orig.new/phenny 2008-06-25 19:52:10.000000000 +0100
-@@ -26,28 +26,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_default-configuration.dpatch by <nslater at tumbolia.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad phenny-2~hg28~/phenny phenny-2~hg28/phenny
+--- phenny-2~hg28~/phenny 2009-04-27 19:32:51.000000000 +0100
++++ phenny-2~hg28/phenny 2009-05-04 18:39:12.000000000 +0100
+@@ -25,28 +25,28 @@
def create_default_config(fn):
f = open(fn, 'w')
print >> f, trim("""\
@@ -9,29 +16,26 @@
- host = 'irc.example.net'
- channels = ['#example', '#test']
- owner = 'yournickname'
--
++ nick = "phenny"
++ host = "irc.example.net"
++ # password = "password"
++ channels = ["#example", "#test"]
++ owner = "your-nick"
+
- # This isn't implemented yet:
- # serverpass = 'yourserverpassword'
--
++ # people allowed to use admin.py functions
++ admins = [owner, "other-nick"]
+
- # 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']
--
++ # for available modules see /usr/share/python-support/phenny/phenny/modules
+
- # If you want to enumerate a list of modules rather than disabling
- # some, use "enable = ['example']", which takes precedent over exclude
- #
-+ 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 available modules see /usr/share/python-support/phenny/phenny/modules
-+
+ # exclude modules
+ exclude = ["admin"]
+
More information about the Python-apps-commits
mailing list