[telepathy-glib/master] Truncate ChangeLog, and force date format.

[Will Thompson]

Taken from Gabble master; fixes fd.o #21327.
---
 Makefile.am        |    2 ++
 tools/telepathy.am |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6fa876c..fd871bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,4 +27,6 @@ upload-branch-docs: all
 		$(UPLOAD_BRANCH_TO)-$(BRANCH)/
 
 include tools/lcov.am
+
+CHANGELOG_RANGE = telepathy-glib-0.6.0..
 include tools/telepathy.am
diff --git a/tools/telepathy.am b/tools/telepathy.am
index d061b89..3dab3e7 100644
--- a/tools/telepathy.am
+++ b/tools/telepathy.am
@@ -3,8 +3,7 @@
 dist-hook:
 	chmod u+w ${distdir}/ChangeLog
 	if test -d ${top_srcdir}/.git; then \
-		git log --stat > ${distdir}/ChangeLog || \
-		git log > ${distdir}/ChangeLog; \
+		git log --date=iso $(CHANGELOG_RANGE) > ${distdir}/ChangeLog; \
 	fi
 
 maintainer-upload-release: _maintainer-upload-release
-- 
1.5.6.5