--- a/debian/changelog Sun Jan 01 22:42:03 2006 +0000
+++ b/debian/changelog Tue Aug 01 08:06:36 2006 +0000
@@ -1,3 +1,9 @@
+logbuch (0.16-1) stable; urgency=low
+
+ * new upstream for stable
+
+ -- Heiko Schlittermann <hs@schlittermann.de> Tue, 01 Aug 2006 09:36:13 +0200
+
logbuch (0.15-1) unstable; urgency=low
* new upstream
--- a/log.pl Sun Jan 01 22:42:03 2006 +0000
+++ b/log.pl Tue Aug 01 08:06:36 2006 +0000
@@ -20,6 +20,7 @@
use Getopt::Long;
use Mail::Mailer;
use DBI;
+use MIME::QuotedPrint;
use lib "/etc/logbuch";
use config;
@@ -51,6 +52,7 @@
my $opt_db = 1;
my $opt_mail = 1;
my $opt_message = "";
+my $opt_apt = "";
@@ -64,14 +66,21 @@
GetOptions("db!" => \$opt_db,
"mail!" => \$opt_mail,
- "message=s" => \$opt_message)
- or die eval "\"$USAGE\"";
+ "message=s" => \$opt_message,
+ "type=s" => \$opt_apt,
+ ) or die eval "\"$USAGE\"";
if ($opt_message =~ /^\.?\// and -f $opt_message) {
@ARGV = ($opt_message);
$opt_message = join "", <>;
} elsif ($opt_message eq "-") {
$opt_message = join "", <STDIN>;
+ } elsif ($opt_message =~ /^((?:dist-)?upgrade):(.*)/) {
+ open(I, $2) or die "Can't open $2: $!\n";
+ $opt_message = "$1\n"
+ . join "", grep /^(?:Inst|Conf|Remv)/, <I>;
+
+ die $opt_message;
}
if ($opt_message =~ /\n/) {
@@ -157,7 +166,7 @@
my $subject = (split /\n/, $text)[0];
$subject =~ s/^\s*\S\s//;
- $subject = "Service [". hostname(). "]: $subject";
+ $subject = encode_qp("Service [". hostname(). "]: $subject");
$mailer->open({
"To" => $mailto,