Mercurial > pidgin
changeset 24241:b3a2ba1560d2
merge of '8d34db0f9667ef7735bb95c82f854d1a46ef2ddc'
and '94013736415b834ce7ec23cf10543099c1381874'
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Sat, 18 Oct 2008 18:15:33 +0000 |
| parents | 2f83c37c65e3 (diff) c8ed49367d86 (current diff) |
| children | 2f6474a88f9e |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Sat Oct 18 17:12:27 2008 +0000 +++ b/Makefile.am Sat Oct 18 18:15:33 2008 +0000 @@ -34,6 +34,9 @@ # 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
--- a/configure.ac Sat Oct 18 17:12:27 2008 +0000 +++ b/configure.ac Sat Oct 18 18:15:33 2008 +0000 @@ -74,7 +74,7 @@ AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([dist-bzip2 check-news]) +AM_INIT_AUTOMAKE([dist-bzip2]) PURPLE_MAJOR_VERSION=purple_major_version PURPLE_MINOR_VERSION=purple_minor_version
--- a/pidgin/Makefile.am Sat Oct 18 17:12:27 2008 +0000 +++ b/pidgin/Makefile.am Sat Oct 18 18:15:33 2008 +0000 @@ -5,6 +5,7 @@ Makefile.mingw \ pidgin.pc.in \ pidgin-uninstalled.pc.in \ + pidginstock-artwork.c \ win32/IdleTracker/Makefile.mingw \ win32/IdleTracker/idletrack.c \ win32/IdleTracker/idletrack.h \