# HG changeset patch # User Heiko Schlittermann (JUMPER) # Date 1420453915 -3600 # Node ID 4e18894dec80c9d7b8776b4a2eb021e8d817e8ab # Parent 425d7c20e50902b3a8e77b672e1954b6606aaa2a# Parent 0806cdb507286297dc87bb6b398dc63e272f453a [merged] from older revision diff -r 0806cdb50728 -r 4e18894dec80 .hgtags --- a/.hgtags Thu Jun 26 15:00:32 2014 +0200 +++ b/.hgtags Mon Jan 05 11:31:55 2015 +0100 @@ -10,3 +10,7 @@ b9bb4b9aa49f7952853c1cd9cbcdb4901b1fc8a6 logbuch_0.37 e85db7e2c17e287f99270c266cc055e3d145d158 logbuch_0.38 61a130a2acc5aa98323332310baacaaa6495e9b9 logbuch_0.39 +a01c8ab1d09adf04c65bdece0a8b02e63fb03bd7 logbuch_0.39+nmu1 +d6d83a4258bfbfc934d01591e88f71d83752304b logbuch_0.40 +a264bf29109ad6ac7c729af83249708640c34252 logbuch_0.42 +61e658db97f857067c59b573c9ded1916d580593 logbuch_0.43 diff -r 0806cdb50728 -r 4e18894dec80 config.pm --- a/config.pm Thu Jun 26 15:00:32 2014 +0200 +++ b/config.pm Mon Jan 05 11:31:55 2015 +0100 @@ -8,4 +8,6 @@ # @notify_dirs = qw(/etc); +$db = 1; + 1; diff -r 0806cdb50728 -r 4e18894dec80 debian/changelog --- a/debian/changelog Thu Jun 26 15:00:32 2014 +0200 +++ b/debian/changelog Mon Jan 05 11:31:55 2015 +0100 @@ -1,18 +1,35 @@ -logbuch (0.39+nmu2) oldstable stable; urgency=low +logbuch (0.43) stable oldstable; urgency=medium + + * fixed the source maintainer + + -- Heiko Schlittermann (HS12-RIPE) Mon, 05 Jan 2015 11:23:19 +0100 + +logbuch (0.42) stable oldstable; urgency=medium + + * quieten the perl compiler: + + -- Heiko Schlittermann (HS12-RIPE) Mon, 05 Jan 2015 10:55:59 +0100 + +logbuch (0.40) stable old-stable; urgency=low * Non-maintainer upload. - * warn in maintainer script when repository dir is missing - * fixed some lintian warnings - * cleanup - - -- Matthias Förste Thu, 26 Jun 2014 13:50:33 +0200 + * added ignores: + * untracked autogenerated example files: + * hgignored autogenerated example files: + * repositories für others/world unzugänglich initialisieren: + * fehlerbehandlung: + * removed debian package example files: + * removed noise: + * fixed lintian warning: dh_installmanpages-is-obsolete: + * [changelog]: + * fixed lintian warning: ancient-standards-version: + * fixed lintian warning: helper-templates-in-copyright: + * [changelog]: + * fixed defined (@array): Neue Perlversionen mögen das nicht mehr. + * added $db option to config: + * added $db to config.pm as $db = 1: -logbuch (0.39+nmu1) stable; urgency=low - - * Non-maintainer upload. - * initialize repositories group/world inaccessible - - -- Matthias Förste Fri, 30 Aug 2013 16:35:48 +0200 + -- Heiko Schlittermann (HS12-RIPE) Sat, 03 Jan 2015 22:46:40 +0100 logbuch (0.39) stable; urgency=low diff -r 0806cdb50728 -r 4e18894dec80 debian/control --- a/debian/control Thu Jun 26 15:00:32 2014 +0200 +++ b/debian/control Mon Jan 05 11:31:55 2015 +0100 @@ -1,9 +1,9 @@ Source: logbuch Section: utils Priority: optional -Maintainer: Heiko Schlittermann +Maintainer: Heiko Schlittermann (HS12-RIPE) Build-Depends: debhelper (>= 7.0.50), libmailtools-perl, libdbi-perl, libdbd-mysql-perl, libfile-which-perl, libclass-accessor-perl -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 Homepage: http://schlittermann.de/ Package: logbuch diff -r 0806cdb50728 -r 4e18894dec80 debian/copyright --- a/debian/copyright Thu Jun 26 15:00:32 2014 +0200 +++ b/debian/copyright Mon Jan 05 11:31:55 2015 +0100 @@ -1,14 +1,6 @@ -This package was debianized by Heiko Schlittermann on -Fri, 4 Apr 2003 10:03:49 +0200. - It was downloaded from https://ssl.schlittermann.de/hg/logbuch +Upstream Author: Heiko Schlittermann (HS12-RIPE) +Copyright: (C) 2011-205 Heiko Schlittermann +License: GNU Public License v3 or newer. Upstream Author: Heiko Schlittermann - -Copyright: - - (C) 2011 Heiko Schlittermann - -License: - - GNU Public License v3 or newer. diff -r 0806cdb50728 -r 4e18894dec80 debian/manpages --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/debian/manpages Mon Jan 05 11:31:55 2015 +0100 @@ -0,0 +1,1 @@ +log.8 diff -r 0806cdb50728 -r 4e18894dec80 debian/rules --- a/debian/rules Thu Jun 26 15:00:32 2014 +0200 +++ b/debian/rules Mon Jan 05 11:31:55 2015 +0100 @@ -4,6 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export PERL5LIB= %: dh $@ diff -r 0806cdb50728 -r 4e18894dec80 log.pl --- a/log.pl Thu Jun 26 15:00:32 2014 +0200 +++ b/log.pl Mon Jan 05 11:31:55 2015 +0100 @@ -39,6 +39,7 @@ use lib "/etc/logbuch"; use config; + # print @config::mailto, "\n"; #+-------+---------------+------+-----+---------+----------------+ @@ -63,14 +64,18 @@ my $MAGIC = "#--- all changes below are ignored ---#\n"; my $NODENAME = (split /\./, hostname)[0]; -my $opt_db = 1; +package config { + # default values if not set in the config file + our $db //= 1; + our $logfile = "/root/LOG.$NODENAME"; +} + +my $opt_db = $config::db; my $opt_mail = 1; my $opt_message = ""; my $opt_apt = ""; my $opt_initdir = ""; -my $opt_file = defined $config::logfile # use it twice - ? $config::logfile - : "/root/LOG.$NODENAME"; +my $opt_file = $config::logfile; my $Dbh; @@ -119,7 +124,7 @@ $opt_message =~ s/\n/\n /g; } - if (defined @config::notify_dirs || $opt_initdir) { + if (@config::notify_dirs || $opt_initdir) { check_hg_bin(); } @@ -147,7 +152,7 @@ } my $hg_status_text = ""; - if (defined @config::notify_dirs) { + if (@config::notify_dirs) { foreach my $dir (@config::notify_dirs) { -d $dir or next; @@ -275,7 +280,7 @@ print STDERR "Mail sent (to $mailto).\n"; } - if (defined @config::notify_dirs) { + if (@config::notify_dirs) { foreach my $dir (@config::notify_dirs) { -d $dir or next;