libxxf86vm: Changes to 'upstream-unstable'
.gitignore | 1
ChangeLog | 64 --------------------------------------------------------
Makefile.am | 10 ++++++++
configure.ac | 2 -
man/Makefile.am | 1
src/XF86VMode.c | 7 ------
6 files changed, 12 insertions(+), 73 deletions(-)
New commits:
commit 2cba02334e948e215ab32635763e739c8c4a2f56
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 2 15:37:20 2008 -0400
libXxf86vm 1.0.2
diff --git a/configure.ac b/configure.ac
index af564bc..47b8c10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.57])
-AC_INIT(libXxf86vm, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
+AC_INIT(libXxf86vm, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 31cb01986bc3527152d0e3501b38d1b5cfad3155
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 13 13:07:49 2008 -0400
Don't terminate zero-length strings.
Just leave vendor and model NULL if the response didn't include them.
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index 2a281cc..3a7de6b 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -963,12 +963,8 @@ XF86VidModeGetMonitor(dpy, screen, monitor)
}
if (rep.vendorLength)
_XReadPad(dpy, monitor->vendor, rep.vendorLength);
- else
- monitor->vendor[0] = '\0';
if (rep.modelLength)
_XReadPad(dpy, monitor->model, rep.modelLength);
- else
- monitor->model[0] = '\0';
UnlockDisplay(dpy);
SyncHandle();
commit 0aa2ae83518b14e927fb5b8ced182a4f25cecc76
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 24 15:13:14 2008 -0400
Bug #10846: Fix XF86VidModeGetMonitor when vendor or model are null.
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index 75a49d2..2a281cc 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -1,5 +1,3 @@
-/* $XConsortium: XF86VMode.c /main/2 1995/11/14 18:17:58 kaleb $ */
-/* $XFree86: xc/lib/Xxf86vm/XF86VMode.c,v 3.33 2002/10/16 00:37:34 dawes Exp $ */
/*
Copyright (c) 1995 Kaleb S. KEITHLEY
@@ -29,7 +27,6 @@ or other dealings in this Software without prior written authorization
from Kaleb S. KEITHLEY.
*/
-/* $XConsortium: XF86VMode.c /main/4 1996/01/16 07:52:25 kaleb CHECKEDOUT $ */
/* THIS IS NOT AN X CONSORTIUM STANDARD */
@@ -967,11 +964,11 @@ XF86VidModeGetMonitor(dpy, screen, monitor)
if (rep.vendorLength)
_XReadPad(dpy, monitor->vendor, rep.vendorLength);
else
- monitor->vendor = "";
+ monitor->vendor[0] = '\0';
if (rep.modelLength)
_XReadPad(dpy, monitor->model, rep.modelLength);
else
- monitor->model = "";
+ monitor->model[0] = '\0';
UnlockDisplay(dpy);
SyncHandle();
commit 230197a970aec8d5550c2697249ba2e351b2de0b
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 08:50:55 2008 +0100
nuke RCS Ids
diff --git a/man/Makefile.am b/man/Makefile.am
index b2eae41..6347735 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit a3bf552ea28f6275f604f114190b0c69d9bf4ef8
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:47 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index cdbd330..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,64 +0,0 @@
-2006-04-26 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Bump to 1.0.1
-
-2006-04-20 Jeremy C. Reed <reed@reedmedia.net>
-
- * man/XF86VM.man:
- Fix typo.
-
-2006-02-12 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * man/Makefile.am:
- Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628>
- Shadow pages not created correctly when MANDIR & MANSUFFIX don't match.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-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>
-
- * configure.ac:
- * src/Makefile.am:
- Add check and cflags for malloc(0) returning NULL.
-
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * xxf86vm.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
-
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for RC1 release.
-
-2005-10-12 Alan Coopersmith <alan.coopersmith@sun.com>
-
- * man/Makefile.am:
- * configure.ac:
- Use sed to fill in variables in man page
- Add shadow man pages for man pages that document multiple functions.
-
-2005-07-08 Keith Packard <keithp@keithp.com>
-
- * .cvsignore:
- * man/.cvsignore:
- * src/.cvsignore:
- * src/Makefile.am:
- Add .cvsignore files
- Switch _la_CFLAGS for AM_CFLAGS to clean up directory
-
diff --git a/Makefile.am b/Makefile.am
index 35562c2..bfe2cdb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,3 +4,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xxf86vm.pc
EXTRA_DIST = xxf86vm.pc.in autogen.sh
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = 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)
+
+dist-hook: ChangeLog
commit 89dd6f2e9f0322001bcc9f5b42705e150414c37d
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:53:52 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index c8da958..e66b17c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ Makefile.in
missing
mkinstalldirs
xxf86vm.pc
+*~
Reply to: