[merged] from older revision
authorHeiko Schlittermann (JUMPER) <hs@schlittermann.de>
Mon, 05 Jan 2015 11:31:55 +0100
changeset 90 4e18894dec80
parent 89 425d7c20e509 (diff)
parent 76 0806cdb50728 (current diff)
child 91 9fdd2258e7d6
[merged] from older revision
debian/changelog
debian/conffiles.ex
debian/control
debian/copyright
debian/cron.d.ex
debian/init.d.ex
debian/manpage.1.ex
debian/manpage.sgml.ex
debian/menu.ex
debian/postinst.ex
debian/postrm.ex
debian/preinst.ex
debian/prerm.ex
debian/rules
debian/watch.ex
log.pl
--- 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
--- 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;
--- 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) <hs@schlittermann.de>  Mon, 05 Jan 2015 11:23:19 +0100
+
+logbuch (0.42) stable oldstable; urgency=medium
+
+  * quieten the perl compiler:
+
+ -- Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>  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 <foerste@schlittermann.de>  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 <foerste@schlittermann.de>  Fri, 30 Aug 2013 16:35:48 +0200
+ -- Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>  Sat, 03 Jan 2015 22:46:40 +0100
 
 logbuch (0.39) stable; urgency=low
 
--- 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 <hs@schlittermann.de>
+Maintainer: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
 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
--- 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 <heiko@schlittermann.de> 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) <hs@schlittermann.de>
+Copyright:	    (C) 2011-205 Heiko Schlittermann <hs@schlittermann.de>
+License:	    GNU Public License v3 or newer.
 
 Upstream Author: Heiko Schlittermann <hs@schlittermann.de>
-
-Copyright:
-
-    (C) 2011 Heiko Schlittermann <hs@schlittermann.de>
-
-License:
-
-    GNU Public License v3 or newer.
--- /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
--- 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 $@
--- 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;