changeset 32142:6b443ffa2f8b

applied changes from 1d2a25ce8baec7e426910e310ed73db0a4961c31 through 341e86eb5b808e0eab3242d7be676f83eca02b08 Original commit message: Oh yeah, we're trying not to update ChangeLog.win32. Changing our release process to not verify the date in that file
author Mark Doliner <mark@kingant.net>
date Mon, 20 Jun 2011 05:29:11 +0000
parents fbfbf2e0f049
children 6d6b4f2a5e69
files ChangeLog.win32 Makefile.am
diffstat 2 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.win32	Mon Jun 20 05:28:13 2011 +0000
+++ b/ChangeLog.win32	Mon Jun 20 05:29:11 2011 +0000
@@ -1,9 +1,6 @@
 Starting with Pidgin version 2.7.1, this ChangeLog file will no longer be
 updated.  It will be kept in the source tree for historical reasons only.
 
-version 2.8.0 (06/07/2011):
-	* No changes
-
 version 2.7.1 (05/29/2010):
 	* No changes
 
--- a/Makefile.am	Mon Jun 20 05:28:13 2011 +0000
+++ b/Makefile.am	Mon Jun 20 05:29:11 2011 +0000
@@ -55,7 +55,6 @@
 
 # For all releases, check the ChangeLogs.
 	head ChangeLog | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null
-	head ChangeLog.win32 | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null
 	head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
 
 # Ensure we're working from a tag...