libxxf86vm: Changes to 'upstream-unstable'
.gitignore | 72 +++++++++++++++++---
COPYING | 27 ++++++-
Makefile.am | 10 +-
configure.ac | 15 ++--
man/Makefile.am | 126 ++++++++++++++----------------------
man/XF86VM.man | 6 -
man/XF86VidModeDeleteModeLine.man | 1
man/XF86VidModeGetAllModeLines.man | 1
man/XF86VidModeGetDotClocks.man | 1
man/XF86VidModeGetGamma.man | 1
man/XF86VidModeGetGammaRamp.man | 1
man/XF86VidModeGetGammaRampSize.man | 1
man/XF86VidModeGetModeLine.man | 1
man/XF86VidModeGetMonitor.man | 1
man/XF86VidModeGetPermissions.man | 1
man/XF86VidModeGetViewPort.man | 1
man/XF86VidModeLockModeSwitch.man | 1
man/XF86VidModeModModeLine.man | 1
man/XF86VidModeQueryExtension.man | 1
man/XF86VidModeQueryVersion.man | 1
man/XF86VidModeSetClientVersion.man | 1
man/XF86VidModeSetGamma.man | 1
man/XF86VidModeSetGammaRamp.man | 1
man/XF86VidModeSetViewPort.man | 1
man/XF86VidModeSwitchMode.man | 1
man/XF86VidModeSwitchToMode.man | 1
man/XF86VidModeValidateModeLine.man | 1
src/XF86VMode.c | 2
28 files changed, 167 insertions(+), 112 deletions(-)
New commits:
commit 6f22da39b65983a582d2055e9e43f5dbc0412f1f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 18:04:50 2010 -0700
libXxf86vm 1.1.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 5e3c565..f84ec81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,8 @@
AC_PREREQ([2.60])
-AC_INIT(libXxf86vm, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
+AC_INIT([libXxf86vm], [1.1.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXxf86vm])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit fe0659724002e65af6a68be53f57bb8ba85324fe
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 18:03:51 2010 -0700
Sun's copyrights now belong to Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 417dd03..89d3172 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -19,7 +19,7 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-#
+#
libmandir = $(LIB_MAN_DIR)
commit 84c7286a799d2368ce868afb31b373f8486724c2
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:30:04 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/XF86VM.man b/man/XF86VM.man
index 590e20e..63fb76c 100644
--- a/man/XF86VM.man
+++ b/man/XF86VM.man
@@ -1,11 +1,5 @@
-.\" $XdotOrg: lib/Xxf86vm/man/XF86VM.man,v 1.2 2004/04/23 19:23:08 eich Exp $
-.\" $TOG: XF86VM.man /main/6 1997/07/19 10:30:39 kaleb $
-.\"
-.\"
-.\"
.\"
.\" Copyright (c) 1996 Joe Moss, The XFree86 Project
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man,v 3.14 2003/10/02 13:29:56 eich Exp $
.\"
.de ZN
.ie t \fB\^\\$1\^\fR\\$2
commit b6d645596f284550350d8c690cfcce89d019ab60
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Aug 17 19:53:37 2010 -0400
man: store shadow man pages in git rather than generating them
Simplify the build process and the makefile.
Local fix in CVS for bug 5628 is not required
as the problem has been fixed in
util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/man/Makefile.am b/man/Makefile.am
index 0fc1db8..417dd03 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -23,18 +23,37 @@
libmandir = $(LIB_MAN_DIR)
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
+libman_PRE = \
+ XF86VM.man \
+ $(XF86VM_shadows:=.man)
-libman_PRE = XF86VM.man
-
-BUILT_SOURCES = $(XF86VM_shadowmen)
+XF86VM_shadows = \
+ XF86VidModeQueryExtension \
+ XF86VidModeQueryVersion \
+ XF86VidModeGetModeLine \
+ XF86VidModeGetAllModeLines \
+ XF86VidModeDeleteModeLine \
+ XF86VidModeModModeLine \
+ XF86VidModeSwitchMode \
+ XF86VidModeSwitchToMode \
+ XF86VidModeLockModeSwitch \
+ XF86VidModeGetMonitor \
+ XF86VidModeGetViewPort \
+ XF86VidModeSetViewPort \
+ XF86VidModeValidateModeLine \
+ XF86VidModeSetClientVersion \
+ XF86VidModeGetDotClocks \
+ XF86VidModeGetGamma \
+ XF86VidModeSetGamma \
+ XF86VidModeSetGammaRamp \
+ XF86VidModeGetGammaRamp \
+ XF86VidModeGetGammaRampSize \
+ XF86VidModeGetPermissions
EXTRA_DIST = $(libman_PRE)
+CLEANFILES = $(libman_DATA)
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(XF86VM_shadowmen)
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
@@ -42,31 +61,4 @@ SUFFIXES = .$(LIB_MAN_SUFFIX) .man
.man.$(LIB_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-
-XF86VM_shadows = \
- XF86VidModeQueryExtension \
- XF86VidModeQueryVersion \
- XF86VidModeGetModeLine \
- XF86VidModeGetAllModeLines \
- XF86VidModeDeleteModeLine \
- XF86VidModeModModeLine \
- XF86VidModeSwitchMode \
- XF86VidModeSwitchToMode \
- XF86VidModeLockModeSwitch \
- XF86VidModeGetMonitor \
- XF86VidModeGetViewPort \
- XF86VidModeSetViewPort \
- XF86VidModeValidateModeLine \
- XF86VidModeSetClientVersion \
- XF86VidModeGetDotClocks \
- XF86VidModeGetGamma \
- XF86VidModeSetGamma \
- XF86VidModeSetGammaRamp \
- XF86VidModeGetGammaRamp \
- XF86VidModeGetGammaRampSize \
- XF86VidModeGetPermissions
-XF86VM_shadowmen = $(XF86VM_shadows:=.@LIB_MAN_SUFFIX@)
-$(XF86VM_shadowmen):
- $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/XF86VM.$(LIB_MAN_SUFFIX)" > $@
diff --git a/man/XF86VidModeDeleteModeLine.man b/man/XF86VidModeDeleteModeLine.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeDeleteModeLine.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeGetAllModeLines.man b/man/XF86VidModeGetAllModeLines.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeGetAllModeLines.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeGetDotClocks.man b/man/XF86VidModeGetDotClocks.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeGetDotClocks.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeGetGamma.man b/man/XF86VidModeGetGamma.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeGetGamma.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeGetGammaRamp.man b/man/XF86VidModeGetGammaRamp.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeGetGammaRamp.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeGetGammaRampSize.man b/man/XF86VidModeGetGammaRampSize.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeGetGammaRampSize.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeGetModeLine.man b/man/XF86VidModeGetModeLine.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeGetModeLine.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeGetMonitor.man b/man/XF86VidModeGetMonitor.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeGetMonitor.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeGetPermissions.man b/man/XF86VidModeGetPermissions.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeGetPermissions.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeGetViewPort.man b/man/XF86VidModeGetViewPort.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeGetViewPort.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeLockModeSwitch.man b/man/XF86VidModeLockModeSwitch.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeLockModeSwitch.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeModModeLine.man b/man/XF86VidModeModModeLine.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeModModeLine.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeQueryExtension.man b/man/XF86VidModeQueryExtension.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeQueryVersion.man b/man/XF86VidModeQueryVersion.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeQueryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeSetClientVersion.man b/man/XF86VidModeSetClientVersion.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeSetClientVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeSetGamma.man b/man/XF86VidModeSetGamma.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeSetGamma.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeSetGammaRamp.man b/man/XF86VidModeSetGammaRamp.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeSetGammaRamp.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeSetViewPort.man b/man/XF86VidModeSetViewPort.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeSetViewPort.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeSwitchMode.man b/man/XF86VidModeSwitchMode.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeSwitchMode.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeSwitchToMode.man b/man/XF86VidModeSwitchToMode.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeSwitchToMode.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
diff --git a/man/XF86VidModeValidateModeLine.man b/man/XF86VidModeValidateModeLine.man
new file mode 100644
index 0000000..cf4cb48
--- /dev/null
+++ b/man/XF86VidModeValidateModeLine.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__libmansuffix__
commit 01df17daf923b7eeeb3476149d189c5dc8da3bf8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 8 15:50:02 2010 -0700
Use make rules instead of shell for loops to generate shadow man pages
Allows parallel make and simpler build logs/error reporting
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index e0c5cb7..0fc1db8 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,14 +27,14 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
libman_PRE = XF86VM.man
-BUILT_SOURCES = shadows.DONE
+BUILT_SOURCES = $(XF86VM_shadowmen)
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(XF86VM_shadows:=.@LIB_MAN_SUFFIX@)
+ $(XF86VM_shadowmen)
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
@@ -67,8 +67,6 @@ XF86VM_shadows = \
XF86VidModeGetGammaRampSize \
XF86VidModeGetPermissions
-shadows.DONE:
- -rm -f $(XF86VM_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(XF86VM_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86VM.$(LIB_MAN_SUFFIX) > $$i; \
- done)
+XF86VM_shadowmen = $(XF86VM_shadows:=.@LIB_MAN_SUFFIX@)
+$(XF86VM_shadowmen):
+ $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/XF86VM.$(LIB_MAN_SUFFIX)" > $@
commit a3603591f3086f7aeb92b193b2736733b4e79047
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 8 15:37:15 2010 -0700
config: upgrade to util-macros 1.8 for additional man page support
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
The existing statement can now be removed from the configuration file.
Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
Enables silent rule and use platform appropriate version of sed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 0625a9f..5e3c565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,10 +4,10 @@ AC_INIT(libXxf86vm, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=x
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(src/config.h)
diff --git a/man/Makefile.am b/man/Makefile.am
index 5ca33d1..e0c5cb7 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -36,24 +36,11 @@ CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(XF86VM_shadows:=.@LIB_MAN_SUFFIX@)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
- -e 's/__xservername__/Xorg/g' \
- -e 's/__xconfigfile__/xorg.conf/g' \
- -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \
- -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' \
- -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g'
-
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
commit 6be94fa76ef3e2c41c7cb8487e639f0312d3b369
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu Jul 1 07:10:51 2010 -0300
Purge macros NEED_EVENTS and NEED_REPLIES
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index 83512ca..d924e2a 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -30,8 +30,6 @@ from Kaleb S. KEITHLEY.
/* THIS IS NOT AN X CONSORTIUM STANDARD */
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/xf86vmproto.h>
#include <X11/extensions/xf86vmode.h>
commit 15319d63a389bd9af1819f53a2d021edcd6180f2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 16:50:34 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 8b796ea..0625a9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT(libXxf86vm, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit a3ed63ba72d767371174d1442c810144b0d2f8b7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 14:53:49 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index c91951b..82d138d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xxf86vm.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xxf86vm.pc.in
.PHONY: ChangeLog INSTALL
commit 02155a7f70ad94026a7c138081c4249cffbc25a7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 14 10:15:23 2010 -0500
COPYING: fix copyright notice incorrect format
Refer to: XF86VMode.c
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index d3a078d..ef81e65 100644
--- a/COPYING
+++ b/COPYING
@@ -1,10 +1,25 @@
-Copyright (c) 1995 Kaleb S. Keithley
-All Rights Reserved.
+Copyright (c) 1995 Kaleb S. KEITHLEY
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicence, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL KALEB S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of Kaleb S. Keithley shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Kaleb S. Keithley.
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from Kaleb S. KEITHLEY.
commit eba6628379b65326453ea12ddd8cb33b144f3049
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 14 20:55:56 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 6347735..5ca33d1 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,27 +1,24 @@
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
#
libmandir = $(LIB_MAN_DIR)
commit 0d976427d1229b65baa489275c62e47762b2803e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Nov 27 20:56:05 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index 7b0f1f2..c91951b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xxf86vm.pc
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xxf86vm.pc.in
.PHONY: ChangeLog INSTALL
commit e9fd67ec28d4402a498af78f34815cc9d22d6c73
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:10 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
diff --git a/Makefile.am b/Makefile.am
index c4f3c47..7b0f1f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,12 @@ pkgconfig_DATA = xxf86vm.pc
EXTRA_DIST = xxf86vm.pc.in
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
commit d7cc1a08bfc5c780d0a4f3e0193ff91d0076713c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Oct 27 15:07:26 2009 -0400
Deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
diff --git a/configure.ac b/configure.ac
index 738e03a..8b796ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,14 +5,15 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(src/config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext [xf86vidmodeproto >= 2.2.99.1])
commit 2bb8c8fcabebf00fdc12b2649459b920e816f382
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 26 22:08:43 2009 -0400
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
diff --git a/Makefile.am b/Makefile.am
index bf8f1e2..c4f3c47 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,7 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xxf86vm.pc
-EXTRA_DIST = xxf86vm.pc.in ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+EXTRA_DIST = xxf86vm.pc.in
.PHONY: ChangeLog
commit 9888ab7cf91cc4c7bf2a545ebc3b8bf0a002aa39
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Oct 22 12:34:19 2009 -0400
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/.gitignore b/.gitignore
index bff2b2e..82878c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,78 @@
-.deps
-.libs
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
compile
config.guess
config.h
config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
config.sub
configure
+configure.scan
depcomp
+.deps/
+INSTALL
install-sh
+.libs/
libtool
+libtool.m4
ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
Makefile
Makefile.in
+mdate-sh
missing
mkinstalldirs
-stamp-h1
-xxf86vm.pc
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-*.3
-*.o
-*.la
-*.lo
-libXxf86vm-*.tar.*
-ChangeLog
-tags
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for libXxf86vm
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
Reply to: