[Python-apps-commits] r4576 - in packages/ibid/trunk/debian/patches (3 files)
stefanor-guest at users.alioth.debian.org
stefanor-guest at users.alioth.debian.org
Sat Jan 23 13:55:04 UTC 2010
Date: Saturday, January 23, 2010 @ 13:55:01
Author: stefanor-guest
Revision: 4576
Add manpages patch
Added:
packages/ibid/trunk/debian/patches/manpages.diff
Modified:
packages/ibid/trunk/debian/patches/series
packages/ibid/trunk/debian/patches/tac-not-needed.diff
Added: packages/ibid/trunk/debian/patches/manpages.diff
===================================================================
--- packages/ibid/trunk/debian/patches/manpages.diff (rev 0)
+++ packages/ibid/trunk/debian/patches/manpages.diff 2010-01-23 13:55:01 UTC (rev 4576)
@@ -0,0 +1,712 @@
+Description: Adds manpages for all binaries.
+Author: Stefano Rivera <stefano at rivera.za.net>
+Forwarded: https://code.edge.launchpad.net/~stefanor/ibid/manpages-510020/+merge/17928
+Last-Update: 2010-01-23
+
+=== added directory 'man'
+=== added file 'man/ibid-db.1'
+--- old/man/ibid-db.1 1970-01-01 00:00:00 +0000
++++ new/man/ibid-db.1 2010-01-23 08:50:01 +0000
+@@ -0,0 +1,59 @@
++.\" Copyright (c) 2010, Stefano Rivera
++.\" Released under terms of the MIT/X/Expat Licence. See COPYING for details.
++.TH IBID-DB "1" "January 2010" "Ibid 0.0" "Multi-protocol Chat Bot"
++.SH NAME
++ibid-db \- Database management utility for Ibid (the multi-protocol chat bot)
++.SH SYNOPSIS
++.B ibid-db command
++.RI [ options ...]
++.SH DESCRIPTION
++This utility is for offline management of your Ibid bot's database.
++Used for import, export, and upgrades.
++.P
++The export format is DBMS-agnostic and can be used to migrate between different
++databases.
++.SH COMMANDS
++.TP
++\fB\-e\fR \fIFILE\fR, \fB\-\-export\fR=\fIFILE\fR
++Export DB contents to \fIFILE\fR.
++Export format is JSON.
++.IP
++FILE can be \fB\-\fR for stdin/stdout or can end in \fB.gz\fR for automatic
++Gzip compression.
++.TP
++\fB\-i\fR \fIFILE\fR, \fB\-\-import\fR=\fIFILE\fR
++Import DB contents from \fIFILE\fR as exported by this utility.
++.IP
++FILE can be \fB\-\fR for stdin/stdout or can end in \fB.gz\fR for automatic
++Gzip compression.
++.IP
++.B Note:
++The DB must be empty first.
++.TP
++\fB\-u\fR, \fB\-\-upgrade\fR
++Upgrade DB schema to the latest version.
++You need to run this after upgrading your bot.
++.IP
++.B Note:
++You should backup first.
++.SH OPTIONS
++.TP
++\fB\-\-version\fR
++Show the program's version and exit.
++.TP
++\fB\-h\fR, \fB\-\-help\fR
++Show a help message and exit.
++.TP
++\fB\-v\fR, \fB\-\-verbose\fR
++Turn on debugging output to STDERR.
++.SH FILES
++.TP
++.I ibid.ini
++Locates the database to act upon by looking for the \fB[databases].ibid\fR value
++in the bot configuration file in the current directory.
++.SH SEE ALSO
++.BR ibid (1),
++.BR ibid.ini (5),
++.BR ibid-setup (1),
++.UR http://ibid.omnia.za.net/
++.BR http://ibid.omnia.za.net/
+
+=== added file 'man/ibid-factpack.1'
+--- old/man/ibid-factpack.1 1970-01-01 00:00:00 +0000
++++ new/man/ibid-factpack.1 2010-01-23 08:50:01 +0000
+@@ -0,0 +1,64 @@
++.\" Copyright (c) 2010, Stefano Rivera
++.\" Released under terms of the MIT/X/Expat Licence. See COPYING for details.
++.TH IBID-FACTPACK "1" "January 2010" "Ibid 0.0" "Multi-protocol Chat Bot"
++.SH NAME
++ibid-factpack \- Factoid-package management utility for Ibid (the
++multi-protocol chat bot)
++.SH SYNOPSIS
++.B ibid-factpack
++.RB [ -s ]
++.I factpack-file
++.br
++.B ibid-factpack -r
++.RB [ -f ]
++.I factpack-name
++.br
++.B ibid-factpack -h
++.SH DESCRIPTION
++This utility is for adding and removing sets of packaged factoids, known as
++factpacks, from your Ibid's factoid database.
++.P
++The default mode is factpack loading.
++The \fIfactpack-file\fR specified is loaded into the bot's database.
++Should the pack contain any facts with the same name as an existing fact in the
++bot's database, loading will be aborted, unless the \fB-s\fR option is
++supplied.
++.P
++When invoked with the \fB-r\fR option, the named factpack (original import
++filename minus the extension) will be removed from the bot.
++If any of the facts contained in that pack were modified while loaded in the
++bot, unloading will be aborted, unless the \fB-f\fR option is supplied.
++.SH OPTIONS
++.TP
++\fB\-r\fR, \fB\-\-remove\fR
++Remove the named factpack, rather than importing.
++.TP
++\fB\-f\fR, \fB\-\-force\fR
++Force removal, if facts in the factpack were modified by users.
++.TP
++\fB\-s\fR, \fB\-\-skip\fR
++Skip facts that clash with exitsing factoids, during import.
++.TP
++\fB\-h\fR, \fB\-\-help\fR
++Show a help message and exit.
++.SH FACTPACKS
++Factpacks are JSON-encoded text files containing a list of facts.
++Each fact is a tuple of two lists: fact-names, fact-values.
++The same substitutions are available as in normal online Factoids.
++.SS Example:
++.nf
++[
++ [["Hello", "Hi"], ["<reply> Hi There", "<action> waves"]],
++ [["Bye"], ["<reply> kbye $who", "<reply> Cheers"]]
++]
++.fi
++.SH FILES
++.TP
++.I ibid.ini
++Locates the database to act upon by looking for the \fB[databases].ibid\fR value
++in the bot configuration file in the current directory.
++.SH SEE ALSO
++.BR ibid (1),
++.BR ibid.ini (5),
++.UR http://ibid.omnia.za.net/
++.BR http://ibid.omnia.za.net/
+
+=== added file 'man/ibid_import.1'
+--- old/man/ibid_import.1 1970-01-01 00:00:00 +0000
++++ new/man/ibid_import.1 2010-01-23 08:50:01 +0000
+@@ -0,0 +1,43 @@
++.\" Copyright (c) 2010, Stefano Rivera
++.\" Released under terms of the MIT/X/Expat Licence. See COPYING for details.
++.TH IBID-DB "1" "January 2010" "Ibid 0.0" "Multi-protocol Chat Bot"
++.SH NAME
++ibid_import \- Knab->Ibid Import utility for Ibid (the multi-protocol chat
++bot)
++.SH SYNOPSIS
++.B ibid_import
++.I knab-sa-url
++.I source
++.RI [ config-file ]
++.SH DESCRIPTION
++This utility imports users, seen, factoids, and URLs from a Knab bot's database
++into an Ibid.
++.P
++For best results, import directly into a brand new, clean Ibid install.
++.P
++On import, strings are converted to unicode, guessing UTF-8 and falling back to
++detection.
++.SH OPTIONS
++.TP
++.I knab-sa-url
++The SQLAlchemy URI for the Knab's database.
++The format is
++.BI mysql:// user : pass @ hostname / dbname
++.TP
++.I source
++The name in the Ibid bot for the source that the knab was previously connected to.
++.TP
++.I config-file
++If supplied, this is configuration file is used for locating the Ibid's
++database rather than \fBibid.ini\fR.
++.SH FILES
++.TP
++.I ibid.ini
++Locates the database to act upon by looking for the \fB[databases].ibid\fR value
++in the bot configuration file in the current directory.
++.SH SEE ALSO
++.BR ibid (1),
++.BR ibid.ini (5),
++.BR ibid-setup (1),
++.UR http://ibid.omnia.za.net/
++.BR http://ibid.omnia.za.net/
+
+=== added file 'man/ibid-memgraph.1'
+--- old/man/ibid-memgraph.1 1970-01-01 00:00:00 +0000
++++ new/man/ibid-memgraph.1 2010-01-23 08:50:01 +0000
+@@ -0,0 +1,40 @@
++.\" Copyright (c) 2010, Stefano Rivera
++.\" Released under terms of the MIT/X/Expat Licence. See COPYING for details.
++.TH IBID-MEMGRAPH "1" "January 2010" "Ibid 0.0" "Multi-protocol Chat Bot"
++.SH NAME
++ibid-memgraph \- Memory usage graph generation utility for Ibid (the
++multi-protocol chat bot)
++.SH SYNOPSIS
++.B ibid-memgraph
++.RB [ options ...]
++.I logfile
++.br
++.B ibid-memgraph -h
++.SH DESCRIPTION
++This utility is for graphing memory usage from an Ibid configured to log such
++usage.
++.P
++Matplotlib is required for graphing.
++.SH OPTIONS
++.TP
++\fB\-o\fR \fIFILE\fR, \fB\-\-output\fR=\fIFILE\fR
++Output to \fIFILE\fR instead of displaying interactive graph GUI.
++\fIFILE\fR can be any format supported by Matplotlib, detected by the file
++extension.
++.TP
++\fB\-d\fR \fIDPI\fR, \fB\-\-dpi\fR=\fIDPI\fR
++When outputting in raster formats, use \fIDPI\fR output DPI.
++.TP
++\fB\-h\fR, \fB\-\-help\fR
++Show a help message and exit.
++.SH FILES
++.TP
++.I logfile
++A log file generated by loading the \fBmemory\fR plugin into Ibid, which will
++periodically log memory usage.
++It can be GZip compressed, if the filename ends in \fB.gz\fR.
++.SH SEE ALSO
++.BR ibid (1),
++.BR ibid-objgraph (1),
++.UR http://ibid.omnia.za.net/
++.BR http://ibid.omnia.za.net/
+
+=== added file 'man/ibid-objgraph.1'
+--- old/man/ibid-objgraph.1 1970-01-01 00:00:00 +0000
++++ new/man/ibid-objgraph.1 2010-01-23 08:50:01 +0000
+@@ -0,0 +1,51 @@
++.\" Copyright (c) 2010, Stefano Rivera
++.\" Released under terms of the MIT/X/Expat Licence. See COPYING for details.
++.TH IBID-OBJGRAPH "1" "January 2010" "Ibid 0.0" "Multi-protocol Chat Bot"
++.SH NAME
++ibid-objgraph \- Memory usage graph generation utility for Ibid (the
++multi-protocol chat bot)
++.SH SYNOPSIS
++.B ibid-objgraph
++.RB [ options ...]
++.IR "logfile type" ...
++.br
++.B ibid-objgraph
++.BI "-e " TIME
++.RB [ options ...]
++.I logfile
++.br
++.B ibid-objgraph -h
++.SH DESCRIPTION
++This utility is for graphing object-type usage from an Ibid configured to log
++such usage.
++.P
++Matplotlib is required for graphing.
++.SH OPTIONS
++.TP
++\fB\-e\fR \fITIME\fR, \fB\-\-examine\fR=\fITIME\fR
++Examine the object usage at time \fITIME\fR, and print a sorted list of type
++statistics at that time.
++This function can be useful in determining which types to graph, when chasing
++down a detected leak.
++.TP
++\fB\-o\fR \fIFILE\fR, \fB\-\-output\fR=\fIFILE\fR
++Output to \fIFILE\fR instead of displaying interactive graph GUI.
++\fIFILE\fR can be any format supported by Matplotlib, detected by the file
++extension.
++.TP
++\fB\-d\fR \fIDPI\fR, \fB\-\-dpi\fR=\fIDPI\fR
++When outputting in raster formats, use \fIDPI\fR output DPI.
++.TP
++\fB\-h\fR, \fB\-\-help\fR
++Show a help message and exit.
++.SH FILES
++.TP
++.I logfile
++A log file generated by loading the \fBmemory\fR plugin into Ibid, which will
++periodically log object usage.
++It can be GZip compressed, if the filename ends in \fB.gz\fR.
++.SH SEE ALSO
++.BR ibid (1),
++.BR ibid-objgraph (1),
++.UR http://ibid.omnia.za.net/
++.BR http://ibid.omnia.za.net/
+
+=== added file 'man/ibid_pb.1'
+--- old/man/ibid_pb.1 1970-01-01 00:00:00 +0000
++++ new/man/ibid_pb.1 2010-01-23 08:50:01 +0000
+@@ -0,0 +1,54 @@
++.\" Copyright (c) 2010, Stefano Rivera
++.\" Released under terms of the MIT/X/Expat Licence. See COPYING for details.
++.TH IBID-PB-CLIENT "1" "January 2010" "Ibid 0.0" "Multi-protocol Chat Bot"
++.SH NAME
++ibid_pb \- RPC Client for Ibid (the multi-protocol chat bot)
++.SH SYNOPSIS
++.B ibid_pb
++.RI [ options ...]
++.BI message " message"
++.br
++.B ibid_pb
++.RI [ options ...]
++.BI plugin " feature method"
++.RI [ parameter ...]
++.br
++.B ibid_pb -h
++.SH DESCRIPTION
++This utility is passing events to a running Ibid instance, or executing
++RPC-exposed functions remotely.
++.P
++It communicates with the \fBpb\fR source on the Ibid.
++.P
++.I message
++is a text message as could be sent to the bot by an IM source.
++The message is processed normally by the bot.
++.P
++.I feature
++is the name of the feature to invoke exposed method \fImethod\fR on,
++directly.
++.IR parameter s
++are passed directly to the method.
++They can be specified positionally or by key, using the same syntax as
++Python:
++.IR key = value .
++They may be encoded in JSON, if not valid JSON they will be treated as
++strings.
++.P
++The output is a JSON-encoded response.
++.SH OPTIONS
++.TP
++\fB\-s\fR \fIHOSTNAME\fR, \fB\-\-server\fR=\fISERVER\fR
++Connect to the Ibid running on \fISERVER\fR, by default it connects to
++\fIlocalhost\fR.
++.TP
++\fB\-p\fR \fIFILE\fR, \fB\-\-port\fR=\fIPORT\fR
++Connect to the \fBpb\fR source running on port \fIPORT\fR, by default
++8789.
++.TP
++\fB\-h\fR, \fB\-\-help\fR
++Show a help message and exit.
++.SH SEE ALSO
++.BR ibid (1),
++.UR http://ibid.omnia.za.net/
++.BR http://ibid.omnia.za.net/
+
+=== added file 'man/ibid-plugin.1'
+--- old/man/ibid-plugin.1 1970-01-01 00:00:00 +0000
++++ new/man/ibid-plugin.1 2010-01-23 08:50:01 +0000
+@@ -0,0 +1,62 @@
++.\" Copyright (c) 2010, Stefano Rivera
++.\" Released under terms of the MIT/X/Expat Licence. See COPYING for details.
++.TH IBID-PLUGIN "1" "January 2010" "Ibid 0.0" "Multi-protocol Chat Bot"
++.SH NAME
++ibid-plugin \- Plugin testing developer environment for Ibid (the multi-protocol chat bot)
++.SH SYNOPSIS
++.B ibid-plugin
++.RI [ options ...]
++.RI [ plugin\fR[\fB- ]| plugin\fB.\fIProcessor [\fB-\fR]...]
++.SH DESCRIPTION
++This utility is for testing Ibid plugins without the full bot
++environment.
++This means testing can be performed offline and without loading all the
++available plugins.
++.P
++This should be run in a configured Ibid bot directory.
++.P
++All the listed plugins and Processors will be loaded on start-up.
++Naming a plugin loads the complete plugin.
++Suffixing a \fB-\fR to the name, ignores that plugin or Processor
++instead of loading it.
++.SH OPTIONS
++.TP
++\fB\-c\fR, \fB\-\-configured\fR
++Load all configured plugins, instead of only the core and requested
++plugins.
++.TP
++\fB\-o\fR, \fB\-\-only\fR
++Don't load the Ibid core plugins, only the plugins requested.
++Note that without the \fBcore\fR plugin to pre- and post-process events,
++most other plugins won't function correctly.
++.TP
++\fB\-p\fR, \fB\-\-public\fR
++By default, \fBibid-plugin\fR emulates a private conversation with the
++bot.
++With this option, the conversation is considered to be public.
++.TP
++\fB\-h\fR, \fB\-\-help\fR
++Show a help message and exit.
++.SH FILES
++.TP
++.I ibid.ini
++Locates the database to act upon by looking for the \fB[databases].ibid\fR value
++in the bot configuration file in the current directory.
++.SH BUGS
++\fBibid-plugin\fR doesn't emulate a complete Ibid environment, and will
++ignore all of the following:
++.TP
++*
++Delayed and periodically executed functions.
++.TP
++*
++Messages to alternate sources.
++.TP
++*
++Messages directly dispatched, rather than added to responses.
++.SH SEE ALSO
++.BR ibid (1),
++.BR ibid.ini (5),
++.BR ibid-setup (1),
++.UR http://ibid.omnia.za.net/
++.BR http://ibid.omnia.za.net/
+
+=== added file 'man/ibid-setup.1'
+--- old/man/ibid-setup.1 1970-01-01 00:00:00 +0000
++++ new/man/ibid-setup.1 2010-01-23 08:50:01 +0000
+@@ -0,0 +1,31 @@
++.\" Copyright (c) 2010, Stefano Rivera
++.\" Released under terms of the MIT/X/Expat Licence. See COPYING for details.
++.TH IBID-SETUP "1" "January 2010" "Ibid 0.0" "Multi-protocol Chat Bot"
++.SH NAME
++ibid-setup \- Create a configuration file and Database for an Ibid multi-protocol chat bot
++.SH SYNOPSIS
++.B ibid-setup
++.SH DESCRIPTION
++This program installs a new Ibid bot.
++It asks a series of questions about the new bot, and writes out a basic
++configuration file -
++.BR ibid.ini (5)
++- to the current directory.
++It also creates a database for the bot, by default a SQLite database in
++the current directory.
++.P
++This should be run in the directory which will become the new Ibid bot's
++base.
++.P
++Should there be an existing \fBibid.ini\fR in the current directory, it
++will be used, and the only questions asked will be for adding an
++administrative user. These can safely be skipped with a \fB^C\fR.
++.SH FILES
++.TP
++.I ibid.ini
++The Ibid bot's configuration file, will be created if it doesn't exist.
++.SH SEE ALSO
++.BR ibid (1),
++.BR ibid.ini (5),
++.UR http://ibid.omnia.za.net/
++.BR http://ibid.omnia.za.net/
+
+=== added file 'man/ibid.1'
+--- old/man/ibid.1 1970-01-01 00:00:00 +0000
++++ new/man/ibid.1 2010-01-23 08:50:01 +0000
+@@ -0,0 +1,30 @@
++.\" Copyright (c) 2010, Stefano Rivera
++.\" Released under terms of the MIT/X/Expat Licence. See COPYING for details.
++.TH IBID "1" "January 2010" "Ibid 0.0" "Multi-protocol Chat Bot"
++.SH NAME
++ibid \- Run Ibid (the multi-protocol chat bot)
++.SH SYNOPSIS
++.B ibid
++.RI [ config-file ]
++.SH DESCRIPTION
++This runs an Ibid bot in the foreground.
++.P
++There should there be an existing \fBibid.ini\fR in the current
++directory, or one should be provided on the command line.
++.SH BUGS
++Note that you should use
++.BR twistd (1)
++where possible instead of calling this directly, as certain classes of
++error (problems in twisted callbacks) will go unnoticed in this program.
++That has no harmful effects, but the developers may miss out on some
++good bug reports.
++.SH FILES
++.TP
++.I ibid.ini
++The Ibid bot's configuration file, will be created if it doesn't exist.
++.SH SEE ALSO
++.BR ibid (1),
++.BR ibid.ini (5),
++.BR twistd (1),
++.UR http://ibid.omnia.za.net/
++.BR http://ibid.omnia.za.net/
+
+=== added file 'man/ibid.ini.5'
+--- old/man/ibid.ini.5 1970-01-01 00:00:00 +0000
++++ new/man/ibid.ini.5 2010-01-23 08:50:01 +0000
+@@ -0,0 +1,107 @@
++.\" Copyright (c) 2010, Stefano Rivera
++.\" Released under terms of the MIT/X/Expat Licence. See COPYING for details.
++.TH IBID.INI "5" "January 2010" "Ibid 0.0" "Multi-protocol Chat Bot"
++.SH NAME
++ibid.ini \- Configuration file for Ibid (the multi-protocol chat bot)
++.SH DESCRIPTION
++ibid.ini contains all the configuration for an Ibid.
++.P
++A complete description of the contents of this file is out of the scope of this
++manpage, for more details see the Ibid documentation.
++.P
++Lines beginning with \fB#\fR are considered to be comments and ignored.
++To use a \fB#\fR symbol in an option (i.e. an IRC channel name), quote the
++option with double-quotes, i.e.
++.BR channels = """#ibid"","
++.P
++This file will be written to by the bot when configuration settings are
++altered online.
++It can also be edited manually and a running bot told to
++\fB"reload config"\fR.
++.SH SECTIONS
++.SS auth
++Settings related to permissions and authentication.
++Permissions listed in \fBauth.permissions\fR are granted to all users unless
++revoked by source or account.
++.SS sources
++Sources are Ibid connections to an IM service.
++They range from IRC networks to the bot's built-in HTTP server.
++.P
++Each soure is configured in a section named after the source.
++The source name will define the driver that the source should use, unless a
++\fBtype\fR option is provided.
++.P
++Sources can be disabled by setting
++.BR disabled = True .
++.SS plugins
++Plugin configuration, each plugin is configured within a section named after
++the plugin.
++.P
++.TP
++.B cachedir
++The directory that temporary files (such as downloaded data), useful to be the
++bot but expendable, is stored in.
++.TP
++.B core.autoload
++If \fBTrue\fR, all plugins not explicitly ignored will be loaded.
++(Note that some plugins mark themselves as non-auto-loadable).
++Defaults to \fBTrue\fR.
++.TP
++.B core.load
++The list of plugins (or \fBplugin\fR.\fBProcessor\fRs) to load.
++.TP
++.B core.noload
++The list of plugins (or \fBplugin\fR.\fBProcessor\fRs) to ignore and not load.
++.TP
++.B core.names
++The names that the bot should respond to.
++.TP
++.B core.ignore
++Nicks that the bot should completely ignore (i.e. other bots).
++.SH EXAMPLE
++.nf
++botname = joebot
++logging = logging.ini
++
++[auth]
++ methods = password,
++ timeout = 300
++ permissions = +factoid, +karma, +sendmemo, +recvmemo, +feeds, +publicresponse
++
++[sources]
++ [[telnet]]
++ [[timer]]
++ [[http]]
++ url = http://joebot.example.com
++ [[smtp]]
++ [[pb]]
++ [[atrum]]
++ channels = "#ibid",
++ nick = $botname
++ type = irc
++ auth = hostmask, nickserv
++ server = irc.atrum.org
++
++[plugins]
++ cachedir = /tmp/ibid
++ [[core]]
++ names = $botname, bot, ant
++ ignore = ,
++
++[databases]
++ ibid = sqlite:///ibid.db
++.fi
++.SH FILES
++.TP
++.I logging.ini
++A standard Python \fBlogging.confg\fR configuration file describing
++loggers, handlers, and formatters for log messages.
++See
++.UR http://docs.python.org/library/logging.html
++.BR http://docs.python.org/library/logging.html
++.SH SEE ALSO
++.BR ibid (1),
++.BR ibid.ini (5),
++.BR twistd (1),
++.UR http://ibid.omnia.za.net/
++.BR http://ibid.omnia.za.net/
+
+=== modified file 'scripts/ibid'
+--- old/scripts/ibid 2010-01-17 20:08:12 +0000
++++ new/scripts/ibid 2010-01-23 08:50:01 +0000
+@@ -8,7 +8,6 @@ from twisted.internet import reactor
+ import ibid
+
+ parser = OptionParser(usage='%prog [options] <config filename>')
+-parser.add_option('-d', '--debug', dest='debug', action='store_true', help='Output debug messages')
+ options, args = parser.parse_args(values={})
+
+ options['config'] = len(args) > 0 and args[0] or 'ibid.ini'
+
+=== modified file 'scripts/ibid-db'
+--- old/scripts/ibid-db 2010-01-17 20:08:12 +0000
++++ new/scripts/ibid-db 2010-01-21 16:18:05 +0000
+@@ -22,10 +22,14 @@ from ibid.db import metadata, upgrade_sc
+ from ibid.db.types import IbidUnicode, IbidUnicodeText
+ from ibid.utils import ibid_version
+
++version = ibid_version() or "bzr"
++
+ parser = OptionParser(usage='%prog [options...]', description=
+ """Ibid Database management tool. Used for import, export, and upgrades.
+ Export format is JSON. FILE can be - for stdin/stdout or can end
+-in .gz for automatic Gzip compression.""")
++in .gz for automatic Gzip compression.""",
++version=("%prog " + version))
++
+ commands = OptionGroup(parser, 'Modes')
+ commands.add_option('-e', '--export', dest='export', metavar='FILE',
+ help='Export DB contents to FILE.')
+@@ -102,7 +106,7 @@ elif options.export is not None:
+
+ output.write(('# Ibid %(version)s Database dump for %(botname)s '
+ 'made on %(date)s\n') % {
+- 'version': ibid_version() or 'bzr',
++ 'version': version,
+ 'botname': ibid.config['botname'],
+ 'date': datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%SZ'),
+ })
+
+=== modified file 'scripts/ibid-factpack'
+--- old/scripts/ibid-factpack 2010-01-17 20:08:12 +0000
++++ new/scripts/ibid-factpack 2010-01-22 10:16:30 +0000
+@@ -2,10 +2,12 @@
+ # Copyright (c) 2009-2010, Michael Gorven, Stefano Rivera
+ # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
+
+-from sys import exit, stderr
++from sys import exit, stderr, path
+ from os.path import basename, exists
+ from optparse import OptionParser
+
++path.insert(0, '.')
++
+ import ibid
+ from ibid.compat import json
+ from ibid.config import FileConfig
+
+=== modified file 'scripts/ibid_import'
+--- old/scripts/ibid_import 2010-01-18 22:13:23 +0000
++++ new/scripts/ibid_import 2010-01-22 11:42:31 +0000
+@@ -2,7 +2,7 @@
+ # Copyright (c) 2009-2010, Michael Gorven, Stefano Rivera
+ # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
+
+-from sys import argv, exit, stderr, stdout
++from sys import argv, path, exit, stderr, stdout
+
+ from chardet import detect
+ from dateutil.tz import tzlocal, tzutc
+@@ -10,6 +10,8 @@ from sqlalchemy import create_engine, Co
+ from sqlalchemy.ext.declarative import declarative_base
+ from sqlalchemy.orm import sessionmaker
+
++path.insert(0, '.')
++
+ from ibid.config import FileConfig
+ from ibid.db.models import Identity
+ from ibid.plugins.seen import Sighting
+@@ -270,7 +272,7 @@ def import_urls(knab, ibid, source):
+
+ if __name__ == '__main__':
+ if len(argv) < 3:
+- print u'Usage: %s <knab database> <source> [<ibid config>]' % argv[:1]
++ print u'Usage: %s <knab database> <source> [<ibid config>]' % argv[0]
+ exit(1)
+
+ knabengine = create_engine(argv[1])
+
+=== modified file 'scripts/ibid_pb'
+--- old/scripts/ibid_pb 2010-01-17 20:08:12 +0000
++++ new/scripts/ibid_pb 2010-01-22 19:17:51 +0000
+@@ -2,16 +2,18 @@
+ # Copyright (c) 2009, Michael Gorven
+ # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
+
+-from sys import argv, exit
++from sys import argv, exit, path
+ from optparse import OptionParser, OptionGroup
+
+ from twisted.spread import pb
+ from twisted.internet import reactor
+ from twisted.python import util
+
++path.insert(0, '.')
++
+ from ibid.compat import json
+
+-parser = OptionParser(usage='%prog [options] message <message> | plugin <plugin> <class> <method> <parameters>')
++parser = OptionParser(usage='%prog [options] message <message> | plugin <feature> <method> <parameters>')
+ parser.add_option('-s', '--server', help='Hostname of Ibid instance')
+ parser.add_option('-p', '--port', help='Port number of Ibid instance')
+
+
Modified: packages/ibid/trunk/debian/patches/series
===================================================================
--- packages/ibid/trunk/debian/patches/series 2010-01-23 13:25:09 UTC (rev 4575)
+++ packages/ibid/trunk/debian/patches/series 2010-01-23 13:55:01 UTC (rev 4576)
@@ -1,2 +1,3 @@
+manpages.diff
tac-not-needed.diff
docs.diff
Modified: packages/ibid/trunk/debian/patches/tac-not-needed.diff
===================================================================
--- packages/ibid/trunk/debian/patches/tac-not-needed.diff 2010-01-23 13:25:09 UTC (rev 4575)
+++ packages/ibid/trunk/debian/patches/tac-not-needed.diff 2010-01-23 13:55:01 UTC (rev 4576)
@@ -9,8 +9,8 @@
+++ ibid-0+bzr849/setup.py 2010-01-23 15:21:34.767181265 +0200
@@ -60,7 +60,6 @@
'scripts/ibid-factpack',
- 'scripts/ibid-pb-client',
- 'scripts/ibid-knab-import',
+ 'scripts/ibid_pb',
+ 'scripts/ibid_import',
- 'scripts/ibid.tac',
],
More information about the Python-apps-commits
mailing list