--- manderlbot-0.9.2.orig/debian/changelog +++ manderlbot-0.9.2/debian/changelog @@ -0,0 +1,195 @@ +manderlbot (0.9.2-17) unstable; urgency=low + + * New maintainer's email address pkg-erlang-devel@lists.alioth.debian.org + mailing list. + * Fixed two small bugs in bloto and fortune behaviors. + * Use ${erlang:Depends} subst variable which expands into automatically + calculated dependencies by erlang-depends. + * Added debian/README.source file with a reference to + /usr/share/doc/quilt/README.source. + * Bumped standards version to 3.8.3. + + -- Sergei Golovan Fri, 02 Oct 2009 00:29:28 +0400 + +manderlbot (0.9.2-16) unstable; urgency=low + + * Removed Torsten Werner from the uploaders list as per his request. + * Loosened runtime dependencies to erlang-inets and erlang-xmerl to match + new Erlang packages structure. + * Added cm-super to build-dependencies to use Type1 fonts in PDF + documentation. + * Fixed page size in PDF documentation to fit paper size. + * Removed documentation in intermediate LaTeX format from the binary + package. + * Bumped standards version to 3.8.2. + + -- Sergei Golovan Mon, 29 Jun 2009 10:19:31 +0400 + +manderlbot (0.9.2-15) unstable; urgency=low + + * Protected quilt calls in debian/rules to make the source package + convertible to 3.0 (quilt) format (closes: #484911). + * Fixed default config file (removed extra spaces from its elements + character data). + * Removed obsolete guards and switched to re from regexp module. + * Added build-dependency on erlang-dev (>= 1:13.b) to make transition to + Erlang R13B easier. + * Bumped standards version to 3.8.1. + + -- Sergei Golovan Fri, 01 May 2009 20:37:44 +0400 + +manderlbot (0.9.2-14) unstable; urgency=low + + * Changed startup procedure to make manderlbot starting after erlang + upgrade. + * Fixed manderlbot synopsis in manpage. + + -- Sergei Golovan Tue, 03 Feb 2009 19:33:14 +0300 + +manderlbot (0.9.2-13) unstable; urgency=low + + * Fixed FTBFS in case when a build directory doesn't follow pattern + manderlbot- (closes: #483347). + + -- Sergei Golovan Wed, 28 May 2008 15:43:44 +0400 + +manderlbot (0.9.2-12) unstable; urgency=low + + * Fixed clean target to work with debhelper 7.0 (made dh_clean the last + command, so debhelper logs are removed now). + * Bumped standards version to 3.7.3. + * Clarified copyright notice. + + -- Sergei Golovan Sun, 18 May 2008 12:10:15 +0400 + +manderlbot (0.9.2-11) unstable; urgency=low + + * Adapted manual page source to new more strict docbook2man (closes: #450458). + + -- Sergei Golovan Wed, 07 Nov 2007 22:12:56 +0300 + +manderlbot (0.9.2-10) unstable; urgency=low + + * Added Sergei Golovan to uploaders list. + * Rewritten clean target in debian/rules to ignore only missing Makefile + error. + * Made clean-patched target in debian/rules depend on patch-stamp. + * Bumped debhelper compatibility level to 5. + + -- Sergei Golovan Thu, 06 Sep 2007 19:25:24 +0400 + +manderlbot (0.9.2-9) unstable; urgency=low + + * Upload to unstable. + + -- Torsten Werner Thu, 17 May 2007 20:36:50 +0400 + +manderlbot (0.9.2-8) experimental; urgency=low + + [ Torsten Werner ] + * Remove already fulfilled (ake redundant) Build-Depends. + * Switched to erlang-depends. + * Switch to texlive instead of tetex. + + [ Sergei Golovan ] + * Fixed clean target in debian/rules. (Closes: #424565) + * Applied quilt for patch management. + + -- Torsten Werner Wed, 16 May 2007 21:18:37 +0200 + +manderlbot (0.9.2-7) unstable; urgency=low + + [ Sergei Golovan ] + * Removed sources from resulting package. If someone wants to get + the sources, they are available via apt-get source. + + -- Erlang Packagers Tue, 19 Sep 2006 19:02:36 +0400 + +manderlbot (0.9.2-6) unstable; urgency=low + + [ Sergei Golovan ] + * Added versioned dependency on erlang. + * Added workaround for FTBFS caused by lyx bug #381622 + (Closes: #381934). + + -- Erlang Packagers Wed, 09 Aug 2006 11:42:10 +0400 + +manderlbot (0.9.2-5) unstable; urgency=low + + [ Sergei Golovan ] + * Moved dependencies which are used only for architecture + independent build part from Build-Depends to Build-Depends-Indep + in debian/control file. + + -- Erlang Packagers Tue, 04 Jul 2006 15:27:01 +0400 + +manderlbot (0.9.2-4) unstable; urgency=low + + * New maintainers (Closes: #342918). + + [ Sergei Golovan ] + * Changed Build-Depends to erlang 1:10.b.10 package structure. + * Build using xmerl included into erlang distribution. Therefore + removed libxmerl-erlang dependency (Closes: #337419). + * Removed latin1 characters from default config file. Otherwise + xmerl_scan:file throws an error about invalid UTF-8 symbols. + So, config should be in UTF-8 encoding (or encoding should be + specified explicitly). + * Removed useless xmerl headers from binary package. + * Removed Postscript doc (leaving PDF). + * Closes: #340040 since lyx is in Build-Depends. + * Incorporated changes made in NMU bug (Closes: #242043). + * Bumped standards version to 3.7.2. + + [ Torsten Werner ] + * fixed 3 lintian errors (Build-Depends, targets in debian/rules and + debian/compat) + + -- Torsten Werner Sat, 24 Jun 2006 22:50:19 +0200 + +manderlbot (0.9.2-3.1) unstable; urgency=low + + * NMU + * run erl with -noshell during build (Closes: #242043) + + -- Goswin von Brederlow Sun, 18 Apr 2004 23:19:31 +0200 + +manderlbot (0.9.2-3) unstable; urgency=low + + * No need of gs-common + + -- Julien Danjou Sun, 29 Feb 2004 15:28:31 +0100 + +manderlbot (0.9.2-2) unstable; urgency=low + + * Added a dep against tetex-bin and gs-common (Closes: #232980) + * Added ps and pdf doc + + -- Julien Danjou Sun, 29 Feb 2004 15:25:17 +0100 + +manderlbot (0.9.2-1) unstable; urgency=low + + * New upstream release + + -- Julien Danjou Fri, 12 Dec 2003 14:39:54 +0100 + +manderlbot (0.9.1-1) unstable; urgency=low + + * New upstream release + + -- Julien Danjou Tue, 26 Aug 2003 16:48:40 +0200 + +manderlbot (0.9.0-1) unstable; urgency=low + + * New upstream release + * License is now GPL with exception (Closes: #193571) + * FTBFS fixed (Closes: #191897) + + -- Julien Danjou Fri, 22 Aug 2003 11:35:01 +0200 + +manderlbot (0.8.2-1) unstable; urgency=low + + * Initial Release. (Closes: #178047) + + -- Julien Danjou Thu, 23 Jan 2003 16:14:07 +0100 + --- manderlbot-0.9.2.orig/debian/rules +++ manderlbot-0.9.2/debian/rules @@ -0,0 +1,107 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export QUILT_PATCHES := debian/patches + +unpatch: patch-stamp + dh_testdir + quilt pop -a || test $$? = 2 + rm -rf .pc + rm -f patch-stamp + +patch: patch-stamp +patch-stamp: + dh_testdir + quilt push -a || test $$? = 2 + touch patch-stamp + + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + # Workaround for lyx bug #381622 + if [ ! -f /usr/share/lyx/textclass.lst ] ; then \ + HOME=$(CURDIR)/debian ; \ + export HOME ; \ + (mkdir ~/.lyx && cd ~/.lyx && /usr/share/lyx/configure.py) ; \ + $(MAKE) doc ; \ + else \ + $(MAKE) doc ; \ + fi + + touch build-stamp + +clean: clean-patched unpatch + dh_testdir + dh_testroot + dh_clean + +clean-patched: patch-stamp + dh_testdir + dh_testroot + rm -rf $(CURDIR)/debian/.lyx + rm -rf $(CURDIR)/debian/.texmf-var + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) clean + + rm -f install-stamp build-stamp configure-stamp + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + #dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/manderlbot. + make install DESTDIR=$(CURDIR)/debian/manderlbot/ + + # Remove sources + rm -rf $(CURDIR)/debian/manderlbot/usr/lib/erlang/lib/manderlbot-*/src + + # Remove xmerl headers + rm -f $(CURDIR)/debian/manderlbot/usr/lib/erlang/lib/manderlbot-*/include/xmerl*.hrl + +binary-arch: + +# Build architecture-independent files here. +binary-indep: build-stamp install-stamp +# We have nothing to do by default. + dh_testdir + dh_testroot + dh_installdocs + dh_installchangelogs + dh_link + dh_strip + dh_compress -X.pdf + dh_fixperms +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + erlang-depends + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-arch binary-indep + +.PHONY: unpatch patch clean-patched build clean binary binary-arch binary-indep install configure + --- manderlbot-0.9.2.orig/debian/copyright +++ manderlbot-0.9.2/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Julien Danjou on +Thu, 23 Jan 2003 14:36:48 +0100. + +It was downloaded from http://manderlbot.tuxfamily.org + +Upstream Author: Dimitri Fontaine + +Copyright: + + Copyright 2002-2004 Dimitri Fontaine + + Manderlbot 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. + + Manderlbot 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. + + See /usr/share/common-licenses/GPL + + In addition, as a special exception, you have the permission to + link the code of this program with any library released under + the EPL license and distribute linked combinations including + the two. If you modify this file, you may extend this exception + to your version of the file, but you are not obligated to do + so. If you do not wish to do so, delete this exception + statement from your version. + --- manderlbot-0.9.2.orig/debian/docs +++ manderlbot-0.9.2/debian/docs @@ -0,0 +1,2 @@ +README +doc/manderlbot.pdf --- manderlbot-0.9.2.orig/debian/compat +++ manderlbot-0.9.2/debian/compat @@ -0,0 +1 @@ +5 --- manderlbot-0.9.2.orig/debian/control +++ manderlbot-0.9.2/debian/control @@ -0,0 +1,20 @@ +Source: manderlbot +Section: net +Priority: optional +Maintainer: Debian Erlang Packagers +Uploaders: Sergei Golovan +Build-Depends: debhelper (>= 5.0.0), quilt +Build-Depends-Indep: erlang-dev (>= 1:13.b.1-dfsg-3), lyx, docbook, docbook-utils, hevea, cm-super +Standards-Version: 3.8.3 + +Package: manderlbot +Architecture: all +Depends: ${erlang:Depends} +Description: An IRC bot, written in Erlang + Manderlbot is an IRC bot with XML configuration file, allowing you to launch + it on several servers and channels at once, each channel will have its own + set of behaviours. + . + Behaviours are generics, and you can easily make your own set. If you want + some not-already-implemented generic behaviour, you'll have to code some + Erlang. --- manderlbot-0.9.2.orig/debian/README.source +++ manderlbot-0.9.2/debian/README.source @@ -0,0 +1,8 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get detailed instructions on how to apply the series of patches +and modify them, please read /usr/share/doc/quilt/README.source + + -- Sergei Golovan Wed, 30 Sep 2009 14:53:10 +0400 --- manderlbot-0.9.2.orig/debian/manderlbot.dirs +++ manderlbot-0.9.2/debian/manderlbot.dirs @@ -0,0 +1,3 @@ +etc/ +usr/bin +usr/lib/erlang/lib --- manderlbot-0.9.2.orig/debian/patches/run.diff +++ manderlbot-0.9.2/debian/patches/run.diff @@ -0,0 +1,32 @@ +Patch by Sergei Golovan bypasses boot script when starting manderlbot. +Using boot script without rebuilding manderlbot becomes impossible when +Erlang is upgraded. + +--- manderlbot-0.9.2.orig/manderlbot.sh.in ++++ manderlbot-0.9.2/manderlbot.sh.in +@@ -18,9 +18,8 @@ + } + + start() { +- echo "erl -sname manderlbot $RUN_OPTIONS -boot $BOOT_SCRIPT $CONF_OPT $LOG_OPT \ +- $LOG_LEVEL_OPT" +- erl -sname manderlbot $RUN_OPTIONS -boot $BOOT_SCRIPT $CONF_OPT $LOG_OPT \ ++ echo "erl -sname manderlbot $RUN_OPTIONS -s manderlbot $CONF_OPT $LOG_OPT $LOG_LEVEL_OPT" ++ erl -sname manderlbot $RUN_OPTIONS -s manderlbot $CONF_OPT $LOG_OPT \ + $LOG_LEVEL_OPT + } + +--- manderlbot-0.9.2.orig/src/manderlbot.erl ++++ manderlbot-0.9.2/src/manderlbot.erl +@@ -38,7 +38,10 @@ + -behaviour(application). + + %% application callbacks +--export([start/2, stop/1]). ++-export([start/0, start/2, stop/1]). ++ ++start() -> ++ application:start(manderlbot,permanent). + + %%%---------------------------------------------------------------------- + %%% Callback functions from application --- manderlbot-0.9.2.orig/debian/patches/manpage.diff +++ manderlbot-0.9.2/debian/patches/manpage.diff @@ -0,0 +1,73 @@ + +--- manderlbot-0.9.2.orig/doc/manderlbot.1.sgml ++++ manderlbot-0.9.2/doc/manderlbot.1.sgml +@@ -1,4 +1,4 @@ +- ++ + + +
+@@ -8,7 +8,7 @@ + Dimitri + Fontaine + +- Décembre 2003 ++ Décembre 2003 + + 2003 + Dimitri Fontaine +@@ -33,6 +33,7 @@ + configuration file + log file + log level ++ + + + +@@ -49,6 +50,7 @@ + /etc/manderlbot/config.xml. It can includes + some fortune files, wich you can provide in the same directory. + ++ + + + options +@@ -69,9 +71,6 @@ + + + specifies the log_level from wich you want manderlbot to log in the log_file. You can specify one of the following entries : +- +- +- + + + +@@ -80,8 +79,7 @@ + + + +- +- ++ + + + +@@ -99,6 +97,7 @@ + manderlbot was writen by Dimitri Fontaine + dim@tuxfamily.org and Nicolas Niclausse + nico@niclux.org. ++ + + + +--- manderlbot-0.9.2.orig/doc/Makefile ++++ manderlbot-0.9.2/doc/Makefile +@@ -6,7 +6,7 @@ + all: man $(DOCUMENT).tex $(DOCUMENT).html $(DOCUMENT).ps $(DOCUMENT).pdf + + man: $(MANPAGE) +- docbook2man $< >/dev/null 2>&1 ++ docbook2man $< + + %.ps:%.lyx + lyx -e ps $< --- manderlbot-0.9.2.orig/debian/patches/doc.diff +++ manderlbot-0.9.2/debian/patches/doc.diff @@ -0,0 +1,13 @@ +Patch fixes page size in PDF documentation. + +--- manderlbot-0.9.2.orig/doc/manderlbot.lyx ++++ manderlbot-0.9.2/doc/manderlbot.lyx +@@ -9,7 +9,7 @@ + \paperfontsize default + \spacing onehalf + \papersize a4paper +-\paperpackage a4wide ++#\paperpackage a4wide + \use_geometry 0 + \use_amsmath 0 + \use_natbib 0 --- manderlbot-0.9.2.orig/debian/patches/config.diff +++ manderlbot-0.9.2/debian/patches/config.diff @@ -0,0 +1,119 @@ +Index: manderlbot/conf/config.xml +===================================================================== +--- manderlbot.orig/conf/config.xml ++++ manderlbot/conf/config.xml +@@ -1,77 +1,45 @@ + +- +- ++ + +- +- +- +- +- +- +- +- rejoin +- +- +- +- /etc/manderlbot/config.xml +- +- +- +- Hello world +- +- +- +- mute +- +- +- +- debian_pkg +- +- +- +- debian_file +- +- +- +- +- pyramid +- +- +- +- google +- +- +- +- wn +- +- +- +- jargon +- +- +- +- poh +- +- +- +- plic plic plic +- +- +- +-%R.T.F.M. ++ ++ ++ ++ ++ ++ ++ rejoin ++ ++ /etc/manderlbot/config.xml ++ ++ Hello world ++ ++ mute ++ ++ debian_pkg ++ ++ debian_file ++ ++ pyramid ++ ++ google ++ ++ wn ++ ++ jargon ++ ++ poh ++ ++ plic plic plic ++ ++ %R.T.F.M. + %I do not like newbies + %http://www.tuxedo.org/~esr/faqs/smart-questions.html + %http://www.gnurou.org/documents/smart-questions-fr.html + %http://michel.arboi.free.fr/humeur/nioubis.html +-%http://www.readthefuckingmanual.com +- ++%http://www.readthefuckingmanual.com + +- +- /etc/manderlbot/bofh.fortune +- +- ++ /etc/manderlbot/bofh.fortune ++ + --- manderlbot-0.9.2.orig/debian/patches/build.diff +++ manderlbot-0.9.2/debian/patches/build.diff @@ -0,0 +1,22 @@ +Index: manderlbot/Makefile +===================================================================== +--- manderlbot.orig/Makefile ++++ manderlbot/Makefile +@@ -34,7 +34,7 @@ + SCRIPT = $(BINDIR)/manderlbot + BUILD_OPTIONS = '[{systools, [{variables,[{"ROOT","$(RAW_INSTALL_DIR)"}]}]}, \ + {sh_script, none}, {report, verbose}, {app_vsn, "$(VERSION)"}, \ +- {make_app, true }, {make_rel, true}].' ++ {app_dir, "$(shell pwd)/temp/$(APPLICATION)-$(VERSION)"}, {make_app, true}, {make_rel, true}].' + BUILD_OPTIONS_FILE = ./BUILD_OPTIONS + + .PHONY: doc +@@ -92,7 +92,7 @@ + ln -sf `pwd` temp/$(APPLICATION)-$(VERSION) + (cd temp/$(APPLICATION)-$(VERSION) \ + && echo $(BUILD_OPTIONS) > $(BUILD_OPTIONS_FILE) \ +- && erl -s builder go -s init stop \ ++ && erl -noshell -s builder go -s init stop \ + ) + rm -rf temp + --- manderlbot-0.9.2.orig/debian/patches/xmerl.diff +++ manderlbot-0.9.2/debian/patches/xmerl.diff @@ -0,0 +1,30 @@ +Index: manderlbot/src/config.erl +===================================================================== +--- manderlbot.orig/src/config.erl ++++ manderlbot/src/config.erl +@@ -33,7 +33,7 @@ + -author('dim@tuxfamily.org'). + + -include("config.hrl"). +--include("xmerl.hrl"). ++-include_lib("xmerl/include/xmerl.hrl"). + -include("log.hrl"). + + -define(default_passwd, "h4ckd4w0rld"). +@@ -46,12 +46,13 @@ + %%% Purpose: read the xml config file + %%%---------------------------------------------------------------------- + read(Filename) -> +- case xmerl_scan:file(Filename) of +- {ok, Root = #xmlElement{}} -> ++ case catch xmerl_scan:file(Filename) of ++ {Root = #xmlElement{}, _Rest} -> + mdb_logger:debug("root: ~p~n~p~n", [Root#xmlElement.name, + Root#xmlElement.content]), + {ok, parse(Root, #config{})}; +- ++ {'EXIT', Error} -> ++ {error, Error}; + Error -> + {error, Error} + end. --- manderlbot-0.9.2.orig/debian/patches/r13.diff +++ manderlbot-0.9.2/debian/patches/r13.diff @@ -0,0 +1,270 @@ +Patch by Sergei Golovan replaces obsolete function calls and fixes typos. + +--- manderlbot-0.9.2.orig/priv/builder.erl ++++ manderlbot-0.9.2/priv/builder.erl +@@ -103,8 +103,8 @@ + %%%
{path, [PathExpr]}
+ %%%
Specifies the search path when locating applications. Default is + %%% code:get_path(). PathExpr can contain wildcards, e.g. +-%%% "/OTP/lib/kernel*/ebin" (basically anything that +-%%% regexp:sh_to_awk/1 understands.)
++%%% "/OTP/lib/kernel.*/ebin" (basically any regexp ++%%% re:run/2 understands.) + %%% + %%%
{skip, [ModuleName : atom()]}
+ %%%
Lists modules that should not be included in the generated .app +@@ -498,7 +498,7 @@ + get_config_data({file,F}) -> + ?report(debug, "get_config_data({file, ~p})~n", [F]), + case file:consult(F) of +- {ok, [Terms]} when list(Terms) -> ++ {ok, [Terms]} when is_list(Terms) -> + Terms; + {error, Reason} -> + exit({config, {F, Reason}}) +@@ -506,7 +506,7 @@ + get_config_data({M,F,A}) -> + ?report(debug, "get_config_data(~p)~n", [{M,F,A}]), + apply(M,F,A); +-get_config_data(Data) when list(Data) -> ++get_config_data(Data) when is_list(Data) -> + Data. + + +@@ -895,9 +895,8 @@ + % parse_for_mod(Fd, F). + % {ok,Bin} = file:read_file(F), + % Text = binary_to_list(Bin), +-% {match,Start,Len} = +-% regexp:first_match(Text, +-% "^[ ]*-[ ]*module[ ]*[(][ ]*.*[ ]*[)][ ]*\."), ++% {match,[{Start,Len}]} = ++% re:run(Text, "^[ ]*-[ ]*module[ ]*[(][ ]*.*[ ]*[)][ ]*\."), + % Name = case string:substr(Text, Start+8,Len-10) of + % "'" ++ Quoted -> + % "'" ++ Rest = lists:reverse(Quoted), +@@ -934,8 +933,8 @@ + + + check_f(F, Ext) -> +- case regexp:match(F, ".*"++Ext++"\$") of +- {match, _, _} -> true; ++ case catch re:run(F, ".*"++Ext++"\$") of ++ {match, _} -> true; + _ -> false + end. + +@@ -969,7 +968,7 @@ + App; + ({App,Vsn}) -> + App; +- (App) when atom(App) -> ++ (App) when is_atom(App) -> + App + end, RelApps), + with(Acc0, +@@ -998,7 +997,7 @@ + MyVsn = dict:fetch(app_vsn, Dict), + MyEbin = ebin_dir(Dict), + Info = lists:map( +- fun(A) when atom(A) -> {A,unknown,unknown}; ++ fun(A) when is_atom(A) -> {A,unknown,unknown}; + ({A,V}) -> {A,V,unknown}; + ({A,V,D}) -> {A,V,D} + end, Apps), +@@ -1286,7 +1285,7 @@ + + + d_expand([D|Ds], Cur) -> +- Pat = regexp:sh_to_awk(D), ++ Pat = D, + Cur1 = lists:foldl( + fun(C, Acc) -> + case list_dir(C) of +@@ -1304,10 +1303,10 @@ + Cur. + + matches(Str, Pat) -> +- case regexp:match(Str,Pat) of +- {match,_,_} -> ++ case catch re:run(Str,Pat) of ++ {match, _} -> + true; +- nomatch -> ++ _ -> + false + end. + +@@ -1342,14 +1341,14 @@ + do_apps(Apps, Vss). + + app(D) -> +- case regexp:match(D,".*-[0-9].*") of ++ case re:run(D,".*-[0-9].*") of + nomatch -> false; + _ -> true + end. + do_apps([], Vss) -> []; +-do_apps([App|Apps], Vss) when list(App) -> ++do_apps([App|Apps], Vss) when is_list(App) -> + do_apps([list_to_atom(App)|Apps], Vss); +-do_apps([App|Apps], Vss) when atom(App) -> ++do_apps([App|Apps], Vss) when is_atom(App) -> + [{App, get_vsn(atom_to_list(App), Vss)}|do_apps(Apps, Vss)]. + + +@@ -1383,7 +1382,7 @@ + App = case file:consult(AppF) of + {ok, [{application, _Name, Options}]} -> + app_options(Options); +- {ok, [Options]} when list(Options) -> ++ {ok, [Options]} when is_list(Options) -> + app_options(Options); + {error, enoent} -> + RealAppF = filename:join(ebin_dir(Dict), +@@ -1531,7 +1530,7 @@ + rpt_level(progress) -> 1; + rpt_level(verbose) -> 2; + rpt_level(debug) -> 3; +-rpt_level(N) when integer(N), N >= 0 -> ++rpt_level(N) when is_integer(N), N >= 0 -> + N. + + push_report_level(Level, Dict) -> +--- manderlbot-0.9.2.orig/src/mdb_bhv_pyramid.erl ++++ manderlbot-0.9.2/src/mdb_bhv_pyramid.erl +@@ -103,8 +103,8 @@ + + mdb_logger:info("body: ~p~n", [Input#data.body]), + +- case regexp:match(Input#data.body, "[A-Za-z0-9_]+/[0-9]+") of +- {match, S, L} -> ++ case re:run(Input#data.body, "[A-Za-z0-9_]+/[0-9]+") of ++ {match, [{S, L}]} -> + [Player2, Nguess] = + string:tokens(string:substr(Input#data.body, S, L), "/"), + +--- manderlbot-0.9.2.orig/src/debian.erl ++++ manderlbot-0.9.2/src/debian.erl +@@ -83,8 +83,8 @@ + {continue, URL }; + parse(Data) -> + %% search for files +- case regexp:first_match(Data, "[^\t]+\t+\s+ % ok, found ++ case re:run(Data, "[^\t]+\t+\s+ % ok, found + case httpd_util:split(Data, "(<|>)", 10) of + {ok, [File, URL, Package | _Other ]} -> + {continue, string:left(File, ?margin, $ )++ Package }; +--- manderlbot-0.9.2.orig/src/misc_tools.erl ++++ manderlbot-0.9.2/src/misc_tools.erl +@@ -65,7 +65,7 @@ + %% return : a regexp allowing any combination of uppercase/lowercase + %% for example : DATE gives [Dd][Aa][Tt][Ee] + %% -------------------------------------------------------------------- +-regexpize(Token) when list(Token) -> ++regexpize(Token) when is_list(Token) -> + %% This fonction transform the element "E" for example to + %% "[Ee]" + F = fun(Element) -> +@@ -208,9 +208,8 @@ + + is_matching_regexp(String, Regexp, {True, False}) -> + mdb_logger:debug("is_matching_regexp: ~p ~p~n", [String, Regexp]), +- case regexp:match(misc_tools:downcase(String), ++ case catch re:run(misc_tools:downcase(String), + misc_tools:downcase(Regexp)) of +- {match, _Start, _Length} -> True; +- nomatch -> False; +- {error, Error} -> False ++ {match, _Match} -> True; ++ _ -> False + end. +--- manderlbot-0.9.2.orig/src/mdb_bhv_dict.erl ++++ manderlbot-0.9.2/src/mdb_bhv_dict.erl +@@ -96,8 +96,8 @@ + parse(".\r\n") -> + {continue}; + parse(Data) -> +- case regexp:first_match(Data, "^[0-9][0-9][0-9] ") of +- {match,Start,Length} -> % skip protocol data ++ case re:run(Data, "^[0-9][0-9][0-9] ") of ++ {match, _} -> % skip protocol data + {continue}; + _ -> + {continue, lists:subtract(Data,"\r\n")} +--- manderlbot-0.9.2.orig/src/config.erl ++++ manderlbot-0.9.2/src/config.erl +@@ -107,9 +107,8 @@ + Chan = getAttr(Element#xmlElement.attributes, name), + Bot = getAttr(Element#xmlElement.attributes, botname), + +- {ok, List, _Count} = +- regexp:gsub(getAttr(Element#xmlElement.attributes, behaviours), +- "\s+|\t+|\n+", ","), ++ List = re:replace(getAttr(Element#xmlElement.attributes, behaviours), ++ "\s+|\t+|\n+", ",", [global, {return, list}]), + + B = string:tokens(List, ","), + +--- manderlbot-0.9.2.orig/src/mdb_dispatch.erl ++++ manderlbot-0.9.2/src/mdb_dispatch.erl +@@ -284,9 +284,8 @@ + lists:map(fun(Exp = {regexp, '_'}) -> Exp; + + ({regexp, String}) -> +- {ok, NewString, _C} = +- regexp:sub(String, ?BOTNAME, Botname), +- {regexp, NewString}; ++ {regexp, re:replace(String, ?BOTNAME, Botname, ++ [{return, list}])}; + + (Other) -> + Other +--- manderlbot-0.9.2.orig/src/irc_lib.erl ++++ manderlbot-0.9.2/src/irc_lib.erl +@@ -127,8 +127,8 @@ + + KeepRE = ":" ++ Host ++ " 352", + UserList = lists:filter(fun(Line) -> +- case regexp:match(Line, KeepRE) of +- {match, S, L} -> true; ++ case catch re:run(Line, KeepRE) of ++ {match, _} -> true; + NoMatch -> false + end + end, +@@ -145,8 +145,8 @@ + getData(Sock, Buffer) -> + receive + {tcp, Sock, Data} -> +- case regexp:match(binary_to_list(Data), ":End of /WHO list.") of +- {match, S, L} -> ++ case re:run(Data, ":End of /WHO list.") of ++ {match, _} -> + {ok, Buffer ++ binary_to_list(Data)}; + NoMatch -> + getData(Sock, Buffer ++ binary_to_list(Data)) +--- manderlbot-0.9.2.orig/src/mdb_bhv_bloto.erl ++++ manderlbot-0.9.2/src/mdb_bhv_bloto.erl +@@ -60,7 +60,7 @@ + behaviour(Input, BotName, Data, BotPid, Channel) -> + [NickFrom|IpFrom] = string:tokens(Input#data.header_from, "!"), + +- case bloto:add(NickFrom, Channel) of ++ case add(NickFrom, Channel) of + {winner, Nick} -> + mdb_bot:say(BotPid, Nick ++ " " ++ Data); + +--- manderlbot-0.9.2.orig/src/mdb_bhv_fortune.erl ++++ manderlbot-0.9.2/src/mdb_bhv_fortune.erl +@@ -45,7 +45,7 @@ + + {A, B, C} = now(), + random:seed(A, B, C), +- list:foreach(fun(Message) -> ++ lists:foreach(fun(Message) -> + mdb_bot:say(BotPid, Message, NickFrom) + end, + lists:nth(random:uniform(length(Data)), Data)); --- manderlbot-0.9.2.orig/debian/patches/series +++ manderlbot-0.9.2/debian/patches/series @@ -0,0 +1,7 @@ +build.diff +config.diff +xmerl.diff +manpage.diff +run.diff +r13.diff +doc.diff