libxxf86vm: Changes to 'debian-unstable'
.gitignore | 1
ChangeLog | 256 +++++++++++++++++++++++++++++++++++++++++++++----------
Makefile.am | 10 ++
Makefile.in | 38 +++++---
configure | 20 ++--
configure.ac | 2
debian/changelog | 8 +
man/Makefile.am | 1
man/Makefile.in | 1
src/XF86VMode.c | 7 -
10 files changed, 267 insertions(+), 77 deletions(-)
New commits:
commit 845e85a291e56fde9447adcd41f6ecbe29349d3e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 8 23:45:35 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 5fe4ae4..91d6d54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxxf86vm (1:1.0.2-1) UNRELEASED; urgency=low
+libxxf86vm (1:1.0.2-1) unstable; urgency=low
[ Brice Goglin ]
* Add a link to www.X.org and a reference to the upstream module
@@ -9,7 +9,7 @@ libxxf86vm (1:1.0.2-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* New upstream release.
- -- Brice Goglin <bgoglin@debian.org> Fri, 13 Jun 2008 11:58:50 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 08 Jul 2008 23:45:15 +0200
libxxf86vm (1:1.0.1-3) unstable; urgency=low
commit 32b98e560cf0dcd00f33cf2fdf4ee408a15a7802
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 8 23:42:58 2008 +0200
autoreconf
diff --git a/Makefile.in b/Makefile.in
index 58433c2..ddfa9bc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -210,7 +210,8 @@ top_srcdir = @top_srcdir@
SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xxf86vm.pc
-EXTRA_DIST = xxf86vm.pc.in autogen.sh
+EXTRA_DIST = xxf86vm.pc.in autogen.sh ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
all: all-recursive
.SUFFIXES:
@@ -451,6 +452,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -586,6 +590,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
@@ -650,20 +655,27 @@ uninstall-am: uninstall-pkgconfigDATA
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-libtool distclean-tags \
- distcleancheck distdir distuninstallcheck dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-pkgconfigDATA install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+ distcheck distclean distclean-generic distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-pkgconfigDATA
+
+.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
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/configure b/configure
index fd8bdcb..1a61566 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libXxf86vm 1.0.1.
+# Generated by GNU Autoconf 2.61 for libXxf86vm 1.0.2.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libXxf86vm'
PACKAGE_TARNAME='libXxf86vm'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='libXxf86vm 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='libXxf86vm 1.0.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1416,7 +1416,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libXxf86vm 1.0.1 to adapt to many kinds of systems.
+\`configure' configures libXxf86vm 1.0.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1486,7 +1486,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXxf86vm 1.0.1:";;
+ short | recursive ) echo "Configuration of libXxf86vm 1.0.2:";;
esac
cat <<\_ACEOF
@@ -1599,7 +1599,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libXxf86vm configure 1.0.1
+libXxf86vm configure 1.0.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1613,7 +1613,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libXxf86vm $as_me 1.0.1, which was
+It was created by libXxf86vm $as_me 1.0.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2303,7 +2303,7 @@ fi
# Define the identity of the package.
PACKAGE='libXxf86vm'
- VERSION='1.0.1'
+ VERSION='1.0.2'
cat >>confdefs.h <<_ACEOF
@@ -20667,7 +20667,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libXxf86vm $as_me 1.0.1, which was
+This file was extended by libXxf86vm $as_me 1.0.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20720,7 +20720,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libXxf86vm config.status 1.0.1
+libXxf86vm config.status 1.0.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/man/Makefile.in b/man/Makefile.in
index fa9c841..05d14e8 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -14,7 +14,6 @@
@SET_MAKE@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit e6cfaf7e0be495ba82d55fa6a2061c6b34409836
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 8 23:41:43 2008 +0200
changelog update
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..fbf53eb
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,236 @@
+commit 2cba02334e948e215ab32635763e739c8c4a2f56
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jul 2 15:37:20 2008 -0400
+
+ libXxf86vm 1.0.2
+
+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.
+
+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.
+
+commit 230197a970aec8d5550c2697249ba2e351b2de0b
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sun Mar 9 08:50:55 2008 +0100
+
+ nuke RCS Ids
+
+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
+
+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
+
+commit 52a0ff653601e603faa9c994a240814f9ddc277c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jul 13 14:59:14 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 3e980bb302befb4c463fa861ab08034c83208622
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu Apr 27 00:26:53 2006 +0000
+
+ Bump to 1.0.1
+
+commit 227f7dc999517fc477b63327372fc846e5f44b7d
+Author: Jeremy C. Reed <reed@reedmedia.net>
+Date: Thu Apr 20 23:44:33 2006 +0000
+
+ Fixed typo. Library was spell wrong.
+
+commit 789ff24df047508e04a40fd4b9605e6f40f86638
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sun Feb 12 18:19:23 2006 +0000
+
+ Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628> Shadow pages
+ not created correctly when MANDIR & MANSUFFIX don't match.
+
+commit 6455000546cf8fd14f165a4f13590f94fc9948dc
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:35 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 22c88452663d7c0b4f854f056968527298b412d2
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:45 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 5898da0a5deed350973064bf446c97831e42d575
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:46 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 914624d1fb3924c76e5dc358bb43b4dff800280c
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 04:41:52 2005 +0000
+
+ Add check and cflags for malloc(0) returning NULL.
+
+commit 0f0572fd4b9de8747741ff81d668edfe23db0e15
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:03:07 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 3d042fdd3fb1d2d30ede743741698589e868701b
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Nov 19 07:15:44 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit eb9d4a646a4dfc30fde31deb926a954c2c41ec98
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:12 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit b46825c7ec5c50be0309b52759a2fba05fd2f350
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:00:09 2005 +0000
+
+ Use @LIB_MAN_SUFFIX@ instead of $(LIB_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 736aad1287fa65e82cbcb12073ba99ca8d63c0db
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 21:13:23 2005 +0000
+
+ Rename .shadows.DONE to shadows.DONE to avoid some make's thinking it's a
+ suffix rule (reported by Matthieu Herrb)
+
+commit 5735da3f59d36568cfe198eeb1579e51b105491d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Thu Oct 13 04:25:46 2005 +0000
+
+ Add generated man pages to .cvsignores
+
+commit d0f4698f0cf843f6dfdba11eae687ada11e3d4f0
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Thu Oct 13 01:20:52 2005 +0000
+
+ [lib/Xxf86vm manpage cleanup]
+ Use sed to fill in variables in man page Add shadow man pages for man pages
+ that document multiple functions.
+
+commit 72995528798d388422e6e09ee26a0edaffadb779
+Author: Kristian Høgsberg <krh@redhat.com>
+Date: Mon Sep 26 20:55:17 2005 +0000
+
+ Simple whitespace change to change ownership of ,v file on server. Required
+ so that I can change permissions of file.
+
+commit 8f19f14ada44daf9d85f4d65f0bc130ae5b2f4bf
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:53 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 417a69a7e9ad4df9b3a7f03b09e4694ad5c2bcbc
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jul 9 21:10:32 2005 +0000
+
+ Add .cvsignore files Switch _la_CFLAGS for AM_CFLAGS to clean up directory
+
+commit 4b8ad01b53792d4220579a259290e6bf59eb3d8b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Fri Jul 1 16:16:15 2005 +0000
+
+ spell freedesktop.org correctly
+
+commit a26154988a9367521a15e0876939d8ff7810cd81
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Fri Jun 10 22:38:47 2005 +0000
+
+ Apply patch from Jeff Smith (whydoubt@yahoo.com):
+ - Add file linking for Xxf86misc, Xxf86dga, and Xxf86vm.
+ - Check in build system for Xxf86misc, Xxf86dga, and Xxf86vm.
+
+commit c421f84a2d14fbf2995cba23d2ea614b59eadfd5
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:23:08 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 045fa2a95d6eac5db1c6d8781ef48f86d00b655f
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:12 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit d8913570296903c3686969f8c6dbeaf70064f23e
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:14 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 2e3edee344aee8f8cebe139541ebecccec570d8b
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:46 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 44926b9d3066d939b66aef57d091b8a878591e1e
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:14 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 56ddf834f4d3cca8afd7d36a63d7b825d1d7ffc0
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Thu Dec 4 22:03:15 2003 +0000
+
+ XFree86 4.3.99.901 (RC 1)
+
+commit db365c73e467868938ad5b15343c3b79b87994d5
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:28:33 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit ed50d6847a012bef0bf7274626bb0ed8018d5e23
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:54 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 252d1a944ccf5ebfc2c7e0c349254be055402c17
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:49 2003 +0000
+
+ Initial revision
+
+commit 83bc8003b46b0602c36a84ee5b44665887400305
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:49 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/debian/changelog b/debian/changelog
index a28ef3f..5fe4ae4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-libxxf86vm (1:1.0.1-4) UNRELEASED; urgency=low
+libxxf86vm (1:1.0.2-1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Add a link to www.X.org and a reference to the upstream module
in the long description.
* Add upstream URL to debian/copyright.
* Install the upstream ChangeLog.
+ [ Julien Cristau ]
+ * New upstream release.
+
-- Brice Goglin <bgoglin@debian.org> Fri, 13 Jun 2008 11:58:50 +0200
libxxf86vm (1:1.0.1-3) unstable; urgency=low
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: