diff -Nru kgb-bot-1.57/Changes kgb-bot-1.58/Changes
--- kgb-bot-1.57/Changes	2020-07-24 12:33:41.000000000 +0000
+++ kgb-bot-1.58/Changes	2020-11-03 17:18:40.000000000 +0000
@@ -1,3 +1,6 @@
+1.58 (2020-11-03)
+  * fix tests to not hard-code merge commit messages
+
 1.57 (2020-07-24)
   * Update tests to changed output in merge messages for Git 2.28.0+.
     Thanks to Jonathan Nieder for the bug report. (Closes: #965350)
diff -Nru kgb-bot-1.57/debian/changelog kgb-bot-1.58/debian/changelog
--- kgb-bot-1.57/debian/changelog	2020-07-24 12:32:20.000000000 +0000
+++ kgb-bot-1.58/debian/changelog	2020-11-03 17:13:20.000000000 +0000
@@ -1,3 +1,13 @@
+kgb-bot (1.58-1) unstable; urgency=medium
+
+  * fix tests to not hard-code merge commit messages
+    hard-coded merge commit texts, which depend on the git version, which is
+    unreliable
+    Closes: #973118 -- FTBFS: test failures
+  * drop StandardError=syslog from kgb-bot.service
+
+ -- Damyan Ivanov <dmn@debian.org>  Tue, 03 Nov 2020 17:13:20 +0000
+
 kgb-bot (1.57-1) unstable; urgency=medium
 
   * Update tests to changed output in merge messages for Git 2.28.0+.
diff -Nru kgb-bot-1.57/debian/kgb-bot.service kgb-bot-1.58/debian/kgb-bot.service
--- kgb-bot-1.57/debian/kgb-bot.service	2020-07-24 12:32:20.000000000 +0000
+++ kgb-bot-1.58/debian/kgb-bot.service	2020-11-03 17:13:20.000000000 +0000
@@ -16,7 +16,6 @@
 ExecStart=/usr/sbin/kgb-bot --config /etc/kgb-bot/kgb.conf
 ExecReload=/bin/kill -HUP $MAINPID
 RuntimeDirectory=kgb-bot
-StandardError=syslog
 
 [Install]
 WantedBy=multi-user.target
diff -Nru kgb-bot-1.57/lib/App/KGB.pm kgb-bot-1.58/lib/App/KGB.pm
--- kgb-bot-1.57/lib/App/KGB.pm	2020-07-24 12:33:41.000000000 +0000
+++ kgb-bot-1.58/lib/App/KGB.pm	2020-11-03 17:18:40.000000000 +0000
@@ -31,7 +31,7 @@
 
 =cut
 
-our $VERSION = '1.57';
+our $VERSION = '1.58';
 
 =head1 DESCRIPTION
 
diff -Nru kgb-bot-1.57/META.json kgb-bot-1.58/META.json
--- kgb-bot-1.57/META.json	2020-07-24 12:33:41.000000000 +0000
+++ kgb-bot-1.58/META.json	2020-11-03 17:18:40.000000000 +0000
@@ -82,6 +82,6 @@
          "http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt"
       ]
    },
-   "version" : "1.57",
-   "x_serialization_backend" : "JSON::PP version 4.02"
+   "version" : "1.58",
+   "x_serialization_backend" : "JSON::PP version 4.05"
 }
diff -Nru kgb-bot-1.57/META.yml kgb-bot-1.58/META.yml
--- kgb-bot-1.57/META.yml	2020-07-24 12:33:41.000000000 +0000
+++ kgb-bot-1.58/META.yml	2020-11-03 17:18:40.000000000 +0000
@@ -61,5 +61,5 @@
   perl: '5.010'
 resources:
   license: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-version: '1.57'
+version: '1.58'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff -Nru kgb-bot-1.57/t/52-client-git.t kgb-bot-1.58/t/52-client-git.t
--- kgb-bot-1.57/t/52-client-git.t	2020-07-24 12:33:41.000000000 +0000
+++ kgb-bot-1.58/t/52-client-git.t	2020-11-03 17:18:40.000000000 +0000
@@ -386,16 +386,11 @@
 } else {
     $ign = $git->command( 'merge', 'allnew' );
 }
+my $mergemsg = $git->command_oneline('log', '-1', '--format=format:%s');
 push_ok();
 $c2 = $commit = $c->describe_commit;
 ok( defined($commit), 'empty branch merge commit exists' );
 is( $commit->branch, 'master' );
-my $mergemsg;
-if ( $major > 2 or $major == 2 and $minor >= 28 ) {  # 2.28.0+
-    $mergemsg = "Merge branch 'allnew' into master";
-} else {
-    $mergemsg = "Merge branch 'allnew'";
-}
 is( $commit->log, $mergemsg );
 
 TestBot->expect( 'dummy/#test 12test/03there 05master '
diff -Nru kgb-bot-1.57/t/58-client-git-unicode.t kgb-bot-1.58/t/58-client-git-unicode.t
--- kgb-bot-1.57/t/58-client-git-unicode.t	2020-07-24 12:33:41.000000000 +0000
+++ kgb-bot-1.58/t/58-client-git-unicode.t	2020-11-03 17:18:40.000000000 +0000
@@ -391,12 +391,7 @@
 $c2 = $commit = $c->describe_commit;
 ok( defined($commit), 'empty branch merge commit exists' );
 is( $commit->branch, 'master' );
-my $mergemsg;
-if ( $major > 2 or $major == 2 and $minor >= 28 ) {  # 2.28.0+
-    $mergemsg = "Merge branch 'allnew' into master";
-} else {
-    $mergemsg = "Merge branch 'allnew'";
-}
+my $mergemsg = $git->command_oneline('log', '-1', '--format=format:%s');
 is( $commit->log, $mergemsg );
 
 TestBot->expect( 'dummy/#test 12test/03€ 05master '
diff -Nru kgb-bot-1.57/t/TestBot.pm kgb-bot-1.58/t/TestBot.pm
--- kgb-bot-1.57/t/TestBot.pm	2020-07-24 12:33:41.000000000 +0000
+++ kgb-bot-1.58/t/TestBot.pm	2020-11-03 17:18:40.000000000 +0000
@@ -106,8 +106,8 @@
 
     my $t_dir = File::Spec->catdir(getcwd, 't');
     my $dirs = $ENV{PERL5LIB};
-    if ($dir) { $dirs .= ":$t_dir" }
-    else      { $dirs = $t_dir }
+    if ($dirs) { $dirs .= ":$t_dir" }
+    else       { $dirs = $t_dir }
     $ENV{PERL5LIB} = $dirs;
 
     system( $bot_script,