changeset 24311:2a4f96dc074e

merge of '0d1b60430843a092248a2644865910266131add6' and '353dca4bdccf7f7494fbffa5503b6641c0f6e758'
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 27 Oct 2008 00:58:29 +0000
parents cb0aa91430bb (diff) b51732ec65e4 (current diff)
children 70864c55e233 e54d7fff1ad2 a4dfc631b140 45dbea660309 e81b708a8986
files
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Mon Oct 27 00:57:04 2008 +0000
+++ b/Makefile.am	Mon Oct 27 00:58:29 2008 +0000
@@ -34,6 +34,13 @@
 # We don't want to release development versions.
 	test x`echo $(PACKAGE_VERSION) | grep dev` = x
 
+# Make sure there is a NEWS entry for this version
+	head NEWS | grep "^$(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" > /dev/null
+
+# Ensure NEWS has no spaces at the start of a line.
+# Using spaces instead of tabs there is a common mistake.
+	test x`grep "^ " NEWS` = x
+
 # When doing a new minor (or major) release (X.Y.0), there must be a section in
 # ChangeLog.API.
 	echo $(PACKAGE_VERSION) | grep -v "^[0-9]\+\.[0-9]\+\.0$$" >/dev/null || head ChangeLog.API | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null
--- a/NEWS	Mon Oct 27 00:57:04 2008 +0000
+++ b/NEWS	Mon Oct 27 00:58:29 2008 +0000
@@ -1,12 +1,5 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-For up-to-date news, information, and sports, visit: http://planet.pidgin.im
-
-
-===============================================================================
-=                                   OLD NEWS                                  =
-===============================================================================
-
 2.5.2 (10/19/2008):
 	Ethan: After a bit of a struggle with our services, which put
 	this release off for an unfortunate length of time, we're