cleanup

2 files changed, 73 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f761c3b..56b467c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+2006-11-28  Bill Nottingham  <notting@redhat.com>
+
+	* Makefile: fix changelog stuff
+
+	* src/rename_device.c:
+	add a step to rename any temporarily renamed devices (#208740,
+	#204803, #214817)
+
+2006-11-28  Ani Peter  <apeter@redhat.com>
+
+	* po/ml.po: Updated Malaylam file
+
+2006-11-28  Chung Cheng  <ccheng@redhat.com>
+
+	* po/as.po, po/bn_IN.po, po/de.po, po/es.po, po/fr.po, po/gu.po, po/hi.po, po/it.po, po/ja.po, po/ko.po, po/or.po, po/pa.po, po/ta.po:
+	Routine merge
+
+2006-11-24  Ani Peter  <apeter@redhat.com>
+
+	* po/ml.po: Updated Malayalam
+
+2006-11-24  Amanpreet Brar  <aalam@redhat.com>
+
+	* po/pa.po:
+	update translation for Punjabi (Gurmukhi) by apbrar gmail com
+
+2006-11-23  Ani Peter  <apeter@redhat.com>
+
+	* po/ml.po: Updated malayalam file
+
+2006-11-22  Bill Nottingham  <notting@redhat.com>
+
+	* sysconfig/network-scripts/network-functions-ipv6:
+	more fixes for network module unload (#211474)
+
+2006-11-20  Bill Nottingham  <notting@redhat.com>
+
+	* rc.d/init.d/halt: don't unmount network filesystems
+
+	* rc.d/rc.sysinit: fix dmraid test (#216334)
+
+2006-11-20  Ani Peter  <apeter@redhat.com>
+
+	* po/ml.po: Updated Malayalam file
+
+2006-11-19  arclynx  <arclynx@redhat.com>
+
+	* po/ms.po: Updated Malay translation
+
+2006-11-15  Miloslav Trmac  <mitr@redhat.com>
+
+	* sysconfig.txt, sysconfig/network-scripts/ifdown-ipsec, sysconfig/network-scripts/ifup-ipsec:
+	Add a way to manually manage racoon.conf, e.g. to handle separate tunnels with
+	a shared peer endpoint (#159343)
+
+2006-11-13  raven  <raven@redhat.com>
+
+	* po/pl.po: Updated Polish translation
+
+2006-11-10  Miloslav Trmac  <mitr@redhat.com>
+
+	* sysconfig.txt: Document ~/.i18n (#199323)
+
+2006-11-06  Bill Nottingham  <notting@redhat.com>
+
+	* sysconfig/network-scripts/network-functions:
+	don't run ethtool if there's no device. Prevents reloading the module
+	on ifdown called by udev on device unregistration.
+
+	* ChangeLog, initscripts.spec: 8.47-1
+
 2006-11-06  Bill Nottingham  <notting@redhat.com>
 
 	* ChangeLog, initscripts.spec: 8.47-1
diff --git a/Makefile b/Makefile
index c5382bf0..e242d14b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ VERSION=$(shell awk '/Version:/ { print $$2 }' initscripts.spec)
 CVSTAG = r$(subst .,-,$(VERSION))
 CVSROOT = $(shell cat CVS/Root)
 
+
 mandir=/usr/share/man
 
 all:
@@ -119,7 +120,7 @@ check:
 	done
 
 changelog:
-	@rcs2log -h redhat.com -r -b -r "-d>$(head -1 ChangeLog | awk '{ print $1 }')" > changenew
+	rcs2log -h redhat.com -r -b -r "-d>`awk '{ print $$1 ; exit }' ChangeLog `" > changenew
 	 mv ChangeLog ChangeLog.old
 	 cat changenew ChangeLog.old > ChangeLog
 	 rm -f changenew