merge of 'fd63a55e8c27d1ef04de89d24eac6e188b6aa9d6'

Mon, 27 Oct 2008 00:58:29 +0000

author
Stu Tomlinson <nosnilmot@pidgin.im>
date
Mon, 27 Oct 2008 00:58:29 +0000
changeset 24528
f5b06eefd07f
parent 24525
fd63a55e8c27 (diff)
parent 24527
f7dd45359865 (current diff)
child 24529
1a2408022746
child 24536
165228cf120e
child 25921
2083dc3db9ed
child 25950
3d8c8999cb22
child 26003
721568370a5d

merge of 'fd63a55e8c27d1ef04de89d24eac6e188b6aa9d6'
and 'f7dd453598652f50e084aef898b9dbb19d8c51b9'

--- 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

mercurial