--- supybot-0.83.4.1.ds.orig/debian/NEWS +++ supybot-0.83.4.1.ds/debian/NEWS @@ -0,0 +1,16 @@ +supybot (0.83.4.1.ds-1) unstable; urgency=low + + The plugins.Channel.banmask config variable was renamed to + protocols.irc.banmask. + + The Google plugin was re-written to use Google's AJAX API. This resulted in + two config variables changes: + - plugins.Google.safeSearch is obsoleted in favor of + plugins.Google.searchFilter. + - plugins.Google.maximumResults must be a value between 1 and 8. The only + requirement it used to have was that it was a positive integer and the old + default value was 10. This means it's likely to cause an error the first + time the plugin is loaded but then the new default value will be set when + the bot is restarted. + + -- James Vega Mon, 25 May 2009 19:30:30 -0400 --- supybot-0.83.4.1.ds.orig/debian/changelog +++ supybot-0.83.4.1.ds/debian/changelog @@ -0,0 +1,362 @@ +supybot (0.83.4.1.ds-3) unstable; urgency=medium + + * Switch to dh and dh_python2 rather than python-support. (Closes: #786003) + * Move supported Python versions from debian/pyversions to debian/control. + * Fix debhelper-but-no-misc-depends + * Declare compliance with Standards-Version 3.9.6 + + -- James McCoy Thu, 21 May 2015 14:16:07 -0400 + +supybot (0.83.4.1.ds-2) unstable; urgency=low + + * debian/watch: Add dversionmangle to remove '.ds' from upstream version. + * debian/copyright: + - Remove license information about files which are removed as part of + repacking the tarball. + - Update the location of the convertcore.py file. + * debian/rules: + - Include /usr/share/python/python.mk. + - Use $(py_setup_install_args) when running setup.py install. + * Cherry-pick fix from upstream so the Google plugin can still find the + simplejson module when both python-simplejson and python-json are + installed. (Closes: #533650) + + -- James Vega Tue, 23 Jun 2009 14:25:44 -0400 + +supybot (0.83.4.1.ds-1) unstable; urgency=low + + * New upstream version. + - Requesting help for Factoids commands no longer errors out. (LP: #235439) + - Regular expressions with multiple backslashes are properly parsed. + (LP: #235500) + * debian/control + - Add Vcs-* fields. + - Bump standards version to 3.8.1.0 - no changes needed. + - Add python-feedparser to Recommends. (Closes: #490615) + - Add python-simplejson | python (>= 2.6) to Recommends. + - Add python-dateutil, python-dictclient to Suggests. + - Add version to debhelper Build-Depends. + * debian/rules: + - Use stamp files as pre-requisites instead of the related phony targets. + - Call dh_prep instead of dh_clean -k. + * debian/watch: Call new debian/repack script to remove embedded copies of + third-party code from new upstream tarballs. + * debian/docs: Include FAQ and CONFIGURATION docs in the package. + * Bump compat level to 7. + + -- James Vega Fri, 29 May 2009 11:02:00 -0400 + +supybot (0.83.3-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Add Homepage field and remove the Homepage item from the long + description. + - Drop versioned Build-Depends(-Indep) since all the depends are satisfied + in Etch. + * Update debian/copyright to reflect new files included in upstream tarball. + * Cleanup debian/rules a little and move dh_pysupport to binary-indep. + + -- James Vega Thu, 25 Oct 2007 14:05:48 -0400 + +supybot (0.83.2-2) unstable; urgency=low + + * Update packaging + + Remove cdbs Build-Depends + + Re-write debian/rules from scratch, without cdbs. + + Bump python-support Build-Depends-Indep to (>= 0.4) + + Add debian/supybot.manpages + * Add the debian/pyversions file that should've been included last upload. + * Add the rest of the upstream documentation to the package. + + -- James Vega Sat, 11 Nov 2006 11:00:02 -0500 + +supybot (0.83.2-1) unstable; urgency=low + + * New upstream release + * Bump Standards-Version to 3.7.2 (No changes needed) + * Update twisted Suggests to python-twisted-core and python-twisted-names. + * Update for the python transition (closes: #380966) + + Add Build-Depends-Indep on python-support (>= 0.3) + + Update minimum debhelper Build-Depends to 5.0.37.2 + + Update minimum cdbs Build-Depends to 0.4.43 + + Bump python-dev Build-Depends to (>= 2.3.5-11) + * Remove Build-Depend on python since python-dev pulls it in. + * Update debhelper compatibility to 5 + * Update copyright to reflect the copyrights of extra modules various + plugins use. + * Stop installing LICENSE to /usr/share/doc/supybot. + + -- James Vega Tue, 1 Aug 2006 09:14:39 -0400 + +supybot (0.83.1-1) unstable; urgency=low + + * New upstream release. + + Upstream has made significant changes. See changelog.gz and RELNOTES.gz + for further details. + + INSTALL file has been updated to solely refer to installation. + Therefore it does not need to be included. (Closes: #320031) + * debian/patches: + + 00darcs_20051003.diff: + - Adds supybot-test.1 + - Fixes bugs in the ChannelLogger, Config, and Web plugins. + * debian/watch: Updated to use the new Sourceforge URL. + * debian/control: Bump Standards-Version to 3.6.2 (No changes needed) + * Update email address. + + -- James Vega Mon, 3 Oct 2005 13:48:38 -0400 + +supybot (0.80.1-4) unstable; urgency=low + + * Updated email address. + * Add 03_commands.py.diff, prevent nickInChannel from modifying the args + list which caused a TypeError exception in Channel.kick. (Closes: #308131) + + -- James Vega Sun, 8 May 2005 16:30:40 -0400 + +supybot (0.80.1-3) unstable; urgency=low + + * plugins/ShrinkUrl.py + + Fix an InvalidRegistryName exception in configure(). (Closes: #298838) + * plugins/Weather.py + + Fix a NameError exception in Weather.cnn. (Closes: #298903) + + -- James Vega Thu, 10 Mar 2005 11:38:42 -0500 + +supybot (0.80.1-2) unstable; urgency=low + + * Backport some bug fixes from the Darcs tree. + + plugins/Weather.py + - Update Weather.wunder to work with the website changes. + - Fix a couple exceptions in Weather.wunder. + + src/commands.py + - Fix a bug in nickInChannel where extra args would be placed on the + args list. + + plugins/Unix.py + - Fix a bug where Unix.wtf would reply twice. + + plugins/Filter.py + - Improve Filter.shrink such that it only shrinks words. + + -- James Vega Fri, 25 Feb 2005 17:22:18 -0500 + +supybot (0.80.1-1) unstable; urgency=low + + * New upstream release + + Fix an exception in supybot-wizard when trying to add an Owner user and + one already exists. + + Fix some exceptions in Note related to retrieving the name of a no + longer registered user. + * debian/watch + + Updated URL + + -- James Vega Wed, 19 Jan 2005 10:24:00 -0500 + +supybot (0.80.0-1) unstable; urgency=low + + * New upstream release + + Infobot is no longer deprecated. + + Babelfish now knows about Dutch, Greek, Russian, and Traditional + Chinese. + + Numerous bug fixes. + * debian/control + + Updated website in long description. + * debian/copyright + + Updated license to match upstream changes. + * debian/rules + + Don't compress .py files + * debian/watch + + Updated URL + + -- James Vega Mon, 17 Jan 2005 17:53:37 -0500 + +supybot (0.79.9999+0.80.0pre4-1) unstable; urgency=low + + * New upstream release + + Deprecated asyncoreDrivers in favor of socketDrivers/twistedDrivers. + + Removed Owner.{eval,exec} + + -- James Vega Fri, 17 Dec 2004 21:38:32 -0500 + +supybot (0.79.9999+0.80.0pre3-3) unstable; urgency=low + + * CVS update + + plugins/ChannelLogger.py: + - Fix to properly log channels on all networks instead of just the + first one the bot connects to. + + plugins/Cycler.py: + - Add a missing import + + plugins/Limiter.py: + - Add missing imports + - Fix an exception when attempting to set the new channel mode. + + src/commands.py: + - Update getChannelDb to respect the channelSpecific.channel + configuration variable + + -- James Vega Wed, 15 Dec 2004 09:09:28 -0500 + +supybot (0.79.9999+0.80.0pre3-2) unstable; urgency=low + + * Add debian/patches/01_cvs_update.diff + + Remove some #! lines to silence lintian warnings + + plugins/Cycler.py, add a missing import + + plugins/__init__.py + - Fix makeChannelFilename so it actually honors + supybot.plugins.databases.channelSpecific.channel + + plugins/Network.py + - Fix an exception in Network.disconnect + + plugins/Quote.py + - Fix a type in the class name + + src/Channel.py + - Fix an exception in Channel.cycle + - Make sure Channel.kick won't let the bot kick itself + + src/User.py + - Fix an exception in User.username + + -- James Vega Sat, 11 Dec 2004 22:42:42 -0500 + +supybot (0.79.9999+0.80.0pre3-1) unstable; urgency=medium + + * The "better late than never" release + * New upstream version + + Closes: #284217: supybot-newplugin exception + * debian/watch: Updated to see pre-releases + * debian/patches: + + Removed 01_updated_manpages.diff, applied upstream + + Removed 02_remove_hashbang_lines.diff, applied upstream + + Removed 03_cvs_update.diff + * debian/copyright: + + Change "Copyright" to "License" (thanks, Enrico Zini) + * debian/docs: + + Add + * debian/rules: + + Updated to install + * debian/NEWS.Debian: + + Add some caveats about upgrading. Meant to add this in a previous + package. + + -- James Vega Sat, 11 Dec 2004 12:14:59 -0500 + +supybot (0.79.9999+0.80.0pre2-3) unstable; urgency=medium + + * Pulled some CVS updates: + + docs/FAQ + - Correct a question and add a new one. + + docs/GETTING_STARTED + - Expanded to include example of load command + + docs/STYLE + - Updated guidelines for using the log module + + plugins/Babelfish.py + - Add a warning to translate's help regarding multi-byte + character sets. + - Make sure translate stringifies html entities in its response. + + plugins/BadWords.py + - Fix a bug in the outFilter that could cause Relay loops. + + plugins/ChannelLogger.py + - Update the configuration variables to allow better control + over location of log files. + - Update to prevent possible errors when reload the plugin. + - Add logging of nick changes. + + plugins/Fun.py + - Remove useless __init__ + + plugins/Herald.py + - Updated to not send a herald when the bot sees its own join. + + plugins/__init__.py + - Update makeChannelFilename so it doesn't break when channel is None. + + plugins/Insult.py + - Fix a bad import. (Closes: #279425) + + plugins/Internet.py + - Update whois to better handle certain whois servers. + + plugins/Markov.py + - Fix markov reply when called with arguments. + + plugins/Network.py + - Clarify the help for the connect command. + + plugins/Poll.py + - Fix a NameError exception. + + plugins/UrbanDict.py + - Updated to handle changes in UrbanDict.com's website + + scripts/supybot + - Fix a bug where supybot would not run its flushers. + - Updated to prevent starting the bot with a bad registry value. + + src/fix.py + - Update choice to also accept tuples. + + src/__init__.py + - Added information for a couple more contributors. + + src/twistedDrivers.py + - Fix the double-queuing problem. + - Fix the double-killing problem. + + src/world.py + - Update threading setup. + + -- James Vega Mon, 8 Nov 2004 09:31:20 -0500 + +supybot (0.79.9999+0.80.0pre2-2) unstable; urgency=medium + + * Fix some lintian warnings. + * Add the new manpages from upstream. + * Add some bugfixes from upstream. + + -- James Vega Mon, 20 Sep 2004 12:11:08 -0400 + +supybot (0.79.9999+0.80.0pre2-1) unstable; urgency=high + + * New upstream + * Urgency high because it still fixes previous bugs. + + -- James Vega Fri, 17 Sep 2004 11:18:43 -0400 + +supybot (0.79.9999-1) unstable; urgency=high + + * New upstream + * Urgency high because it still fixes previous bugs. + + -- James Vega Mon, 6 Sep 2004 15:40:13 -0400 + +supybot (0.79.999-1) unstable; urgency=high + + * New upstream + * Urgency high because of a bug in the Ebay plugin that would hang + the bot. + + -- James Vega Tue, 31 Aug 2004 21:58:59 -0400 + +supybot (0.79.99-1) unstable; urgency=high + + * New upstream + * Urgency high as 0.79.9 had a serious bug in src/callbacks.py + * Added a watch file + + -- James Vega Mon, 30 Aug 2004 09:20:48 -0400 + +supybot (0.79.9-1) unstable; urgency=high + + * New upstream (Closes: #268311) + * New maintainer: James Vega + * Urgency high to get the RC fix into Sarge (hopefully) + * debian/control: + + Downgrade Recommends: python-sqlite to Suggests: python-sqlite + + Update Build-Depends: cdbs, debhelper (>= 4.1.67) + + Bump Standard-Version to 3.6.1.0, no changes necessary + * Convert to cdbs + + -- James Vega Thu, 26 Aug 2004 17:28:03 -0400 + +supybot (0.77.2-1) unstable; urgency=low + + * New upstream + + -- Jonathan Hseu Sun, 18 Apr 2004 02:58:25 -0500 + +supybot (0.77.1-1) unstable; urgency=low + + * New upstream + * Add python-dev as a build-dep (closes: Bug#242953) + + -- Jonathan Hseu Sat, 10 Apr 2004 13:06:38 -0500 + +supybot (0.77.0-1) unstable; urgency=low + + * Initial Release. + * Paste LICENSE file into copyright + + -- Jonathan Hseu Tue, 10 Mar 2004 00:59:46 -0600 + --- supybot-0.83.4.1.ds.orig/debian/compat +++ supybot-0.83.4.1.ds/debian/compat @@ -0,0 +1 @@ +7 --- supybot-0.83.4.1.ds.orig/debian/control +++ supybot-0.83.4.1.ds/debian/control @@ -0,0 +1,24 @@ +Source: supybot +Section: net +Priority: optional +Maintainer: James McCoy +Build-Depends: debhelper (>= 9), python-dev, dh-python +Standards-Version: 3.9.6 +Homepage: http://sourceforge.net/projects/supybot/ +Vcs-Browser: http://git.debian.org/?p=users/jamessan/supybot.git +Vcs-Git: git://git.debian.org/git/users/jamessan/supybot +X-Python-Version: >= 2.3 + +Package: supybot +Architecture: all +Depends: ${misc:Depends}, ${python:Depends} +Recommends: python-simplejson | python (>= 2.6), python-feedparser +Suggests: python-twisted-core, python-twisted-names, python-sqlite, python-dictclient, python-dateutil +Description: robust and user friendly Python IRC bot + Supybot is a robust (it doesn't crash), user friendly (it's easy + to configure) and programmer friendly (plugins are *extremely* + easy to write) Python IRC bot. It aims to be an adequate + replacement for most existing IRC bots. It includes a very + flexible and powerful ACL system for controlling access to + commands, as well as more than 50 builtin plugins providing + around 400 actual commands. --- supybot-0.83.4.1.ds.orig/debian/copyright +++ supybot-0.83.4.1.ds/debian/copyright @@ -0,0 +1,49 @@ +This package was originally debianized by Jonathan Hseu on +Tue, 3 Feb 2004 21:45:46 -0600. The package was taken over by James Vega + on Thu, 26 Aug 2004. + +It was downloaded from http://sourceforge.net/projects/supybot/ + +Upstream Authors: + +/usr/share/doc/supybot/DEVS includes the names and descriptions of the +developers. + +License: + +The copyright for all other files are as follows (BSD-style): + +Copyright (c) 2002-2009 Jeremiah Fincher and others +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions, and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions, and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the author of this software nor the name of + contributors to this software may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Portions of the included source code are copyright by its original author(s) +and remain subject to its associated license. + +plugins/Math/local/convertcore.py copyright and license: + +Copyright (C) 2002, Douglas W. Bell + +Licensed under the GPL which can be found in '/usr/share/common-licenses'. --- supybot-0.83.4.1.ds.orig/debian/docs +++ supybot-0.83.4.1.ds/debian/docs @@ -0,0 +1,13 @@ +ACKS +RELNOTES +README +docs/ADVANCED_PLUGIN_CONFIG +docs/ADVANCED_PLUGIN_TESTING +docs/CAPABILITIES +docs/CONFIGURATION +docs/FAQ +docs/GETTING_STARTED +docs/PLUGIN_TUTORIAL +docs/STYLE +docs/USING_UTILS +docs/USING_WRAP --- supybot-0.83.4.1.ds.orig/debian/repack +++ supybot-0.83.4.1.ds/debian/repack @@ -0,0 +1,18 @@ +#!/bin/sh +set -e +[ $# -eq 3 ] +shift # --upstream-version +ver="$1" +shift +gunzip -c $1 | tar -x + +for p in Dict Google RSS Time; +do + rm -r Supybot-$ver/plugins/$p/local + # Intentionally use an un-escaped dot to match both Plugin/local and + # Plugin.local + sed -i "/$p.local/d;" Supybot-$ver/setup.py +done + +tar -c Supybot-$ver | gzip -9 > ../supybot_${ver}.ds.orig.tar.gz +rm -r Supybot-$ver --- supybot-0.83.4.1.ds.orig/debian/rules +++ supybot-0.83.4.1.ds/debian/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +%: + dh $@ --with python2 + +override_dh_auto_install: + dh_auto_install + # Not considered fully functional upstream + rm -f debian/supybot/usr/bin/supybot-plugin-package --- supybot-0.83.4.1.ds.orig/debian/supybot.manpages +++ supybot-0.83.4.1.ds/debian/supybot.manpages @@ -0,0 +1,7 @@ +docs/man/supybot-adduser.1 +docs/man/supybot-botchk.1 +docs/man/supybot-plugin-create.1 +docs/man/supybot-plugin-doc.1 +docs/man/supybot-test.1 +docs/man/supybot-wizard.1 +docs/man/supybot.1 --- supybot-0.83.4.1.ds.orig/debian/watch +++ supybot-0.83.4.1.ds/debian/watch @@ -0,0 +1,7 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# Site Directory Pattern Version Script +version=3 +opts=dversionmangle=s/\.ds// \ +http://sf.net/supybot/Supybot-([\d.]+).tar.gz debian debian/repack --- supybot-0.83.4.1.ds.orig/plugins/Google/plugin.py +++ supybot-0.83.4.1.ds/plugins/Google/plugin.py @@ -42,15 +42,21 @@ import supybot.ircutils as ircutils import supybot.callbacks as callbacks +simplejson = None + +try: + simplejson = utils.python.universalImport('json') +except ImportError: + pass + try: - simplejson = utils.python.universalImport('json', 'simplejson', - 'local.simplejson') # The 3rd party simplejson module was included in Python 2.6 and renamed to # json. Unfortunately, this conflicts with the 3rd party json module. # Luckily, the 3rd party json module has a different interface so we test # to make sure we aren't using it. - if hasattr(simplejson, 'read'): - raise ImportError + if simplejson is None or hasattr(simplejson, 'read'): + simplejson = utils.python.universalImport('simplejson', + 'local.simplejson') except ImportError: raise callbacks.Error, \ 'You need Python2.6 or the simplejson module installed to use ' \