From 9f5fdd2a6b549eb1c03ef62a1e7cd9cb4d97633f Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 1 Mar 2002 03:51:40 +0000
Subject: 6.54-1

---
 ChangeLog        | 29 +++++++++++++++++++++++++++++
 initscripts.spec |  5 ++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 83492571..73327206 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2002-03-01  Bill Nottingham  <notting@redhat.com>
+
+	* ChangeLog, initscripts.spec: 6.54-1
+
+	* initscripts.spec: add conflict for old psacct
+
+2002-02-27  Bill Nottingham  <notting@redhat.com>
+
+	* rc.d/rc.sysinit: banner tweaks
+
+2002-02-25  Bill Nottingham  <notting@redhat.com>
+
+	* lang.sh: unset sourced (#59616)
+
+	* lang.csh: fix setenv invocation (#59946)
+
+2002-02-25  Pedro Morais  <pmmm@rnl.ist.utl.pt>
+
+	* po/pt.po: add credit messages
+
+2002-02-24  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Translation bug fixes.
+
+2002-02-22  Bill Nottingham  <notting@redhat.com>
+
+	* rc.d/init.d/halt:
+	fix bug introduced by fix for #53580 (#60252)
+
 2002-02-22  Bill Nottingham <notting@redhat.com>
 
 	* Changelog, initscripts.spec: 6.53-1
diff --git a/initscripts.spec b/initscripts.spec
index 08c5281f..c7e566ff 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 6.53
+Version: 6.54
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -240,6 +240,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/locale/*/LC_MESSAGES
 
 %changelog
+* Thu Feb 28 2002 Bill Nottingham <notting@redhat.com>
+- conflict with older psacct
+
 * Fri Feb 22 2002 Bill Nottingham <notting@redhat.com>
 - fix invocation of need_hostname (#58946), a couple other minor tweaks
 
-- 
cgit v1.2.1