xgamma 1.0.2

app/xgamma/COPYING

@@ -1,12 +1,46 @@
-This is a stub file.  This package has not yet had its complete licensing
+Copyright 1999  by The XFree86 Project, Inc.
-information compiled.  Please see the individual source files for details on
+All Rights Reserved.
-your rights to use and modify this software.
 
-Please submit updated COPYING files to the Xorg bugzilla:
+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:
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-All licensing questions regarding this software should be directed at the
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-Xorg mailing list:
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
+THE XFREE86 PROJECT 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.
 
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of The XFree86 Project 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 XFree86 Project.
+
+------------------------------------------------------------------------------
+Copyright 2005  Red Hat, Inc.
+
+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, and that the name of Red Hat not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Red Hat makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.

app/xgamma/ChangeLog

@@ -1,30 +1,193 @@
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit fd48b87c3694d037fc8c1b9f3056677e57fd17ab
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Aug 6 18:52:14 2007 -0700
 
-	* configure.ac:
+    Version bump: 1.0.2
-	Update package version for X11R7 release.
 
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 3d7b3e1ebcb3f14fcf5f5b7358177fe72f48291a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Aug 6 18:46:32 2007 -0700
 
-	* configure.ac:
+    Replace COPYING stub with actual copyright/license info.
-	Update package version number for final X11R7 release candidate.
 
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 534c77b8a405fd178283e4fa8d7eb797b5966cbc
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Aug 6 18:42:01 2007 -0700
 
-	* Makefile.am:
+    Replace static ChangeLog with dist-hook to generate from git log
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit eff5594f8f68913db9ac60c9b38ec711823052ae
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Aug 6 18:39:38 2007 -0700
 
-	* configure.ac:
+    Change xgamma_CFLAGS to AM_CFLAGS to make automake-1.10 happier
-	Update package version number for X11R7 RC3 release.
     
-2005-11-19  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Makefile.am:27: compiling `xgamma.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
 
-	* configure.ac:
+commit 52251cd5c6e70a1cc3b037e976da4c8a7d8d4d5b
-	Update dependencies to work with separate build roots.
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri May 18 23:57:13 2007 -0700
 
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    X.Org Bug #10616: xgamma man page describes how to print gamma poorly
     
-	* configure.ac:
+    X.Org Bugzilla #10616: <https://bugs.freedesktop.org/show_bug.cgi?id=10616>
-	Update package version number for RC1 release.
+    Reported upstream from
+    Debian bug #296201 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=296021>
 
+commit 5453c3e32e6efb579ca407134333ffc98c0cce3a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri May 18 23:54:52 2007 -0700
+
+    renamed: .cvsignore -> .gitignore
+
+commit 3527597ef5b7a833568b69d84693c2f2c18c99ed
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 21 02:29:50 2005 +0000
+
+    Update package version for X11R7 release.
+
+commit c9bed158c8ec214e441dedf0fce8b070454f4f0d
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:22:44 2005 +0000
+
+    Stub COPYING files
+
+commit f2ccdd5afd59a807cb38d4a0f79070238cc3f4b8
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:07 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 69b8ad10dbc8108b54ae7a7a4883aea44fc92da1
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:22 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit c1b80f5de70f7f082279d681d6dc6c3cde82fac3
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:23 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit ab57eeffdc4a36c4da74c481ef554a045e00668a
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 28 22:01:42 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 bb461e96e050e4186b0301bf7677ac503b4d9914
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:35:01 2005 +0000
+
+    Another pass at .cvsignores for apps.
+
+commit 759a0cef5de977a0940a2df707b209d778c8e2d7
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Sun Nov 20 22:08:52 2005 +0000
+
+    Add/improve .cvsignore files for apps.
+
+commit a6e95476fad3b0fa51fe56e69ceb2e21e481ac66
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Nov 19 07:15:36 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 3680097626a96aaacbb09b78bbe10a18893863cc
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:47:54 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 0251a5c704ef6062694a0cfc8e6d795b13ecb518
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 23:56:22 2005 +0000
+
+    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+        work better with BSD make
+
+commit e57db1a767c48697fc879b8fb13dff8f8431e2ca
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Oct 14 00:25:45 2005 +0000
+
+    Use sed to fill in variables in man page
+
+commit 0cae2b96bff11e4926e5334416679602fd58e83d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Aug 1 20:25:30 2005 +0000
+
+    Install man pages to section 1 instead of section m (Patch from Donnie
+        Berkholz)
+
+commit 2ccb349fb788572a094bee33de4c62c49724ea4b
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:34 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 2bcdc37be05069c0fc5d3c9381d5ad65839a27ea
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Wed Jul 20 19:31:56 2005 +0000
+
+    Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+        configure cache, you cache it, and the cached value is probably wrong.
+
+commit 0e0ad15de21add08bffc4379bde7cb0cf7e77b74
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Fri Jul 1 18:19:11 2005 +0000
+
+    Build system for xgamma
+
+commit f76ab59c4316564f3342e461c5c3fa22dd4b3241
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 19:54:48 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 57fac3d9878732736a47ff13fb9958ef8309a9c7
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:35:23 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit e752a63a88ce84f809e79382e5d9fa750f313704
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:13:08 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit b75dd258a9bd6e83dea2a91c87c302e391ea8f46
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:36:24 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit 830d0520c7b83a17293587c6271c4b560e629ba3
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:24:07 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 623ec47f62995d553fecbce1f4e01bd99b6090e7
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:49:22 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 83b8df8d51492e51eb148180306377c8b69d9dd6
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:49:22 2003 +0000
+
+    Initial revision

app/xgamma/Makefile.am

@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = xgamma
 
-xgamma_CFLAGS = $(XGAMMA_CFLAGS)
+AM_CFLAGS = $(XGAMMA_CFLAGS)
 xgamma_LDADD = $(XGAMMA_LIBS)
 
 xgamma_SOURCES =	\
@@ -35,9 +35,19 @@ appmandir = $(APP_MAN_DIR)
 
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
 CLEANFILES = $(appman_DATA)
 
+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
+
+
 SED = sed
 
 # Strings to replace in man pages

app/xgamma/configure.ac

@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xgamma,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xgamma)
+AC_INIT(xgamma,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xgamma)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

app/xgamma/xgamma.man

@@ -32,6 +32,14 @@ xgamma - Alter a monitor's gamma correction through the X server
 .B xgamma
 allows X users to query and alter the gamma correction of a monitor via
 the X video mode extension (XFree86-VidModeExtension).
+.PP
+If no value for the gamma correction is given via the
+.I -gamma 
+or 
+.IR -rgamma / -ggamma / -bgamma
+options,
+.B xgamma
+prints the current gamma correction of the display.
 .SH OPTIONS
 .PP
 .TP 8
@@ -56,10 +64,7 @@ Print out the `Usage:' command syntax summary.
 .B "-gamma f.f"
 The gamma correction can either be defined as a single value, or
 separately for the red, green and blue components. This argument
-specifies the gamma correction as a single value. If no value for
+specifies the gamma correction as a single value. 
-the gamma correction is given
-.B xgamma
-returns the current gamma correction of the display.
 .PP
 .TP 8
 .B "-rgamma f.f"