Hi, Please allow the attached diff in kgb-bot to stable. There are two changes:
1. Fix the regular expression used in debian/rules for checking
whether the package version matches the "upstream" version. We are
also upstream of the software and the check is there to ensure we
increase the version synchronously.
The check in 1.05-1 doesn't work if the revision part has any
non-digits. It works in normal circumstances, but fails (before
this change) for versions like 1.05-1+squeeze1. The package is an
IRC bot, so security updates aren't totally impossible and they
would break due to this check.
2. I use the opportunity to "slip in" another change that addresses
another, non-critical part of the package. Without it, an
interesting and useful functionality doesn't work -- automatic
replies using polygen. The diff is minimal (2 lines), so I hope it
passes your threshold.
Thanks for your time!
diff --git a/debian/changelog b/debian/changelog
index 810efc8..198ede0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+kgb-bot (1.05-1+squeeze1) stable; urgency=low
+
+ [ gregor herrmann ]
+ * kgb-bot:
+ - fix typo when accessing global config
+ - call polygen_available with full class name
+
+ [ Damyan Ivanov ]
+ * rules: fix the check whether package version matches "upstream" code
+ version. Avoids FTBFS when the package revisiion contains non-digits (e.g.
+ stable/security updates). Thanks to Moritz Muehlenhoff. Closes: #612922
+
+
+ -- Damyan Ivanov <d...@debian.org> Sun, 13 Feb 2011 14:51:34 +0200
+
kgb-bot (1.05-1) unstable; urgency=low
[ gregor herrmann, Damyan Ivanov ]
diff --git a/debian/rules b/debian/rules
index 2576363..a88fcc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
override_dh_compress:
dh_compress -Xexamples
-PKG_VER := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/^Version: \(.\+\)-[0-9]\+$$/\1/')
+PKG_VER := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/^Version: \(.\+\)-[^-]\+$$/\1/')
MOD_VER := $(shell perl -Ilib -MApp::KGB -e'print $$App::KGB::VERSION')
override_dh_auto_test:
LANG=bg_BG.utf8 LC_ALL=bg_BG.utf8 dh_auto_test
diff --git a/script/kgb-bot b/script/kgb-bot
index 92b3aa2..c340706 100755
--- a/script/kgb-bot
+++ b/script/kgb-bot
@@ -893,7 +893,7 @@ sub irc_001 {
sub get_polygen_joke {
my ( $out, $err );
- my $polygen = polygen_available();
+ my $polygen = KGB::polygen_available();
return undef unless $polygen;
my $grammar = 'manager';
@@ -930,7 +930,7 @@ sub get_smart_answer {
if $smart_answers;
# Global config
- if ( $KGB::Config->{smart_answers_polygen} ) {
+ if ( $KGB::config->{smart_answers_polygen} ) {
my $polygen_joke = get_polygen_joke;
return $polygen_joke if $polygen_joke;
signature.asc
Description: Digital signature
