[Logcheck-commits] r1627 - logcheck/trunk/debian
maks at users.alioth.debian.org
maks at users.alioth.debian.org
Mon Aug 13 11:31:56 UTC 2007
Author: maks
Date: 2007-08-13 11:31:56 +0000 (Mon, 13 Aug 2007)
New Revision: 1627
Removed:
logcheck/trunk/debian/po/
Modified:
logcheck/trunk/debian/changelog
logcheck/trunk/debian/control
logcheck/trunk/debian/logcheck-database.config
logcheck/trunk/debian/logcheck-database.postinst
logcheck/trunk/debian/logcheck-database.preinst
logcheck/trunk/debian/logcheck-database.templates
logcheck/trunk/debian/logcheck.postinst
logcheck/trunk/debian/rules
Log:
massive post etch release maintainer scripts code cleanup:
* kill upgrade code handling concerning versions before the sarge release
* no debconf left
* no po left
Modified: logcheck/trunk/debian/changelog
===================================================================
--- logcheck/trunk/debian/changelog 2007-08-07 12:44:52 UTC (rev 1626)
+++ logcheck/trunk/debian/changelog 2007-08-13 11:31:56 UTC (rev 1627)
@@ -1,9 +1,17 @@
logcheck (1.2.59.0) UNRELEASED; urgency=low
+ [ Marc Haber ]
* NOT RELEASED YET
- -- Marc Haber <mh+debian-packages at zugschlus.de> Tue, 07 Aug 2007 14:43:19 +0200
+ [ maximilian attems ]
+ * logcheck-database.config, logcheck-database.postinst,
+ logcheck-database.preinst, logcheck.postinst, logcheck-database.templates:
+ Kill code for upgrades from version earlier then Sarge, no debconf.
+ Thus remove ancient po files.
+ * debian/control: No debconf no debconf-updatepo need anymore.
+ -- maximilian attems <maks at debian.org> Mon, 13 Aug 2007 13:05:00 +0200
+
logcheck (1.2.59) experimental; urgency=low
* add logtail2
Modified: logcheck/trunk/debian/control
===================================================================
--- logcheck/trunk/debian/control 2007-08-07 12:44:52 UTC (rev 1626)
+++ logcheck/trunk/debian/control 2007-08-13 11:31:56 UTC (rev 1627)
@@ -4,13 +4,13 @@
Maintainer: Debian logcheck Team <logcheck-devel at lists.alioth.debian.org>
Uploaders: Todd Troxell <ttroxell at debian.org>, Gerfried Fuchs <alfie at debian.org>, Eric Evans <eevans at debian.org>, martin f. krafft <madduck at debian.org>, Marc Haber <mh+debian-packages at zugschlus.de>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.1.13), po-debconf
+Build-Depends: debhelper (>= 4.1.13)
Build-Depends-Indep: docbook-to-man
XS-Vcs-Svn: svn://svn.debian.org/svn/logcheck/logcheck/trunk
Package: logcheck
Architecture: all
-Depends: adduser, debconf, grep (>= 2.5.1-1), exim4 | mail-transport-agent, cron (>=3.0pl1-68), sysklogd | system-log-daemon | syslog-ng, mailx, logtail2, lockfile-progs, ${misc:Depends}
+Depends: adduser, grep (>= 2.5.1-1), exim4 | mail-transport-agent, cron (>=3.0pl1-68), sysklogd | system-log-daemon | syslog-ng, mailx, logtail2, lockfile-progs, ${misc:Depends}
Recommends: logcheck-database (>= ${source:Version})
Suggests: syslog-summary
Description: mails anomalies in the system logfiles to the administrator
Modified: logcheck/trunk/debian/logcheck-database.config
===================================================================
--- logcheck/trunk/debian/logcheck-database.config 2007-08-07 12:44:52 UTC (rev 1626)
+++ logcheck/trunk/debian/logcheck-database.config 2007-08-13 11:31:56 UTC (rev 1627)
@@ -5,17 +5,4 @@
action=$1
version=$2
-# debconf
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-
-# Only show messages about changes on an upgrade
-if [ "$action" = "configure" ] && [ -n "$version" ]; then
- if dpkg --compare-versions "$version" lt "1.2.6"; then
- db_input medium logcheck-database/conffile-cleanup || true
- db_go || true
- fi
-fi
-
exit 0
Modified: logcheck/trunk/debian/logcheck-database.postinst
===================================================================
--- logcheck/trunk/debian/logcheck-database.postinst 2007-08-07 12:44:52 UTC (rev 1626)
+++ logcheck/trunk/debian/logcheck-database.postinst 2007-08-13 11:31:56 UTC (rev 1627)
@@ -28,56 +28,8 @@
confdir="/etc/logcheck"
-# Files removed from the package.
-rmfiles="ignore.d.workstation/dhclient \
- ignore.d.workstation/dhcp \
- ignore.d.workstation/cron \
- ignore.d.workstation/imap \
- ignore.d.workstation/isdnlog \
- ignore.d.workstation/isdnutils \
- ignore.d.workstation/oidentd \
- ignore.d.workstation/proftpd \
- ignore.d.workstation/qpopper \
- ignore.d.workstation/samba \
- ignore.d.workstation/ssh \
- ignore.d.workstation/stunnel \
- ignore.d.workstation/sysklogd \
- ignore.d.workstation/telnetd \
- ignore.d.workstation/uptimed \
- ignore.d.workstation/imp \
- ignore.d.workstation/samba \
- ignore.d.workstation/squid \
- ignore.d.workstation/ipppd \
- ignore.d.workstation/exim \
- ignore.d.workstation/portsentry \
- ignore.d.workstation/qmail \
- ignore.d.server/telnetd \
- ignore.d.server/qpopper \
- ignore.d.server/bind \
- ignore.d.server/portsentry \
- ignore.d.server/qmail \
- ignore.d.server/sysklog \
- ignore.d.paranoid/exim \
- ignore.d.paranoid/portsentry \
- ignore.d.paranoid/qmail \
- violations.ignore.d/su \
- violations.ignore.d/logcheck"
-
-secondrmfiles="violations.ignore.d/innd"
-
case "$1" in
configure)
- if dpkg --compare-versions "$2" lt "1.2.6"; then
- db_get logcheck-database/conffile-cleanup
- if [ "$RET" = true ]; then
- echo -n "Removing old conffiles from $confdir: "
- for file in $rmfiles; do
- rm -f $confdir/$file
- done
- echo "Done"
- fi
- fi
-
# Remove old sarge mv logcheck-data configfiles if unchanged
if [ -n "$2" ] && dpkg --compare-versions "$2" lt "1.2.48"; then
proftpd_sum=$(sha1sum '/etc/logcheck/ignore.d.paranoid/proftpd' 2>/dev/null \
Modified: logcheck/trunk/debian/logcheck-database.preinst
===================================================================
--- logcheck/trunk/debian/logcheck-database.preinst 2007-08-07 12:44:52 UTC (rev 1626)
+++ logcheck/trunk/debian/logcheck-database.preinst 2007-08-13 11:31:56 UTC (rev 1627)
@@ -17,58 +17,8 @@
# Source debconf library.
#. /usr/share/debconf/confmodule
-# File removed from the package.
-rmfiles="ignore.d.workstation/dhclient ignore.d.workstation/dhcp"
-
-workstation="automount bind cron dhcp exim imap imp ipppd isdnutils oidentd \
- portsentry postfix proftpd qmail qpopper samba squid stunnel \
- sysklogd telnetd uptimed"
-
-server="cron exim portsentry ppp qmail qpopper squid sysklogd telnetd"
-
-ruledirs="cracking.d ignore.d.workstation ignore.d.server ignore.d.paranoid \
- violations.d violations.ignore.d"
-
-confdir="/etc/logcheck"
-
case "$1" in
install|upgrade)
- # upgrading
- if [ -n "$2" ]; then
- # The standard files were renamed in 1.2.1 release, so
- # we'll move it to the new name.
- if dpkg --compare-versions "$2" lt "1.2.1"; then
- echo -n "Copying standard files to logcheck: "
- for dir in $ruledirs; do
- if [ -f $confdir/$dir/standard ]; then
- echo -n "$dir, "
- mv $confdir/$dir/standard $confdir/$dir/logcheck
- fi
- done
- echo
- echo -n "Renaming violations.ignore.d/standard.postfix to logcheck-postfix: "
- if [ -f $confdir/violations.ignore.d/standard.postfix ]; then
- mv $confdir/violations.ignore.d/standard.postfix \
- $confdir/violations.ignore.d/logcheck-postfix
- fi
- echo "Done"
- fi
-
- # Rename violations.ignore.d/innd was renamed to
- # violations.ignore.d/logcheck-innd in release 1.2.7
- if dpkg --compare-versions "$2" lt "1.2.7"; then
- if [ -f $confdir/violations.ignore.d/innd ]; then
- echo -n "Renaming $confdir/violations.ignore.d/innd: "
- if [ -f $confdir/violations.ignore.d/logcheck-innd ]; then
- echo "Failed - target file exists"
- else
- mv $confdir/violations.ignore.d/innd \
- $confdir/violations.ignore.d/logcheck-innd
- echo "Done"
- fi
- fi
- fi
- fi
;;
abort-upgrade)
Modified: logcheck/trunk/debian/logcheck-database.templates
===================================================================
--- logcheck/trunk/debian/logcheck-database.templates 2007-08-07 12:44:52 UTC (rev 1626)
+++ logcheck/trunk/debian/logcheck-database.templates 2007-08-13 11:31:56 UTC (rev 1627)
@@ -1,10 +0,0 @@
-Template: logcheck-database/conffile-cleanup
-Type: boolean
-Default: false
-_Description: Would you like to delete obsolete conffiles?
- The rulefiles in logcheck-database have just been through an audit to
- remove duplicate entries and to make them more specific - this also
- reduces false negatives.
- .
- As a result of this a number of rulefiles have been removed from the
- package.
Modified: logcheck/trunk/debian/logcheck.postinst
===================================================================
--- logcheck/trunk/debian/logcheck.postinst 2007-08-07 12:44:52 UTC (rev 1626)
+++ logcheck/trunk/debian/logcheck.postinst 2007-08-13 11:31:56 UTC (rev 1627)
@@ -62,12 +62,6 @@
chfn -f 'logcheck system account' logcheck
fi
- # Remove unused old directory on upgrade
- if [ -n "$2" ] && dpkg --compare-versions "$2" lt "1.2.25"; then
- if [ -d /var/state/logcheck ]; then
- rm -fr /var/state/logcheck
- fi
- fi
# Add logcheck mail header on install
if [ ! -n "$2" ] && [ ! -f /etc/logcheck/header.txt ]; then
cp -p /usr/share/logcheck/header.txt /etc/logcheck
@@ -84,7 +78,7 @@
chgrp -R logcheck /etc/logcheck || true
# Set Permissions on install or upgrade
- if [ ! -n "$2" ] || dpkg --compare-versions "$2" lt "1.2.34"; then
+ if [ ! -n "$2" ]; then
chown -R logcheck:logcheck /var/lib/logcheck || true
chmod 2750 /etc/logcheck/ignore.d.paranoid || true
chmod 2750 /etc/logcheck/ignore.d.workstation || true
Modified: logcheck/trunk/debian/rules
===================================================================
--- logcheck/trunk/debian/rules 2007-08-07 12:44:52 UTC (rev 1626)
+++ logcheck/trunk/debian/rules 2007-08-13 11:31:56 UTC (rev 1627)
@@ -26,8 +26,6 @@
rm -f docs/logcheck.8
[ ! -f Makefile ] || $(MAKE) clean DESTDIR=$(CURDIR)/debian/tmp
- debconf-updatepo
-
dh_clean
install: install-stamp
@@ -63,7 +61,6 @@
dh_installman -p logtail2 docs/logtail2.8
dh_installman -p logcheck docs/logcheck.8
dh_installchangelogs
- dh_installdebconf
# dh_strip
dh_compress
dh_fixperms --exclude etc/logcheck
@@ -94,14 +91,6 @@
@echo
@echo 'Execute debian/rules file'
-# check the debconf translations
-checkpo:
- for i in debian/po/*.po; do \
- echo \"Checking: $$i\"; \
- msgmerge -U $$i debian/po/templates.pot; \
- msgfmt -o /dev/null -c --statistics $$i; \
- done
-
# Done by the uploader:
# cvs update..
# edit debian/changelog
More information about the Logcheck-commits
mailing list