[DRE-commits] [SCM] rbot.git branch, master, updated. upstream/0.9.15-8-g00ca9d8

=?UTF-8?Q?Marc=20Dequ=C3=A8nes=20?=(Duck) Duck at DuckCorp.org
Wed Jan 4 02:52:25 UTC 2012


The following commit has been merged in the master branch:
commit b4fd3cbbcf0f50a986d14e5f2481a228e2f7c18f
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Tue Jan 3 21:38:44 2012 +0100

    [evol] conversion to gem2deb style

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..d7650e4
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,71 @@
+rbot (0.9.14-1) unstable; urgency=low
+
+  * New auth system:
+    The basic hostmask-based auth is over, as long as basic auth levels.
+    There is still a special owner account which can do everything. User
+    accounts protected by password can now be created using 'user create
+    <login>< password>'. It is still possible to user hostmask-based auth
+    with ou without autologin. Unfortunately, there is no upgrade path
+    provided by the Rbot authors, so you have to recreate all accounts
+    and rights (only the owner account is preserved). More details on the
+    new system can be found here:
+      http://ruby-rbot.org/rbot-trac/wiki/NewAuthModule
+
+  * New plugins:
+    + alias: commands aliases
+    + botsnack: replaces the hardcoded botsnack command
+    + chanserv: sets user rights using Chanserv
+    + debugger: debugging/profiling for rbot
+    + delicious: Del.icio.us URL auto-submiter
+    + dict: remote dictionnaries (includes the previous demauro plugin features)
+    + factoids: replaces the hardcoded fact command
+    + azgame: A-Z game
+    + quiz: Quiz game
+    + shiritori: Shiritori game
+    + uno: UNO game
+    + wheelfortune: Hangman/Wheel Of Fortune game
+    + geoip: resolves the geographic locations of users
+    + hl2: Half-Life 2 server status
+    + modes: manages IRC rights (ncludes the previous opme plugin features)
+    + nickrecover: tries to recover the rbot nick
+    + reaction: automatic replies/reactions to expressions/actions in channel
+    + remotectl: druby remote command execution for rbot (use it with rbot-remote)
+    + ri: Ruby documentation
+    + rss: RSS/RDF reader
+    + salut: responds to salutations
+    + script: allow running scripts from rbot (like mini plugins)
+    + search (includes the previous google plugin features)
+    + time: timezones info
+    + translator: use remote translation services
+    + twitter: Twitter status updater
+    + urban: uses www.urbandictionary.com
+    + usermodes: sets rbot usermodes on connect
+    + wall: allow to read/write rbot site "wall" on http://ruby-rbot.org/wall/
+    + youtube: YouTube info/search
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Thu, 02 Apr 2009 01:41:01 +0200
+
+rbot (0.9.9-1) unstable; urgency=low
+
+  * New configuration file:
+    'conf.rbot' has been replaced by 'conf.yaml', which is more manageable,
+    allowing on the fly configuration modifications using the "config"
+    command (see: help config). You need to run the bot interractively
+    the first time after upgrading, then a wizard will ask you questions
+    to fill the necessary minimal parameters into the initial 'conf.yaml'
+    file. Rbot may not guess the right directory (mostly if you use SU),
+    so you're advised to specify the config directory in the command line.
+
+  * Plugin directory has changed:
+    plugins used to be in '/usr/lib/ruby/1.8/rbot/plugins', and now live
+    in '/usr/share/rbot/plugins', so you need to move your custom
+    system-wide plugins manually.
+
+  * New plugins:
+    + autoop
+    + opme
+    + quakeauth: Q auth on Quakenet network
+    + roshambo: rock-paper-scissors game
+    + tube: London Tube transport information
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Wed, 24 Aug 2005 23:58:04 +0200
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..385bdc9
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,36 @@
+rbot for Debian
+---------------
+
+
+Plugins requirements:
+  (these are all optional, if you don't have them, the
+  plugins just won't work)
+
+  - cal: bsdmainutils
+  - fortune: fortune-mod | fortune 
+  - games/shiritori: - (normalize-japanese library is used to play
+      in japanese mode, unfortunately unavailable)
+  - host: host
+  - spell: aspell
+  - toilet: toilet
+  - translator: libwww-mechanize-ruby1.8 or libwww-mechanize-ruby1.9.1, ruby-json (for google_translator)
+
+Plugins disabled:
+  - dictclient: Ruby/DICT dependency unavailable
+  - httpd: disabled by upstream author
+  - shortenurls: shorturl dependency unavailable
+
+
+How to run the bot:
+  Choose a directory to store your bot configuration (we are
+  calling it <confdir>) ; by default rbot would use '~/.rbot'.
+  Run the bot this way
+    rbot <confdir> (<confdir> parameter can be omitted if
+      the directory name is '~/.rbot').
+  It will create all needed defaut files, and you can later
+  change all parameters directly using bots commands (use
+  help to know how to do it).
+  
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Sun, 19 Dec 2004 20:44:29 +0100
+
diff --git a/debian/changelog b/debian/changelog
index 87ec1ec..c77192c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,146 @@
-rbot (0.9.15-1) UNRELEASED; urgency=low
+rbot (0.9.15+post20100705+gitb3aa806-3) unstable; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * Switched to gem2deb packaging style.
+  * Switched to the new git repository.
+  * Converted copyright file to DEP5.
+  * Updated plugins requirements in 'README.Debian'.
+  * Increased Standards-Version to 3.9.2 (no changes).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Tue, 03 Jan 2012 21:36:00 +0100
+
+rbot (0.9.15+post20100705+gitb3aa806-2) unstable; urgency=medium
+
+  * Fixed FTBFS and other cleanups (Closes: 588657).
+  * Increased Standards-Version to 3.9.0 (no changes).
+  * Added patch 'buildsys_no_rubygems' to remove useless rubygems build
+    dependency.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Sun, 11 Jul 2010 12:56:38 +0200
+
+rbot (0.9.15+post20100705+gitb3aa806-1) unstable; urgency=medium
+
+  * New upstream release (after months of upstream pinging,
+    and thanks to tango_ ;-) (Closes: #551560):
+    + still a few problems, then using a git post-release snapshot
+    + 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 Debian/Ruby Extras Maintainers to the uploaders.
+
+  [ Marc Dequènes (Duck) ]
+  * Switched to dpkg-source 3.0 (quilt) format.
+  * Added 'reaction_plugin_security_update' patch to update the reaction
+    plugin and fix several security flows (Closes: #575286).
+  * Increased Standards-Version to 3.8.4 (no changes).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Thu, 25 Mar 2010 00:13:39 +0100
+
+rbot (0.9.14-1) unstable; urgency=low
+
+  * New upstream release
+  * Added missing '${misc:Depends}' dependency.
+  * Bumped Standards-Version (no changes).
+  * Updated copyright file.
+  * Updated disabled plugins list.
+  * Updated plugins documentation.
+  * Updated watch file.
+  * Updated rbot manpage and created rbot-remote manpage.
+  * Changed depends on libdb (unique libdb-ruby1.8 now).
+  * Switched to compat level 7.
+  * Updated site and download URL.
+  * Simplified 'debian/rules' using Ruby Team CDBS rules.
+  * Updated Suggests/Recommends.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Wed, 01 Apr 2009 23:47:21 +0200
+
+rbot (0.9.10-3) unstable; urgency=low
+
+  * Minor 'debian/rules' cleanup.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Fri, 21 Mar 2008 01:29:39 +0100
+
+rbot (0.9.10-2) unstable; urgency=high
+
+  * Fixed ruby dependency as the versioning scheme changed and version
+    limiting is done another way now (Closes: #463484).
+  * Increased Standards-Version (no changes).
+  * Added Homepage URL.
+  * Disabled rubyurl plugins: depends not available in Debian.
+  * Updated README.Debian (Closes: #401718, #441025).
+  * Added toilet plugin from Arnaud Cornet (Closes: #438609).
+  * Switched to debhelper compat 5.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Wed, 06 Feb 2008 23:27:57 +0100
+
+rbot (0.9.10-1) unstable; urgency=low
+
+  * New upstream release:
+    + fixed address_prefix (removed 02_address_prefix_broken patch)
+    + render 03_refs_install_rb patch obsolete
+    + fixed buildsys (removed 04_buildsys_broken patch)
+  * Now using quilt for patch management.
+  * Fixed build-depends: several packages where needed at clean time,
+    then split -Indep.
+  * Updated Depends for new requirements.
+  * Removed new figlet plugin: figlet is non-free, that's why this
+    package would not recommend such a nasty program in any way (please
+    don't waste your time sending crappy reports to the BTS, this will
+    end up to WONTFIX flagging, thanks).
+  * Disabled tinyurl and urban plugins: depends not available in Debian.
+  * Added new recommands:
+    + bsdmainutils: used for cal in cal plugin
+    + fortune-mod | fortune: used in fortune plugin
+  * Updated README.Debian plugins information.
+  * Increased Standards-Version to 3.7.2.1 (no changes).
+  * Updated watch file.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Mon,  7 Aug 2006 00:06:16 +0200
+
+rbot (0.9.9-1) unstable; urgency=high
+
+  * New upstream release.
+  * Fixed depends, and build-depends (avoiding FTBFS).
+  * Removed patches :
+    - 01_core_http_syntax_fix.patch : fixed upstream
+    - 02_freshmeat_bad_rdf_url.patch: url changed again, fixed upstream
+    - 04_weather_bad_icao_code_url.patch: fixed upstream
+    - 05_nickserv_register_fix.patch: nickserv plugin rewritten
+  * Fixed '03_spell_use_aspell_not_ispell.patch' for path change and help
+    message.
+  * Applied '02_address_prefix_broken.patch' borrowed from SVN.
+  * Applied '03_refs_install_rb.patch' fo fix error messages.
+  * Reindexed patches.
+  * Minor manpage update (with encoding fix).
+  * Updated Standards-Version to please lintian (no changes needed).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Thu, 25 Aug 2005 00:32:45 +0200
+
+rbot (0.9.7-1) unstable; urgency=low
+
+  * Initial Release (Closes: #140985).
+  * Applied small patches :
+    - core : fix http.get affectation syntax.
+    - freshmeat : correct RDF URL.
+    - spell : use aspell instead of deprecated ispell.
+    - weather : correct URL where to find ICAO codes in help.
+    - nickserv : fix nickserv registration not saved by bot
+      when passwd not given (autogenerated).
+  * Created missing manpage.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Mon, 20 Dec 2004 03:03:00 +0100
 
- -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Tue, 03 Jan 2012 20:24:05 +0100
diff --git a/debian/control b/debian/control
index 882207a..7b6a802 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,47 @@
 Source: rbot
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~)
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~),
+ rake, libgettext-ruby1.8, libgettext-ruby1.9.1
+Build-Depends-Indep: xsltproc, docbook-xml, docbook-xsl, graphviz
 Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/rbot.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/rbot.git;a=summary
-Homepage: http://ruby-rbot.org
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/rbot.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/rbot.git;a=summary
+Homepage: http://ruby-rbot.org/
 XS-Ruby-Versions: all
 
 Package: rbot
-Architecture: any
+Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Description: A modular ruby IRC bot.
- A modular ruby IRC bot specifically designed for ease of extension via plugins.
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-bdb, ruby-tokyocabinet
+Recommends: ruby-gettext | libgettext-ruby1.8 | libgettext-ruby1.9.1, ruby-hpricot
+Suggests: host, aspell, bsdmainutils, fortune-mod | fortune, toilet, libwww-mechanize-ruby1.8 | libwww-mechanize-ruby1.9.1, ruby-json
+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,
+ 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.
+
+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.
+
diff --git a/debian/copyright b/debian/copyright
index 2beb1d2..8612e01 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,14 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://anonscm.debian.org/loggerhead/dep/dep5/trunk/annotate/179/dep5/copyright-format.xml
 Upstream-Name: rbot
-Source: FIXME <http://example.com/>
+Source: http://rubygems.org/gems/rbot
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
+Copyright: 2002-2007 Tom Gilbert <tom at linuxbrit.co.uk>
+           2007-2010 Giuseppe Bilotta and the rbot development team
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
  .
  This program is distributed in the hope that it will be
  useful, but WITHOUT ANY WARRANTY; without even the implied
@@ -28,6 +26,25 @@ License: GPL-2+ (FIXME)
  `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
-Copyright: 2012 Marc Dequènes (Duck) <Duck at DuckCorp.org>
-License:
- [LICENSE TEXT]
+Copyright: 2004-2012 Marc Dequènes (Duck) <Duck at DuckCorp.org>
+License: GPL-3+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 3 of the License, or (at your
+ option) any later version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
diff --git a/debian/patches/buildsys_no_rubygems b/debian/patches/buildsys_no_rubygems
new file mode 100644
index 0000000..90281a7
--- /dev/null
+++ b/debian/patches/buildsys_no_rubygems
@@ -0,0 +1,29 @@
+Index: rbot-0.9.15+post20100705+gitb3aa806/Rakefile
+===================================================================
+--- rbot-0.9.15+post20100705+gitb3aa806.orig/Rakefile	2010-07-05 11:56:33.000000000 +0200
++++ rbot-0.9.15+post20100705+gitb3aa806/Rakefile	2010-07-11 13:05:06.000000000 +0200
+@@ -1,5 +1,4 @@
+ require 'rake'
+-require 'rake/gempackagetask'
+ 
+ task :default => [:buildext]
+ 
+@@ -9,18 +8,6 @@
+ 
+ task :manpages => ['man/rbot.1', 'man/rbot-remote.1']
+ 
+-SPECFILE = 'rbot.gemspec'
+-# The Rakefile is also used after installing the gem, to build
+-# the .mo files. Since in this case the SPECFILE is not available,
+-# we must (and can) skip defining the gem packaging tasks.
+-if File.exist? SPECFILE
+-  spec = eval(File.read(SPECFILE), nil, SPECFILE)
+-  Rake::GemPackageTask.new(spec) do |pkg|
+-    pkg.need_zip = true
+-    pkg.need_tar = true
+-  end
+-end
+-
+ # normalize a po/pot file
+ def normalize_po(fn)
+   content = File.read(fn)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a2e2be3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+buildsys_no_rubygems
+spell_module_use_aspell_not_ispell
diff --git a/debian/patches/spell_module_use_aspell_not_ispell b/debian/patches/spell_module_use_aspell_not_ispell
new file mode 100644
index 0000000..475d7a5
--- /dev/null
+++ b/debian/patches/spell_module_use_aspell_not_ispell
@@ -0,0 +1,13 @@
+Index: rbot-0.9.14/data/rbot/plugins/spell.rb
+===================================================================
+--- rbot-0.9.14.orig/data/rbot/plugins/spell.rb	2008-10-04 11:30:19.000000000 +0200
++++ rbot-0.9.14/data/rbot/plugins/spell.rb	2009-04-01 23:09:49.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ class SpellPlugin < Plugin
+   Config.register Config::StringValue.new('spell.path',
+-     :default => 'ispell',
++     :default => 'aspell',
+      :desc => _('Path to the program to use to check spelling'))
+   Config.register Config::StringValue.new('spell.command_line',
+      :default => '%s -a -S',
diff --git a/debian/rbot-doc.doc-base b/debian/rbot-doc.doc-base
new file mode 100644
index 0000000..74bb001
--- /dev/null
+++ b/debian/rbot-doc.doc-base
@@ -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/*
+
diff --git a/debian/rbot-doc.docs b/debian/rbot-doc.docs
new file mode 100644
index 0000000..9519006
--- /dev/null
+++ b/debian/rbot-doc.docs
@@ -0,0 +1,4 @@
+README.rdoc
+AUTHORS
+TODO
+build-doc/rdoc
diff --git a/debian/rbot.docs b/debian/rbot.docs
deleted file mode 100644
index d0ab95f..0000000
--- a/debian/rbot.docs
+++ /dev/null
@@ -1 +0,0 @@
-# FIXME: READMEs found
diff --git a/debian/rbot.install b/debian/rbot.install
index 5af27b6..303bf11 100644
--- a/debian/rbot.install
+++ b/debian/rbot.install
@@ -1,3 +1 @@
-# FIXME: data/ dir found in source. Consider installing it somewhere.
-# Examples:
-# data/* /usr/share/rbot/
+data/rbot/* usr/share/rbot/
diff --git a/debian/rbot.manpages b/debian/rbot.manpages
new file mode 100644
index 0000000..bf519d7
--- /dev/null
+++ b/debian/rbot.manpages
@@ -0,0 +1 @@
+man/*.1
diff --git a/debian/rules b/debian/rules
index a5e7dc8..07963d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,5 +11,34 @@
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
 
+DISABLED_PLUGINS = shortenurls dictclient
+
+
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_build:
+	dh_auto_build
+	rake makemo
+	rake manpages
+	rdoc --all --inline-source --diagram --fileboxes --line-numbers --fmt=html \
+		-o build-doc/rdoc lib
+
+override_dh_install:
+	dh_install
+	# disabled plugins
+	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
+	# a few plugins have wrong permissions
+	chmod a-x debian/rbot/usr/share/rbot/plugins/*.rb
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build-doc
+	# dirty buildsys
+	rm -rf data/locale
+	rm -f man/*.1
+	rm -f lib/rbot/pkgconfig.rb
+

-- 
rbot.git



More information about the Pkg-ruby-extras-commits mailing list