[Python-apps-commits] r2631 - in packages/phenny/trunk/debian (4 files)
nslater-guest at users.alioth.debian.org
nslater-guest at users.alioth.debian.org
Tue Mar 17 19:04:41 UTC 2009
Date: Tuesday, March 17, 2009 @ 19:04:40
Author: nslater-guest
Revision: 2631
updates for new version
Added:
packages/phenny/trunk/debian/source.lintian-overrides
Modified:
packages/phenny/trunk/debian/changelog
packages/phenny/trunk/debian/patches/module-home.patch
packages/phenny/trunk/debian/patches/module-import.patch
Modified: packages/phenny/trunk/debian/changelog
===================================================================
--- packages/phenny/trunk/debian/changelog 2009-03-16 10:03:10 UTC (rev 2630)
+++ packages/phenny/trunk/debian/changelog 2009-03-17 19:04:40 UTC (rev 2631)
@@ -1,4 +1,4 @@
-phenny (2~hg21-1) UNRELEASED; urgency=low
+phenny (2~hg28-1) UNRELEASED; urgency=low
* New upstream version, security fix and oblique command added.
* Added debian/README.source file.
@@ -7,7 +7,7 @@
* Updated debian/copyright per latest proposed format.
* Updated Standards-Version to 3.8.0.
- -- Noah Slater <nslater at tumbolia.org> Thu, 07 Aug 2008 15:13:36 +0100
+ -- Noah Slater <nslater at tumbolia.org> Tue, 17 Mar 2009 18:19:01 +0000
phenny (2~hg19-1) unstable; urgency=low
Modified: packages/phenny/trunk/debian/patches/module-home.patch
===================================================================
--- packages/phenny/trunk/debian/patches/module-home.patch 2009-03-16 10:03:10 UTC (rev 2630)
+++ packages/phenny/trunk/debian/patches/module-home.patch 2009-03-17 19:04:40 UTC (rev 2631)
@@ -1,12 +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
+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
import irc
-home = os.getcwd()
-+home = "/var/lib/python-support/python2.5/phenny"
++home = path.dirname(__file__)
def decode(bytes):
try: text = bytes.decode('utf-8')
Modified: packages/phenny/trunk/debian/patches/module-import.patch
===================================================================
--- packages/phenny/trunk/debian/patches/module-import.patch 2009-03-16 10:03:10 UTC (rev 2630)
+++ packages/phenny/trunk/debian/patches/module-import.patch 2009-03-17 19:04:40 UTC (rev 2631)
@@ -1,6 +1,6 @@
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg16.orig/modules/calc.py phenny-2~hg16.orig.new/modules/calc.py
---- phenny-2~hg16.orig/modules/calc.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/calc.py 2008-05-24 18:36:57.000000000 +0100
+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
@@ -9,7 +9,7 @@
"""
@@ -10,9 +10,9 @@
r_result = re.compile(r'(?i)<A NAME=results>(.*?)</A>')
r_tag = re.compile(r'<\S+.*?>')
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg16.orig/modules/clock.py phenny-2~hg16.orig.new/modules/clock.py
---- phenny-2~hg16.orig/modules/clock.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/clock.py 2008-05-24 18:36:57.000000000 +0100
+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
@@ -8,7 +8,7 @@
"""
@@ -22,9 +22,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~hg16.orig/modules/dict.py phenny-2~hg16.orig.new/modules/dict.py
---- phenny-2~hg16.orig/modules/dict.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/dict.py 2008-05-24 18:36:57.000000000 +0100
+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
@@ -8,8 +8,8 @@
"""
@@ -36,9 +36,9 @@
formuri = 'http://wordnet.princeton.edu/perl/webwn?s='
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg16.orig/modules/etymology.py phenny-2~hg16.orig.new/modules/etymology.py
---- phenny-2~hg16.orig/modules/etymology.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/etymology.py 2008-05-24 18:36:57.000000000 +0100
+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
@@ -8,8 +8,8 @@
"""
@@ -50,12 +50,12 @@
etyuri = 'http://etymonline.com/?term=%s'
etysearch = 'http://etymonline.com/?search=%s'
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg16.orig/modules/head.py phenny-2~hg16.orig.new/modules/head.py
---- phenny-2~hg16.orig/modules/head.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/head.py 2008-05-24 18:36:57.000000000 +0100
+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
@@ -9,8 +9,8 @@
- import re, urllib, urlparse, time
+ import re, urllib, urllib2, httplib, urlparse, time
from htmlentitydefs import name2codepoint
-import web
-from tools import deprecated
@@ -64,9 +64,21 @@
def head(phenny, input):
"""Provide HTTP HEAD information."""
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg16.orig/modules/reload.py phenny-2~hg16.orig.new/modules/reload.py
---- phenny-2~hg16.orig/modules/reload.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/reload.py 2008-05-24 18:36:57.000000000 +0100
+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
+@@ -8,7 +8,7 @@
+ """
+
+ import re, urllib
+-import web
++from phenny import web
+
+ 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
@@ -7,7 +7,7 @@
http://inamidst.com/phenny/
"""
@@ -76,9 +88,21 @@
def f_reload(phenny, input):
"""Reloads a module, for use by admins only."""
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg16.orig/modules/search.py phenny-2~hg16.orig.new/modules/search.py
---- phenny-2~hg16.orig/modules/search.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/search.py 2008-05-24 18:36:57.000000000 +0100
+@@ -21,9 +21,9 @@
+ phenny.setup()
+ return phenny.reply('done')
+
+- try: module = getattr(__import__('modules.' + name), name)
++ try: module = __import__('phenny.modules.' + name, "", "", [""])
+ except ImportError:
+- module = getattr(__import__('opt.' + name), name)
++ module = __import__('phenny.opt.' + name, "", "", [""])
+ 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
@@ -8,7 +8,7 @@
"""
@@ -88,9 +112,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~hg16.orig/modules/seen.py phenny-2~hg16.orig.new/modules/seen.py
---- phenny-2~hg16.orig/modules/seen.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/seen.py 2008-05-24 18:36:57.000000000 +0100
+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
@@ -8,7 +8,7 @@
"""
@@ -100,9 +124,9 @@
@deprecated
def f_seen(self, origin, match, args):
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg16.orig/modules/tell.py phenny-2~hg16.orig.new/modules/tell.py
---- phenny-2~hg16.orig/modules/tell.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/tell.py 2008-05-24 18:36:57.000000000 +0100
+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
@@ -8,7 +8,7 @@
"""
@@ -112,9 +136,9 @@
maximum = 4
lispchannels = frozenset([ '#lisp', '#scheme', '#opendarwin', '#macdev',
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg16.orig/modules/translate.py phenny-2~hg16.orig.new/modules/translate.py
---- phenny-2~hg16.orig/modules/translate.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/translate.py 2008-05-24 18:36:57.000000000 +0100
+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
@@ -9,7 +9,7 @@
"""
@@ -124,9 +148,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~hg16.orig/modules/validate.py phenny-2~hg16.orig.new/modules/validate.py
---- phenny-2~hg16.orig/modules/validate.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/validate.py 2008-05-24 18:36:57.000000000 +0100
+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
@@ -7,7 +7,7 @@
http://inamidst.com/phenny/
"""
@@ -136,9 +160,9 @@
def val(phenny, input):
"""Check a webpage using the W3C Markup Validator."""
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg16.orig/modules/weather.py phenny-2~hg16.orig.new/modules/weather.py
---- phenny-2~hg16.orig/modules/weather.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/weather.py 2008-05-24 18:36:57.000000000 +0100
+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
@@ -8,8 +8,8 @@
"""
@@ -150,9 +174,9 @@
r_from = re.compile(r'(?i)([+-]\d+):00 from')
-diff -Nur -x '*.orig' -x '*~' phenny-2~hg16.orig/modules/wikipedia.py phenny-2~hg16.orig.new/modules/wikipedia.py
---- phenny-2~hg16.orig/modules/wikipedia.py 2008-05-24 18:22:10.000000000 +0100
-+++ phenny-2~hg16.orig.new/modules/wikipedia.py 2008-05-24 18:36:57.000000000 +0100
+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
@@ -8,7 +8,7 @@
"""
Added: packages/phenny/trunk/debian/source.lintian-overrides
===================================================================
--- packages/phenny/trunk/debian/source.lintian-overrides (rev 0)
+++ packages/phenny/trunk/debian/source.lintian-overrides 2009-03-17 19:04:40 UTC (rev 2631)
@@ -0,0 +1 @@
+phenny source: debian-watch-file-is-missing
More information about the Python-apps-commits
mailing list