xserver-xorg-video-rendition: Changes to 'upstream-unstable'
Makefile.am | 2 +-
configure.ac | 3 ++-
man/rendition.man | 2 +-
src/rendition.h | 3 ---
4 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 7ad4b3479433de0cbfca7ba756b07df09678b22a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 24 10:17:19 2009 -0500
rendition 4.2.1
diff --git a/Makefile.am b/Makefile.am
index 4f31078..5de2a4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,6 @@ CLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index d5d2445..d69aef2 100644
--- a/configure.ac
+++ b/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
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
diff --git a/man/rendition.man b/man/rendition.man
index 01be732..3658ab0 100644
--- a/man/rendition.man
+++ b/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
commit 1de42780432957381a05fc565f04124df7f536e0
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 15 14:06:54 2008 -0400
Uninclude xf86Version.h
diff --git a/src/rendition.h b/src/rendition.h
index 6dfb818..2b43cba 100644
--- a/src/rendition.h
+++ b/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"
Reply to: