libxrandr: Changes to 'debian-unstable'
.gitignore | 72 +++++++--
COPYING | 45 +++++
ChangeLog | 272 ++++++++++++++++++++++++++++++++++
Makefile.am | 10 -
configure.ac | 24 +--
debian/changelog | 11 +
debian/control | 4
debian/copyright | 28 +++
debian/rules | 2
include/X11/extensions/Xrandr.h | 1
man/Makefile.am | 114 +++++---------
man/XRRConfigCurrentConfiguration.man | 1
man/XRRConfigCurrentRate.man | 1
man/XRRConfigRates.man | 1
man/XRRConfigRotations.man | 1
man/XRRConfigSizes.man | 1
man/XRRConfigTimes.man | 1
man/XRRFreeScreenConfigInfo.man | 1
man/XRRGetScreenInfo.man | 1
man/XRRQueryExtension.man | 1
man/XRRQueryVersion.man | 1
man/XRRRootToScreen.man | 1
man/XRRSelectInput.man | 1
man/XRRSetScreenConfig.man | 1
man/XRRSetScreenConfigAndRate.man | 1
man/Xrandr.man | 3
src/Makefile.am | 6
src/Xrandrint.h | 2
src/XrrConfig.c | 3
src/XrrCrtc.c | 13 -
src/XrrProperty.c | 2
31 files changed, 505 insertions(+), 121 deletions(-)
New commits:
commit 8a116d479cd5d8593c01ddc59b65f2f11b70a6a6
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 11:43:19 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 7da0324..eb8e6ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxrandr (2:1.3.1-1) UNRELEASED; urgency=low
+libxrandr (2:1.3.1-1) unstable; urgency=low
* New upstream release.
* Bump xutils-dev build-dep for new macros.
@@ -7,7 +7,7 @@ libxrandr (2:1.3.1-1) UNRELEASED; urgency=low
* Exclude libXrandr.la from dh_install accordingly.
* Add myself to Uploaders.
- -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:38:07 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:43:13 +0100
libxrandr (2:1.3.0-3) unstable; urgency=low
commit 9f73a847d47c7e0beeec7a7a362393f166526acf
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 11:43:11 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index c4b39ff..7da0324 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxrandr (2:1.3.1-1) UNRELEASED; urgency=low
* Update debian/copyright from upstream COPYING.
* Switch from --list-missing to --fail-missing for additional safety.
* Exclude libXrandr.la from dh_install accordingly.
+ * Add myself to Uploaders.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:38:07 +0100
diff --git a/debian/control b/debian/control
index b456055..02f9750 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libxrandr
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
libx11-dev (>= 1:0.99.2),
commit 173439a7c4821839422a54cd697c820130ca3bfd
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 11:42:43 2010 +0100
Exclude libXrandr.la from dh_install accordingly.
diff --git a/debian/changelog b/debian/changelog
index 0451607..c4b39ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxrandr (2:1.3.1-1) UNRELEASED; urgency=low
* Bump xutils-dev build-dep for new macros.
* Update debian/copyright from upstream COPYING.
* Switch from --list-missing to --fail-missing for additional safety.
+ * Exclude libXrandr.la from dh_install accordingly.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:38:07 +0100
diff --git a/debian/rules b/debian/rules
index 73aff0f..eda03d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --fail-missing
+ dh_install --sourcedir=debian/tmp --fail-missing -XlibXrandr.la
dh_installchangelogs ChangeLog
dh_installman
dh_link
commit 996d79b983a36b94f764f3e67df53bc850528c0b
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 11:40:57 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index 2492db7..0451607 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxrandr (2:1.3.1-1) UNRELEASED; urgency=low
* New upstream release.
* Bump xutils-dev build-dep for new macros.
* Update debian/copyright from upstream COPYING.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:38:07 +0100
diff --git a/debian/rules b/debian/rules
index f7680d3..73aff0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs ChangeLog
dh_installman
dh_link
commit 9cc2cdef5334781e475b5a35a5a18c60b639192e
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 11:39:30 2010 +0100
Update debian/copyright from upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index f514eb7..2492db7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxrandr (2:1.3.1-1) UNRELEASED; urgency=low
* New upstream release.
* Bump xutils-dev build-dep for new macros.
+ * Update debian/copyright from upstream COPYING.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:38:07 +0100
diff --git a/debian/copyright b/debian/copyright
index cfe695f..d6ec44b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,6 @@
This package was downloaded from
http://xorg.freedesktop.org/releases/individual/lib/
-Authors: Jim Gettys, HP Labs, HP.
- Keith Packard, Intel Corporation.
-
Copyright © 2000, Compaq Computer Corporation,
Copyright © 2002, Hewlett Packard, Inc.
@@ -24,7 +21,9 @@ 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.
-Copyright © 2006 Keith Packard
+Copyright © 2000 Compaq Computer Corporation, Inc.
+Copyright © 2002 Hewlett-Packard Company, Inc.
+Copyright © 2006 Intel Corporation
Copyright © 2008 Red Hat, Inc.
Permission to use, copy, modify, distribute, and sell this software and its
@@ -45,3 +44,24 @@ 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.
+Copyright © 2000 Compaq Computer Corporation, Inc.
+Copyright © 2002 Hewlett Packard Company, Inc.
+Copyright © 2006 Keith Packard
+
+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 the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holders make no representations
+about the suitability of this software for any purpose. It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS 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.
commit 71ea8d5fe2bc2246952e1bd1f99e20cea1c1287f
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 11:38:47 2010 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index cd8268c..f514eb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxrandr (2:1.3.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:38:07 +0100
diff --git a/debian/control b/debian/control
index f5a4b85..b456055 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev
+ xutils-dev (>= 1:7.5+4),
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxrandr
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxrandr.git
commit 04bf804069026c0859b85aa90a06e52f3525ab01
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 19 11:38:20 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 668c4d4..5545274 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,275 @@
+commit b7e31c69d345d3cba359d7648c304cff43ff7437
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 28 12:34:26 2010 -0700
+
+ libXrandr 1.3.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f490ed44a1c85c75183d87d034b94f9973b88abd
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 28 12:30:27 2010 -0700
+
+ Fix configure.ac comment for RandR instead of Render
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 95cf69bd452db86b6aefe3837e1f7010ebf21e80
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 28 12:27:30 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 12f22e0ae0cbd748b416c7e2486f289f89c5c77c
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:30:03 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 247ad2a3865ba503e6c77444f855c71e7a210f13
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Aug 17 07:57:08 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>
+
+commit 8f23ad4703c7fcfdd7d53d52ddebb7590c3cb265
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jul 8 14:40:39 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>
+
+commit 82bc24d6137cc4f03944af88e69c4d67b26d3cc9
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jul 8 14:34:18 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>
+
+commit 2e5c60f477fc68634f1fa31a2fc4a166642ab318
+Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
+Date: Thu Jul 1 07:01:47 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>
+
+commit 18517a55d08cdcf9e29bed6761cf4311e1d4109f
+Author: Leif Middelschulte <leif.middelschulte@gmail.com>
+Date: Tue May 25 14:52:50 2010 -0300
+
+ Add parameter safety check
+
+ As mentioned in bugzilla ticket 28150.
+ Calling '_XRRValidateCache' with 'improper' arguments results in a SEGV.
+ This patch adds a parameter validation to the mentioned function.
+
+ Signed-off-by: Leif Middelschulte <leif.middelschulte@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 7a7bac907ac15033c0ddb979202c7f3ddc368726
+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>
+
+commit 883acff30b23c2bdf446988ff7b780cd61e49a5e
+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>
+
+commit 74bb9072015b8a785f6b6458ba0605287a1ffcaf
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Feb 16 10:37:21 2010 -0500
+
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 449d22180549d990ad3164c98b22968359b55df2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 14 09:41:26 2010 -0500
+
+ COPYING: add missing copyright notices
+
+ Refer to: Xrandr.h XrrConfig.c
+ Copyright © 2006 Intel Corporation
+ Copyright © 2008 Red Hat, Inc.
+ Copyright © 2006 Keith Packard
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 51887f07a7722576933ddcc00c5380266d6fa37c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jan 14 21:02:20 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit cd6fcaeaf0da7ca66ec0ab63ce282def37c21c3b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Nov 27 20:56:04 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 61c4a57286b601ff266a15565740aea31e68d1bb
+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.
+
+commit 170a3efb274d473165a8d6085c185792b1c43005
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Oct 27 15:07:25 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.
+
+commit 8567a45cb36857a8b5e2699a3d3ed7850b053281
+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.
+
+commit 015687dbec93d954fb18981bc6e15937a206a4b7
+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.
+
+commit 2e07e9d4f300e8153e4e93cd78bc51e0d91dba6f
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Nov 9 17:51:03 2009 -0500
+
+ GetCrtcGamma: Fix error handling.
+
+ We didn't treat _XReply failure as fatal. Parsing an xError as a gamma
+ ramp reply doesn't work that often.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 7b41b589213293793182b61f20006229a89d5ba7
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Nov 9 17:50:42 2009 -0500
+
+ GetCrtcGammaSize: Return 0, not garbage, on failure
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 5e94f071f45ca504ccafe083e2e289351ba6eab4
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Nov 9 17:49:40 2009 -0500
+
+ GetScreenSizeRange: Document funky return code in the header
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit f98cbea8b33356a0de1f777c3a862ecbf163cfd3
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Nov 9 17:49:10 2009 -0500
+
+ SetScreenConfigAndRate: Document error handling better
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit a8af918c0db758a667345b7c3055075124197f6c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Nov 9 17:48:22 2009 -0500
+
+ GetOutputProperty: Return the error code, not BadRequest
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 7f463b2a2221065c03b6122c0cffd2fa5cb13427
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Oct 21 12:47:26 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
commit e3036766916d55d0c8ae72d5752fd1699ae7390d
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Mar 6 15:13:56 2009 +0100
diff --git a/debian/changelog b/debian/changelog
index 7c94fef..cd8268c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxrandr (2:1.3.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 19 Nov 2010 11:38:07 +0100
+
libxrandr (2:1.3.0-3) unstable; urgency=low
[ Timo Aaltonen ]
commit b7e31c69d345d3cba359d7648c304cff43ff7437
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 28 12:34:26 2010 -0700
libXrandr 1.3.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 09fb306..773f4b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,8 @@ dnl try to keep these the same. Note that the library has an extra
dnl digit in the version number to track changes which don't affect the
dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXrandr, 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
+AC_INIT([libXrandr], [1.3.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXrandr])
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit f490ed44a1c85c75183d87d034b94f9973b88abd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 28 12:30:27 2010 -0700
Fix configure.ac comment for RandR instead of Render
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 29f509a..09fb306 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
dnl
-dnl Version should match the current Render version. XRenderQueryVersion
+dnl Version should match the current Randr version. XRRQueryVersion
dnl returns the version from randr.h, NOT the version we set here. But we
dnl try to keep these the same. Note that the library has an extra
dnl digit in the version number to track changes which don't affect the
commit 95cf69bd452db86b6aefe3837e1f7010ebf21e80
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 28 12:27:30 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 5e7f29c..f3bc1b8 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 12f22e0ae0cbd748b416c7e2486f289f89c5c77c
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:30:03 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/Xrandr.man b/man/Xrandr.man
index f5b1034..23a3970 100644
--- a/man/Xrandr.man
+++ b/man/Xrandr.man
@@ -1,7 +1,4 @@
.\"
-.\" $XFree86: xc/lib/Xrandr/Xrandr.man,v 1.7 2003/08/04 10:32:21 eich Exp $
-.\" $XdotOrg: xc/lib/Xrandr/Xrandr.man,v 1.2 2004/04/23 18:43:47 eich Exp $
-.\"
.\" Copyright 2002 Hewlett-Packard Company.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
.\" documentation for any purpose is hereby granted without fee, provided that
commit 247ad2a3865ba503e6c77444f855c71e7a210f13
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Aug 17 07:57:08 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 7370502..5e7f29c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -23,42 +23,33 @@
libmandir = $(LIB_MAN_DIR)
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-
-libman_PRE = Xrandr.man
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(Xrandr_shadowmen)
-
-BUILT_SOURCES = $(Xrandr_shadowmen)
+libman_PRE = \
+ Xrandr.man \
+ $(Xrandr_shadows:=.man)
+
+Xrandr_shadows = \
+ XRRQueryExtension \
+ XRRQueryVersion \
+ XRRGetScreenInfo \
+ XRRFreeScreenConfigInfo \
+ XRRSetScreenConfig \
+ XRRSetScreenConfigAndRate \
+ XRRConfigRotations \
+ XRRConfigTimes \
+ XRRConfigSizes \
+ XRRConfigRates \
+ XRRConfigCurrentConfiguration \
+ XRRConfigCurrentRate \
+ XRRRootToScreen \
+ XRRSelectInput
+
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
EXTRA_DIST = $(libman_PRE)
-
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(libman_DATA)
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-
-Xrandr_shadows = \
- XRRQueryExtension \
- XRRQueryVersion \
- XRRGetScreenInfo \
- XRRFreeScreenConfigInfo \
- XRRSetScreenConfig \
- XRRSetScreenConfigAndRate \
- XRRConfigRotations \
- XRRConfigTimes \
- XRRConfigSizes \
- XRRConfigRates \
- XRRConfigCurrentConfiguration \
- XRRConfigCurrentRate \
- XRRRootToScreen \
- XRRSelectInput
-
-Xrandr_shadowmen = $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@)
-$(Xrandr_shadowmen):
- $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/Xrandr.$(LIB_MAN_SUFFIX)" > $@
diff --git a/man/XRRConfigCurrentConfiguration.man b/man/XRRConfigCurrentConfiguration.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRConfigCurrentConfiguration.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRConfigCurrentRate.man b/man/XRRConfigCurrentRate.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRConfigCurrentRate.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRConfigRates.man b/man/XRRConfigRates.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRConfigRates.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRConfigRotations.man b/man/XRRConfigRotations.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRConfigRotations.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRConfigSizes.man b/man/XRRConfigSizes.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRConfigSizes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRConfigTimes.man b/man/XRRConfigTimes.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRConfigTimes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRFreeScreenConfigInfo.man b/man/XRRFreeScreenConfigInfo.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRFreeScreenConfigInfo.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRGetScreenInfo.man b/man/XRRGetScreenInfo.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRGetScreenInfo.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRQueryExtension.man b/man/XRRQueryExtension.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRQueryVersion.man b/man/XRRQueryVersion.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRQueryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRRootToScreen.man b/man/XRRRootToScreen.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRRootToScreen.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRSelectInput.man b/man/XRRSelectInput.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRSelectInput.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRSetScreenConfig.man b/man/XRRSetScreenConfig.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRSetScreenConfig.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
diff --git a/man/XRRSetScreenConfigAndRate.man b/man/XRRSetScreenConfigAndRate.man
new file mode 100644
index 0000000..e02ca38
--- /dev/null
+++ b/man/XRRSetScreenConfigAndRate.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__libmansuffix__
commit 8f23ad4703c7fcfdd7d53d52ddebb7590c3cb265
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 8 14:40:39 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 b10470b..7370502 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -28,9 +28,9 @@ LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
libman_PRE = Xrandr.man
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@)
+ $(Xrandr_shadowmen)
-BUILT_SOURCES = shadows.DONE
+BUILT_SOURCES = $(Xrandr_shadowmen)
EXTRA_DIST = $(libman_PRE)
@@ -59,8 +59,6 @@ Xrandr_shadows = \
XRRRootToScreen \
XRRSelectInput
-shadows.DONE:
- -rm -f $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xrandr.$(LIB_MAN_SUFFIX) > $$i; \
- done)
+Xrandr_shadowmen = $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@)
+$(Xrandr_shadowmen):
+ $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/Xrandr.$(LIB_MAN_SUFFIX)" > $@
commit 82bc24d6137cc4f03944af88e69c4d67b26d3cc9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 8 14:34:18 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 6e350df..29f509a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,10 +35,10 @@ AC_CONFIG_AUX_DIR(.)
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(config.h)
diff --git a/man/Makefile.am b/man/Makefile.am
index 4166709..b10470b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -36,20 +36,10 @@ EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
- -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g'
-
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 2e5c60f477fc68634f1fa31a2fc4a166642ab318
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu Jul 1 07:01:47 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/Xrandrint.h b/src/Xrandrint.h
index 75e38c9..7fb5831 100644
--- a/src/Xrandrint.h
+++ b/src/Xrandrint.h
@@ -25,8 +25,6 @@
#ifndef _XRANDRINT_H_
#define _XRANDRINT_H_
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
#include <X11/extensions/Xext.h>
commit 18517a55d08cdcf9e29bed6761cf4311e1d4109f
Author: Leif Middelschulte <leif.middelschulte@gmail.com>
Date: Tue May 25 14:52:50 2010 -0300
Add parameter safety check
As mentioned in bugzilla ticket 28150.
Calling '_XRRValidateCache' with 'improper' arguments results in a SEGV.
This patch adds a parameter validation to the mentioned function.
Signed-off-by: Leif Middelschulte <leif.middelschulte@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/XrrConfig.c b/src/XrrConfig.c
index 34ff3ef..793d8b6 100644
--- a/src/XrrConfig.c
+++ b/src/XrrConfig.c
@@ -105,7 +105,7 @@ static XRRScreenConfiguration *_XRRValidateCache (Display *dpy,
XRRScreenConfiguration **configs;
XRandRInfo *xrri;
- if (XextHasExtension(info)) {
+ if ((screen >= 0) && (screen < ScreenCount(dpy)) && XextHasExtension(info)) {
xrri = (XRandRInfo *) info->data;
configs = xrri->config;
commit 7a7bac907ac15033c0ddb979202c7f3ddc368726
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
Reply to: