Fix up the sed trickery generating the ChangeLog - those

everyone@*.redhat.de entries caused by commits from redhat.de
are too funny. ;)

2 files changed, 42 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 09fde39c..bfa112f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2001-04-24  notting  <notting@redhat.com>
+
+	* initscripts.spec:
+	*** empty log message ***
+
+2001-04-23  than  <than@redhat.com>
+
+	* initscripts.spec: * changed release number
+
+	* ChangeLog, initscripts.spec, rc.d/init.d/halt:
+	add shutdown UPS into halt
+
+2001-04-24  notting  <notting@redhat.com>
+
+	* initscripts.spec:
+	*** empty log message ***
+
+2001-04-23  than  <than@redhat.com>
+
+	* initscripts.spec: * changed release number
+
+	* ChangeLog, initscripts.spec, rc.d/init.d/halt:
+	add shutdown UPS into halt
+
+2001-04-24  notting  <notting@redhat.de>
+
+	* initscripts.spec:
+	*** empty log message ***
+
+2001-04-23  than  <than@redhat.de>
+
+	* initscripts.spec: * changed release number
+
+	* ChangeLog, initscripts.spec, rc.d/init.d/halt:
+	add shutdown UPS into halt
+
+2001-04-23  notting  <notting@redhat.de>
+
+	* rc.d/rc.sysinit:
+	don't load mixer settings; modutils does that in %post-install
+
 2001-04-23  than  <than@rom.redhat.de>
 
 	* initscripts.spec, rc.d/init.d/halt:
diff --git a/Makefile b/Makefile
index 69d36425..85cc9871 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ check:
 	done
 
 changelog:
-	rcs2log | sed "s|@.*redhat\.com|@redhat.com|" | sed "s|@@|@|" | \
+	rcs2log | sed "s|@.*redhat\.com|@redhat.com|" | sed "s|@.*redhat\.de|@redhat.com|" | sed "s|@redhat\.de|@redhat.com|" | sed "s|@@|@|" | \
 	 sed "s|/mnt/devel/CVS/initscripts/||g" > changenew
 	 mv ChangeLog ChangeLog.old
 	 cat changenew ChangeLog.old > ChangeLog