5 files changed, 22 insertions, 6 deletions
diff --git a/driver/xf86-video-rendition/ChangeLog b/driver/xf86-video-rendition/ChangeLog
index 69e504956..e80902b48 100644
--- a/driver/xf86-video-rendition/ChangeLog
+++ b/driver/xf86-video-rendition/ChangeLog
@@ -1,3 +1,21 @@
+commit 29c9c203a1541df36685b6bedd3d4955c5882508
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jan 9 16:32:50 2009 -0800
+
+    Remove xorgconfig & xorgcfg from See Also list in man page
+
+commit 1de42780432957381a05fc565f04124df7f536e0
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Aug 15 14:06:54 2008 -0400
+
+    Uninclude xf86Version.h
+
+commit 6a565d3a8caad1d44e9cfc724fc8298b3ce023e5
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Mar 19 14:50:31 2008 -0400
+
+    rendition 4.2.0
+
 commit e943057ef844a7a3153b6158f3dd26ae02296e98
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Wed Mar 19 14:45:52 2008 -0400
diff --git a/driver/xf86-video-rendition/Makefile.am b/driver/xf86-video-rendition/Makefile.am
index b30de9b58..5de2a4a13 100644
--- a/driver/xf86-video-rendition/Makefile.am
+++ b/driver/xf86-video-rendition/Makefile.am
@@ -33,6 +33,6 @@ CLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	git-log > ChangeLog
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/driver/xf86-video-rendition/configure.ac b/driver/xf86-video-rendition/configure.ac
index d5d24455f..d69aef228 100644
--- a/driver/xf86-video-rendition/configure.ac
+++ b/driver/xf86-video-rendition/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-rendition],
-        4.2.0,
+        4.2.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-rendition)
 
@@ -84,6 +84,7 @@ AC_SUBST([DRIVER_NAME])
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 XORG_CHECK_LINUXDOC
 
diff --git a/driver/xf86-video-rendition/man/rendition.man b/driver/xf86-video-rendition/man/rendition.man
index 01be73297..3658ab051 100644
--- a/driver/xf86-video-rendition/man/rendition.man
+++ b/driver/xf86-video-rendition/man/rendition.man
@@ -107,6 +107,6 @@ as there has been indications of problems with it. Use
 .B "Option \*qMTRR\*q"
 to let the driver request write-combining of memory access on the video board.
 .SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Marc Langenbach, Dejan Ilic
diff --git a/driver/xf86-video-rendition/src/rendition.h b/driver/xf86-video-rendition/src/rendition.h
index 6dfb818a2..2b43cba99 100644
--- a/driver/xf86-video-rendition/src/rendition.h
+++ b/driver/xf86-video-rendition/src/rendition.h
@@ -14,9 +14,6 @@
 /* Everything using inb/outb, etc needs "compiler.h" */
 #include "compiler.h"
 
-/* This is used for module versioning */
-#include "xf86Version.h"
-
 /* Drivers for PCI hardware need this */
 #include "xf86PciInfo.h"