From 4fb2e257ae6de38971be8005283402226aea1ee5 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri, 14 Jul 2006 17:59:19 -0700
Subject: [PATCH] Replace manual ChangeLog with dist-hook to generate from git
 log

---
 ChangeLog   | 62 -----------------------------------------------------
 Makefile.am | 12 ++++++++++-
 2 files changed, 11 insertions(+), 63 deletions(-)
 delete mode 100644 ChangeLog

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 566138f..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,62 +0,0 @@
-2006-06-10  Daniel Stone  <daniel@freedesktop.org>
-
-	* keysymdef.h:
-	Add ISO_Level5_{Shift,Latch,Lock}.
-
-2006-06-02  Daniel Stone  <daniel@freedesktop.org>
-
-	* configure.ac:
-	Bump to 7.0.6, and then to 7.0.7.
-	
-	* keysym.h:
-	* keysymdef.h:
-	Bug #6296: Add Braille keysyms.  (Samuel Thibault)
-
-	* keysymdef.h:
-	Bug #6887: Add dead_stroke keysym.  (Troy Korjuslommi)
-
-2006-04-26  Adam Jackson  <ajax@freedesktop.org>
-
-	* configure.ac:
-	Bump to 7.0.5
-
-2006-04-25  Alan Coopersmith  <alan.coopersmith@sun.com>
-
-	* Xdefs.h: 
-	* Xos.h:
-	Fix more comment typos.
-
-2006-04-19  Alan Coopersmith  <alan.coopersmith@sun.com>
-
-	* Xmd.h: 
-	On Solaris, #include <sys/isa_defs.h> to be sure _LP64 is defined
-	in 64-bit builds.
-
-	* Xmd.h:
-	* Xos.h: 
-	* Xos_r.h: 
-	* Xproto.h: 
-	* keysymdef.h:
-	Fix some comment typos.
-
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
-
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
-
-2005-12-02  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* Xfuncproto.h.in:
-	* configure.ac:
-	Automatically generate FUNCPROTO and NARROWPROTO defines in
-	Xfuncproto.h.
-
-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for X11R7 RC2 release.
diff --git a/Makefile.am b/Makefile.am
index f886f63..d1fd438 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,4 +30,14 @@ xproto_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xproto.pc
 
-EXTRA_DIST = autogen.sh xproto.pc.in
+EXTRA_DIST = autogen.sh xproto.pc.in ChangeLog
+
+CLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(cd $(srcdir) && git-log > ChangeLog )
+
+dist-hook: ChangeLog
+