[DRE-commits] r5652 - in trunk/rbot/debian: . patches
Marc Dequènes
duck at alioth.debian.org
Mon Jun 28 18:52:17 UTC 2010
Author: duck
Date: 2010-06-28 18:52:16 +0000 (Mon, 28 Jun 2010)
New Revision: 5652
Added:
trunk/rbot/debian/clean
trunk/rbot/debian/rbot-doc.doc-base
trunk/rbot/debian/rbot.manpages
Removed:
trunk/rbot/debian/install
trunk/rbot/debian/patches/reaction_plugin_security_update
trunk/rbot/debian/rbot-remote.xml
trunk/rbot/debian/rbot.xml
trunk/rbot/debian/toilet.rb
Modified:
trunk/rbot/debian/README.Debian
trunk/rbot/debian/changelog
trunk/rbot/debian/control
trunk/rbot/debian/control.in
trunk/rbot/debian/copyright
trunk/rbot/debian/patches/series
trunk/rbot/debian/rules
Log:
[evol] near complete 0.9.15 (needs a few more tests, and waiting for fixes from upstream)
Modified: trunk/rbot/debian/README.Debian
===================================================================
--- trunk/rbot/debian/README.Debian 2010-06-27 09:28:18 UTC (rev 5651)
+++ trunk/rbot/debian/README.Debian 2010-06-28 18:52:16 UTC (rev 5652)
@@ -20,14 +20,11 @@
- slashdot: librexml-ruby
- spell: aspell
- toilet: toilet
- - translator: libwww-mechanize-ruby1.8
+ - translator: libwww-mechanize-ruby1.8, libjson-ruby (for google_translator)
- twitter: librexml-ruby
- weather: librexml-ruby
- wow: librexml-ruby
-Plugins removed:
- - figlet: figlet is a non-free program
-
Plugins disabled:
- dictclient: Ruby/DICT dependency unavailable
- httpd: disabled by upstream author
Modified: trunk/rbot/debian/changelog
===================================================================
--- trunk/rbot/debian/changelog 2010-06-27 09:28:18 UTC (rev 5651)
+++ trunk/rbot/debian/changelog 2010-06-28 18:52:16 UTC (rev 5652)
@@ -1,3 +1,22 @@
+rbot (0.9.15-1) UNRELEASED; urgency=medium
+
+ * New upstream release (after months of upstream pinging,
+ and thanks to tango_ ;-) (Closes: #551560):
+ + removed obsolete patch 'reaction_plugin_security_update
+ + adapted manpages build, they are now included upstream
+ + build mo files
+ + removed toilet plugin, as the figlet plugin now has toilet
+ support
+ + depends on libtokyocabinet-ruby1.8 (alternative to BDB)
+ + set severity to medium, because rbot is broken with recent Ruby
+ Gettext
+ + updated copyright file
+ + updated Suggests/Recommends and REAME.Debian for plugins
+ * Added documentation package.
+ * Fixed package section.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org> Sun, 27 Jun 2010 17:27:32 +0200
+
rbot (0.9.14-2) unstable; urgency=high
[ Paul van Tilburg ]
Added: trunk/rbot/debian/clean
===================================================================
--- trunk/rbot/debian/clean (rev 0)
+++ trunk/rbot/debian/clean 2010-06-28 18:52:16 UTC (rev 5652)
@@ -0,0 +1 @@
+lib/rbot/pkgconfig.rb
Modified: trunk/rbot/debian/control
===================================================================
--- trunk/rbot/debian/control 2010-06-27 09:28:18 UTC (rev 5651)
+++ trunk/rbot/debian/control 2010-06-28 18:52:16 UTC (rev 5652)
@@ -1,18 +1,19 @@
Source: rbot
-Section: net
+Section: ruby
Priority: optional
Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7.0.1), ruby (>= 1.8), ruby-pkg-tools
+Build-Depends: cdbs (>= 0.4.53),
+ debhelper (>= 7.0.1), ruby (>= 1.8), ruby-pkg-tools
Build-Depends-Indep: xsltproc, docbook-xml, docbook-xsl
Standards-Version: 3.8.4
Homepage: http://ruby-rbot.org/
Package: rbot
Architecture: all
-Depends: ruby, ${misc:Depends}, libdb-ruby1.8, libopenssl-ruby1.8
-Recommends: libgettext-ruby
-Suggests: librexml-ruby (>= 1.8.1), host, aspell, bsdmainutils, fortune-mod | fortune, toilet, libwww-mechanize-ruby1.8
+Depends: ruby, ${misc:Depends}, libdb-ruby1.8 | libtokyocabinet-ruby1.8, libopenssl-ruby1.8
+Recommends: libgettext-ruby, libhpricot-ruby
+Suggests: librexml-ruby (>= 1.8.1), host, aspell, bsdmainutils, fortune-mod | fortune, toilet, libwww-mechanize-ruby1.8, libjson-ruby
Description: IRC bot written in ruby
Rbot is very extensible thanks to a well designed plugin
scheme. It has native infobot-style keywords, fact database,
@@ -22,3 +23,20 @@
Babelfish translation, Google searching, Karma, Weather,
quotes, slashdot news, and many more.
+Package: rbot-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: doc-base
+Description: IRC bot written in ruby -- API documentation
+ Rbot is very extensible thanks to a well designed plugin
+ scheme. It has native infobot-style keywords, fact database,
+ access levels and multi-language support.
+ .
+ It comes with several classical plugins, like DNS queries,
+ Babelfish translation, Google searching, Karma, Weather,
+ quotes, slashdot news, and many more.
+ .
+ This package procides the API documentation, useful for
+ programming plugins.
+
Modified: trunk/rbot/debian/control.in
===================================================================
--- trunk/rbot/debian/control.in 2010-06-27 09:28:18 UTC (rev 5651)
+++ trunk/rbot/debian/control.in 2010-06-28 18:52:16 UTC (rev 5652)
@@ -1,5 +1,5 @@
Source: rbot
-Section: net
+Section: ruby
Priority: optional
Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
@@ -10,9 +10,9 @@
Package: rbot
Architecture: all
-Depends: ruby, ${misc:Depends}, libdb-ruby1.8, libopenssl-ruby1.8
-Recommends: libgettext-ruby
-Suggests: librexml-ruby (>= 1.8.1), host, aspell, bsdmainutils, fortune-mod | fortune, toilet, libwww-mechanize-ruby1.8
+Depends: ruby, ${misc:Depends}, libdb-ruby1.8 | libtokyocabinet-ruby1.8, libopenssl-ruby1.8
+Recommends: libgettext-ruby, libhpricot-ruby
+Suggests: librexml-ruby (>= 1.8.1), host, aspell, bsdmainutils, fortune-mod | fortune, toilet, libwww-mechanize-ruby1.8, libjson-ruby
Description: IRC bot written in ruby
Rbot is very extensible thanks to a well designed plugin
scheme. It has native infobot-style keywords, fact database,
@@ -22,3 +22,20 @@
Babelfish translation, Google searching, Karma, Weather,
quotes, slashdot news, and many more.
+Package: rbot-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: doc-base
+Description: IRC bot written in ruby -- API documentation
+ Rbot is very extensible thanks to a well designed plugin
+ scheme. It has native infobot-style keywords, fact database,
+ access levels and multi-language support.
+ .
+ It comes with several classical plugins, like DNS queries,
+ Babelfish translation, Google searching, Karma, Weather,
+ quotes, slashdot news, and many more.
+ .
+ This package procides the API documentation, useful for
+ programming plugins.
+
Modified: trunk/rbot/debian/copyright
===================================================================
--- trunk/rbot/debian/copyright 2010-06-27 09:28:18 UTC (rev 5651)
+++ trunk/rbot/debian/copyright 2010-06-28 18:52:16 UTC (rev 5652)
@@ -9,7 +9,7 @@
Copyright:
Copyright (C) 2002-2007 Tom Gilbert.
- Copyright (C) 2007-2008 Giuseppe Bilotta and the rbot development team
+ Copyright (C) 2007-2010 Giuseppe Bilotta and the rbot development team
This program is free software; you can redistribute it and/or modify it
under the terms of the MIT license with acknolwedgement clause (see
Deleted: trunk/rbot/debian/install
===================================================================
--- trunk/rbot/debian/install 2010-06-27 09:28:18 UTC (rev 5651)
+++ trunk/rbot/debian/install 2010-06-28 18:52:16 UTC (rev 5652)
@@ -1 +0,0 @@
-debian/toilet.rb usr/share/rbot/plugins/
Deleted: trunk/rbot/debian/patches/reaction_plugin_security_update
===================================================================
--- trunk/rbot/debian/patches/reaction_plugin_security_update 2010-06-27 09:28:18 UTC (rev 5651)
+++ trunk/rbot/debian/patches/reaction_plugin_security_update 2010-06-28 18:52:16 UTC (rev 5652)
@@ -1,185 +0,0 @@
-Index: rbot-0.9.14/data/rbot/plugins/reaction.rb
-===================================================================
---- rbot-0.9.14.orig/data/rbot/plugins/reaction.rb 2010-03-24 23:55:56.000000000 +0100
-+++ rbot-0.9.14/data/rbot/plugins/reaction.rb 2010-03-25 01:38:21.000000000 +0100
-@@ -69,7 +69,9 @@
- @trigger << Regexp.new(rex, true)
- else
- rex.sub!(/^(["'])(.*)\1$/, '\2')
-- @trigger << Regexp.new(/\b#{Regexp.escape(rex)}(?:\b|$)/ui)
-+ prepend = ( rex =~ /^\w/ ? '(?:\b)' : '')
-+ append = ( rex =~ /\w$/ ? '(?:\b|$)' : '')
-+ @trigger << Regexp.new(/#{prepend}#{Regexp.escape(rex)}#{append}/ui)
- end
- end
-
-@@ -81,6 +83,8 @@
- act = :act
- elsif rex.sub!(/^(?:cmd|command):/,'')
- act = :cmd
-+ elsif rex.sub!(/^ruby:/,'')
-+ act = :ruby
- end
- @replies << Reply.new(self, act, rex, *args)
- make_ranges
-@@ -170,7 +174,7 @@
- super
- if @registry.has_key?(:reactions)
- @reactions = @registry[:reactions]
-- raise unless @reactions
-+ raise LoadError, "corrupted reaction database" unless @reactions
- else
- @reactions = []
- end
-@@ -202,28 +206,33 @@
- help(:react)
- when :remove, :delete, :rm, :del
- "reaction #{topic} <trigger> [<n>] => removes reactions to expression <trigger>. If <n> (a positive integer) is specified, only remove the n-th reaction, otherwise remove the trigger completely"
-+ when :move
-+ "reaction move <trigger> to <other> => move all reactions to <trigger> to the new trigger <other>"
- when :chance, :chances
- "reaction chances are expressed either in terms of percentage (like 30%) or in terms of floating point numbers (like 0.3), and are clipped to be " +
- "between 0 and 1 (i.e. 0% and 100%). A reaction can have multiple replies, each with a different chance; if the total of the chances is less than one, " +
- "there is a chance that the trigger will not actually cause a reply. Otherwise, the chances express the relative frequency of the replies."
- when :trigger, :triggers
-- "reaction triggers can have one of the format: single_word 'multiple words' \"multiple words \" /regular_expression/ !regular_expression!. " +
-+ "reaction triggers can have one of the format: single_word 'multiple words' \"multiple words \" /regular_expression/ !regular_expression!. " +
- "If prefixed by 'act:' (e.g. act:/(order|command)s/) the bot will only respond if a CTCP ACTION matches the trigger"
- when :reply, :replies
- "reaction replies are simply messages that the bot will reply when a trigger is matched. " +
-- "Replies can be prefixed by 'act:' (e.g. act:goes shopping) to signify that the bot should act instead of saying the message. " +
-- "Replies can be prefixed by 'cmd:' or 'command:' (e.g. cmd:lart %{who}) to issue a command to the bot. " +
-- "Replies can use the %{key} syntax to access one of the following keys: " +
-- "who (the user that said the trigger), bot (the bot's own nick), " +
-- "target (the first word following the trigger), what (whatever follows target), " +
-+ "Replies prefixed by 'act:' (e.g. act:goes shopping) signify that the bot should act instead of saying the message. " +
-+ "Replies prefixed by 'cmd:' or 'command:' (e.g. cmd:lart %{who}) issue a command to the bot. " +
-+ "Replies can use the %{key} syntax to access the following keys: " +
-+ "who (user that said the trigger), bot (bot's own nick), " +
-+ "target (first word following the trigger), what (whatever follows target), " +
- "before (everything that precedes the trigger), after, (everything that follows the trigger), " +
-- "match (the actual matched text), match1, match2, ... (the i-th capture)"
-+ "match (matched text), match1, match2, ... (the i-th capture). " +
-+ "Replies prefixed by 'ruby:' (e.g. ruby:m.reply 'Hello ' + subs[:who]) are interpreted as ruby code. " +
-+ "No %{key} substitution is done in this case, use the subs hash in the code instead. " +
-+ "Be warned that creating ruby replies can open unexpected security holes in the bot."
- when :list
- "reaction list [n]: lists the n-the page of programmed reactions (30 reactions are listed per page)"
- when :show
- "reaction show <trigger>: list the programmed replies to trigger <trigger>"
- else
-- "reaction topics: add, remove, delete, rm, del, triggers, replies, chance, list, show"
-+ "reaction topics: add, remove, delete, rm, del, move, triggers, replies, chance, list, show"
- end
- end
-
-@@ -261,18 +270,28 @@
- reply = wanted.pick_reply
- debug "picked #{reply}"
- return unless reply
-- args = reply.apply(subs)
-- if args[0] == :cmd
-+ act, arg = reply.apply(subs)
-+ case act
-+ when :ruby
-+ begin
-+ # no substitutions for ruby code
-+ eval(reply.reply)
-+ rescue Exception => e
-+ error e
-+ end
-+ when :cmd
- begin
- # Pass the new message back to the bot.
- # FIXME Maybe we should do it the alias way, only calling
- # @bot.plugins.privmsg() ?
-- fake_message(@bot.nick+": "+args[1], :from => m)
-+ fake_message(@bot.nick+": "+arg, :from => m)
- rescue RecurseTooDeep => e
- error e
- end
-+ when :reply
-+ m.plainreply arg
- else
-- m.__send__(*args)
-+ m.__send__(act, arg)
- end
- end
-
-@@ -282,6 +301,13 @@
- }
- end
-
-+ def can_add?(m, reaction)
-+ return true if reaction.act == :reply
-+ return true if reaction.act == :ruby and @bot.auth.permit?(m.source, "reaction::react::ruby", m.channel)
-+ return true if reaction.act == :cmd and @bot.auth.permit?(m.source, "reaction::react::cmd", m.channel)
-+ return false
-+ end
-+
- def handle_add(m, params)
- trigger = params[:trigger].to_s
- reply = params[:reply].to_s
-@@ -293,20 +319,45 @@
- pct = pct.to_f.clip(0,1)
- end
-
-+ new_reaction = false
-+
- reaction = find_reaction(trigger)
- if not reaction
- reaction = Reaction.new(trigger)
- @reactions << reaction
-- m.reply "Ok, I'll start reacting to #{reaction.raw_trigger}"
-+ new_reaction = true
- end
-+
- found = reaction.find_reply(reply)
- if found
-- found.pct = pct
-- found.author = m.sourcenick
-- found.date = Time.now
-- found.channel = m.channel
-+ # ruby replies need special permission
-+ if can_add?(m, found)
-+ found.pct = pct
-+ found.author = m.sourcenick
-+ found.date = Time.now
-+ found.channel = m.channel
-+ else
-+ m.reply _("Sorry, you're not allowed to change %{act} replies here") % {
-+ :act => found.act
-+ }
-+ return
-+ end
- else
- found = reaction.add_reply(reply, pct, m.sourcenick, Time.now, m.channel)
-+ unless can_add?(m, found)
-+ m.reply _("Sorry, you're not allowed to add %{act} replies here") % {
-+ :act => found.act
-+ }
-+ reaction.rm_reply(reaction.replies.length)
-+ if new_reaction
-+ @reactions.delete(reaction)
-+ end
-+ return
-+ end
-+ end
-+
-+ if new_reaction
-+ m.reply "Ok, I'll start reacting to #{reaction.raw_trigger}"
- end
- m.reply "I'll react to #{reaction.raw_trigger} with #{reaction.raw_replies.last} (#{(reaction.replies.last.pct * 100).to_i}%)"
- end
-@@ -396,6 +447,11 @@
- plugin.map plugin.add_syntax, :action => 'handle_add',
- :requirements => { :trigger => plugin.trigger_syntax }
-
-+# ruby reactions are security holes, so give stricter permission
-+plugin.default_auth('react::ruby', false)
-+# cmd reactions can be security holes too
-+plugin.default_auth('react::cmd', false)
-+
- plugin.map 'reaction list [:page]', :action => 'handle_list',
- :requirements => { :page => /^\d+$/ }
-
Modified: trunk/rbot/debian/patches/series
===================================================================
--- trunk/rbot/debian/patches/series 2010-06-27 09:28:18 UTC (rev 5651)
+++ trunk/rbot/debian/patches/series 2010-06-28 18:52:16 UTC (rev 5652)
@@ -1,2 +1 @@
spell_module_use_aspell_not_ispell
-reaction_plugin_security_update
Added: trunk/rbot/debian/rbot-doc.doc-base
===================================================================
--- trunk/rbot/debian/rbot-doc.doc-base (rev 0)
+++ trunk/rbot/debian/rbot-doc.doc-base 2010-06-28 18:52:16 UTC (rev 5652)
@@ -0,0 +1,10 @@
+Document: rbot-doc
+Title: rbot - The Ruby IRC bot
+Author: Tom Gilbert (giblet) <tom at linuxbrit.co.uk>, Giuseppe "Oblomov" Bilotta (tango_) <giuseppe.bilotta at gmail.com>
+Abstract: Rdoc-generated API documentation.
+Section: Programming/Ruby
+
+Format: HTML
+Index: /usr/share/doc/rbot-doc/rdoc/index.html
+Files: /usr/share/doc/rbot-doc/rdoc/*
+
Deleted: trunk/rbot/debian/rbot-remote.xml
===================================================================
--- trunk/rbot/debian/rbot-remote.xml 2010-06-27 09:28:18 UTC (rev 5651)
+++ trunk/rbot/debian/rbot-remote.xml 2010-06-28 18:52:16 UTC (rev 5652)
@@ -1,193 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!--
-
-Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl manpage.dbk'. A manual page
-<package>.<section> will be generated. You may view the
-manual page with: nroff -man <package>.<section> | less'. A
-typical entry in a Makefile or Makefile.am is:
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-manpage.1: manpage.dbk
- $(XP) $(DB2MAN) $<
-
-The xsltproc binary is found in the xsltproc package. The
-XSL files are in docbook-xsl. Please remember that if you
-create the nroff version in one of the debian/rules file
-targets (such as build), you will need to include xsltproc
-and docbook-xsl in your Build-Depends control field.
-
--->
-
- <!-- Fill in your name for FIRSTNAME and SURNAME. -->
- <!ENTITY dhfirstname "<firstname>Marc</firstname>">
- <!ENTITY dhsurname "<surname>Dequ\[`e]nes</surname>">
- <!-- Please adjust the date whenever revising the manpage. -->
- <!ENTITY dhdate "<date>20090401</date>">
- <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
- allowed: see man(7), man(1). -->
- <!ENTITY dhsection "<manvolnum>1</manvolnum>">
- <!ENTITY dhemail "<email>Duck at DuckCorp.org</email>">
- <!ENTITY dhusername "Marc Dequ\[`e]nes (Duck)">
- <!ENTITY dhucpackage "<refentrytitle>RBOT-REMOTE</refentrytitle>">
- <!ENTITY dhpackage "rbot-remote">
-
- <!ENTITY debian "<productname>Debian</productname>">
- <!ENTITY gnu "<acronym>GNU</acronym>">
- <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
- <refentryinfo>
- <address>
- &dhemail;
- </address>
- <author>
- &dhfirstname;
- &dhsurname;
- </author>
- <copyright>
- <year>2004-2009</year>
- <holder>&dhusername;</holder>
- </copyright>
- &dhdate;
- </refentryinfo>
- <refmeta>
- &dhucpackage;
-
- &dhsection;
- </refmeta>
- <refnamediv>
- <refname>&dhpackage;</refname>
-
- <refpurpose>IRC bot written in ruby</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>&dhpackage;</command>
-
- <group choice="req">
- <group choice="req">
- <arg><option>-u USER</option></arg>
- <arg><option>--user USER</option></arg>
- </group>
- <group choice="req">
- <arg><option>-p PASSWORD</option></arg>
- <arg><option>--password PASSWORD</option></arg>
- </group>
- </group>
- <group choice="opt">
- <group choice="req">
- <arg><option>-d DEST</option></arg>
- <arg><option>--destination DEST</option></arg>
- </group>
- <group choice="req">
- <arg><option>-r DRB_URI</option></arg>
- <arg><option>--uri DRB_URI</option></arg>
- </group>
- <group choice="req">
- <arg><option>-h</option></arg>
- <arg><option>--help</option></arg>
- </group>
- <group choice="req">
- <arg><option>-a</option></arg>
- <arg><option>--about</option></arg>
- </group>
- </group>
-
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
-
- <para><command>&dhpackage;</command> is a proof-of-concept example for
- rbot druby-based api. This program reads lines of text from the standard
- input and sends them to a specified irc channel or user via rbot.
- </para>
-
- <para>Make sure you have remotectl.rb plugin loaded and assigned the needed
- rights to the user before use.
- </para>
-
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
-
- <para>This program follow the usual &gnu; command line syntax,
- with long options starting with two dashes (`-'). A summary of
- options is included below.</para>
-
- <variablelist>
- <varlistentry>
- <term><option>-u <parameter>USER</parameter></option></term>
- <term><option>--user <parameter>USER</parameter></option></term>
- <listitem>
- <para>Remote user.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-p <parameter>PASSWORD</parameter></option></term>
- <term><option>--password <parameter>PASSWORD</parameter></option></term>
- <listitem>
- <para>Remote user password.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-d <parameter>DEST</parameter></option></term>
- <term><option>--destination <parameter>DEST</parameter></option></term>
- <listitem>
- <para>Destination for message (user or channel).</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-r <parameter>DRB_URI</parameter></option></term>
- <term><option>--uri <parameter>DRB_URI</parameter></option></term>
- <listitem>
- <para>Rbot url.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-h</option></term>
- <term><option>--help</option></term>
- <listitem>
- <para>Show summary of options.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-a</option></term>
- <term><option>--about</option></term>
- <listitem>
- <para>Tell what it's all about.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
- <refsect1>
- <title>AUTHOR</title>
-
- <para>This manual page was written by &dhusername; &dhemail; for
- the &debian; system (but may be used by others). Permission is
- granted to copy, distribute and/or modify this document under
- the terms of the &gnu; General Public License, Version 3 or
- any later version published by the Free Software Foundation.
- </para>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL.
- </para>
-
- </refsect1>
-</refentry>
-
Added: trunk/rbot/debian/rbot.manpages
===================================================================
--- trunk/rbot/debian/rbot.manpages (rev 0)
+++ trunk/rbot/debian/rbot.manpages 2010-06-28 18:52:16 UTC (rev 5652)
@@ -0,0 +1 @@
+man/*.1
Deleted: trunk/rbot/debian/rbot.xml
===================================================================
--- trunk/rbot/debian/rbot.xml 2010-06-27 09:28:18 UTC (rev 5651)
+++ trunk/rbot/debian/rbot.xml 2010-06-28 18:52:16 UTC (rev 5652)
@@ -1,200 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!--
-
-Process this file with an XSLT processor: `xsltproc \
--''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl manpage.dbk'. A manual page
-<package>.<section> will be generated. You may view the
-manual page with: nroff -man <package>.<section> | less'. A
-typical entry in a Makefile or Makefile.am is:
-
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\
-manpages/docbook.xsl
-XP=xsltproc -''-nonet
-
-manpage.1: manpage.dbk
- $(XP) $(DB2MAN) $<
-
-The xsltproc binary is found in the xsltproc package. The
-XSL files are in docbook-xsl. Please remember that if you
-create the nroff version in one of the debian/rules file
-targets (such as build), you will need to include xsltproc
-and docbook-xsl in your Build-Depends control field.
-
--->
-
- <!-- Fill in your name for FIRSTNAME and SURNAME. -->
- <!ENTITY dhfirstname "<firstname>Marc</firstname>">
- <!ENTITY dhsurname "<surname>Dequ\[`e]nes</surname>">
- <!-- Please adjust the date whenever revising the manpage. -->
- <!ENTITY dhdate "<date>20090401</date>">
- <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
- allowed: see man(7), man(1). -->
- <!ENTITY dhsection "<manvolnum>1</manvolnum>">
- <!ENTITY dhemail "<email>Duck at DuckCorp.org</email>">
- <!ENTITY dhusername "Marc Dequ\[`e]nes (Duck)">
- <!ENTITY dhucpackage "<refentrytitle>RBOT</refentrytitle>">
- <!ENTITY dhpackage "rbot">
-
- <!ENTITY debian "<productname>Debian</productname>">
- <!ENTITY gnu "<acronym>GNU</acronym>">
- <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
- <refentryinfo>
- <address>
- &dhemail;
- </address>
- <author>
- &dhfirstname;
- &dhsurname;
- </author>
- <copyright>
- <year>2004-2009</year>
- <holder>&dhusername;</holder>
- </copyright>
- &dhdate;
- </refentryinfo>
- <refmeta>
- &dhucpackage;
-
- &dhsection;
- </refmeta>
- <refnamediv>
- <refname>&dhpackage;</refname>
-
- <refpurpose>IRC bot written in ruby</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>&dhpackage;</command>
-
- <group choice="opt">
- <group choice="req">
- <arg><option>-d</option></arg>
- <arg><option>--debug</option></arg>
- </group>
- <group choice="req">
- <arg><option>-h</option></arg>
- <arg><option>--help</option></arg>
- </group>
- <group choice="req">
- <arg><option>-v</option></arg>
- <arg><option>--version</option></arg>
- </group>
- <group choice="req">
- <arg><option>-l LEVEL</option></arg>
- <arg><option>--loglevel LEVEL</option></arg>
- </group>
- <group choice="req">
- <arg><option>-b</option></arg>
- <arg><option>--background</option></arg>
- </group>
- <group choice="req">
- <arg><option>-p PIDFILE</option></arg>
- <arg><option>--pidfile PIDFILE</option></arg>
- </group>
- </group>
-
- <arg choice="opt" rep="norepeat">confdir</arg>
-
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
-
- <para><command>&dhpackage;</command> starts the Rbot (ruby IRC bot).</para>
-
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
-
- <para>This program follow the usual &gnu; command line syntax,
- with long options starting with two dashes (`-'). A summary of
- options is included below.</para>
-
- <variablelist>
- <varlistentry>
- <term><option>-d</option></term>
- <term><option>--debug</option></term>
- <listitem>
- <para>Display debug information (very verbose).</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-h</option></term>
- <term><option>--help</option></term>
- <listitem>
- <para>Show summary of options.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-v</option></term>
- <term><option>--version</option></term>
- <listitem>
- <para>Display version information.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-l <parameter>LEVEL</parameter></option></term>
- <term><option>--loglevel <parameter>LEVEL</parameter></option></term>
- <listitem>
- <para>
- Sets the minimum log level verbosity. Possible values for the
- loglevel are 0 (DEBUG), 1 (INFO), 2 (WARN), 3 (ERROR), 4
- (FATAL). The default loglevel is 1 (INFO messages). The logfile
- is located at BOTDIR/BOTNAME.log and doesn't contain IRC logs
- (which are located at BOTDIR/logs/*), but only rbot diagnostic
- messages.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-b</option></term>
- <term><option>--background</option></term>
- <listitem>
- <para>Background (daemonize) the bot.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-p <parameter>PIDFILE</parameter></option></term>
- <term><option>--pidfile <parameter>PIDFILE</parameter></option></term>
- <listitem>
- <para>Write the bot pid to PIDFILE. The default pidfile is BOTDIR/rbot.pid.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><parameter>CONFDIR</parameter></term>
- <listitem>
- <para>Path to the directory where are stored the bot's configuration files. The default config directory is ~/.rbot.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
- <refsect1>
- <title>AUTHOR</title>
-
- <para>This manual page was written by &dhusername; &dhemail; for
- the &debian; system (but may be used by others). Permission is
- granted to copy, distribute and/or modify this document under
- the terms of the &gnu; General Public License, Version 3 or
- any later version published by the Free Software Foundation.
- </para>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL.
- </para>
-
- </refsect1>
-</refentry>
-
Modified: trunk/rbot/debian/rules
===================================================================
--- trunk/rbot/debian/rules 2010-06-27 09:28:18 UTC (rev 5651)
+++ trunk/rbot/debian/rules 2010-06-28 18:52:16 UTC (rev 5652)
@@ -5,30 +5,31 @@
# Then check manually if everything's ok
include /usr/share/cdbs/1/rules/debhelper.mk
+
+# work around a bug in the ruby CDBS class
+include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
+DEB_RUBY_SIMPLE_PACKAGES := $(strip $(filter-out %-doc,$(DEB_RUBY_SIMPLE_PACKAGES)))
+
include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
+DISABLED_PLUGINS = shortenurls dictclient
+
DEB_RUBY_CONFIG_ARGS += --shebang=never
-MANPAGES := debian/rbot.1 debian/rbot-remote.1
-build/rbot:: $(MANPAGES)
+MANPAGES = $(notdir $(patsubst %.xml, %.1, $(wildcard man/*.xml)))
+build/rbot::
+ rake makemo
+ make -C man $(MANPAGES)
-%.1: %.xml
- xsltproc -nonet -o $@ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
-
install/rbot::
- # figlet is non-free, that's why this package would not recommend such a nasty program in any way
- rm debian/rbot/usr/share/rbot/plugins/figlet.rb
# disabled plugins
- for PL in shortenurls dictclient; do \
+ for PL in $(DISABLED_PLUGINS); do \
mv debian/rbot/usr/share/rbot/plugins/$${PL}.rb debian/rbot/usr/share/rbot/plugins/$${PL}.rb.disabled; \
done
+ # broken manpage install
+ rm debian/$(cdbs_curpkg)/usr/share/man/*
-binary-install/rbot::
- dh_installman -prbot $(MANPAGES)
+clean::
+ rm -rf data/locale
-clean::
- rm -f $(MANPAGES)
- # buildsys fix
- rm -f lib/rbot/pkgconfig.rb
-
Deleted: trunk/rbot/debian/toilet.rb
===================================================================
--- trunk/rbot/debian/toilet.rb 2010-06-27 09:28:18 UTC (rev 5651)
+++ trunk/rbot/debian/toilet.rb 2010-06-28 18:52:16 UTC (rev 5652)
@@ -1,20 +0,0 @@
-class ToiletPlugin < Plugin
- def help(plugin, topic="")
- "toilet [<message>] => print using toilet"
- end
- def privmsg(m)
- case m.params
- when nil
- m.reply "incorrect usage: " + help(m.plugin)
- return
- when (/^-/)
- m.reply "incorrect usage: " + help(m.plugin)
- return
- else
- m.reply Utils.safe_exec("toilet", "--gay", "--irc", m.params)
- return
- end
- end
-end
-plugin = ToiletPlugin.new
-plugin.register("toilet")
More information about the Pkg-ruby-extras-commits
mailing list