x11-xserver-utils: Changes to 'debian-experimental'
debian/changelog | 14
debian/control | 11
debian/patches/01_sessreg_implement_hostname_hashing.diff | 10
debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch | 56
debian/patches/04_xrandr-Fix-for-64bit-feed-a-pointer-to-the-right-size-vari.patch | 29
debian/patches/05_xrandr-update-the-manpage.patch | 270 --
debian/patches/06_xrandr-Manpage-typo-fixes.patch | 45
debian/patches/series | 4
debian/rules | 4
xrandr/ChangeLog | 340 +++
xrandr/Makefile.am | 18
xrandr/Makefile.in | 84
xrandr/aclocal.m4 | 79
xrandr/autogen.sh | 13
xrandr/config.guess | 6
xrandr/config.h.in | 33
xrandr/configure | 946 +++++++++-
xrandr/configure.ac | 12
xrandr/keystone.5c | 555 +++++
xrandr/xrandr.c | 730 ++++++-
xrandr/xrandr.man | 234 +-
21 files changed, 2854 insertions(+), 639 deletions(-)
New commits:
commit 9eeae543017416fa41121d002898837e20739fa3
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 16:06:47 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index d83d3ca..80e3c86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xserver-utils (7.3+6) UNRELEASED; urgency=low
+x11-xserver-utils (7.4+1) experimental; urgency=low
* Add support for parallel=n in DEB_BUILD_OPTIONS, and for actually building
the apps in parallel. Install is still sequential, at least for now.
@@ -16,7 +16,7 @@ x11-xserver-utils (7.3+6) UNRELEASED; urgency=low
debian/rules binary-arch (thanks, lintian!).
* Add Suggests on nickle and cairo-5c for the new xkeystone script.
- -- Julien Cristau <jcristau@debian.org> Sun, 03 Aug 2008 01:26:58 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 01 Feb 2009 16:06:42 +0100
x11-xserver-utils (7.3+5) unstable; urgency=low
commit 9258ad31f8fd214b1436e06a291c4cf162bbb1d4
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 16:01:30 2009 +0100
Add Suggests on nickle and cairo-5c for the new xkeystone script.
diff --git a/debian/changelog b/debian/changelog
index fd4e2f3..d83d3ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ x11-xserver-utils (7.3+6) UNRELEASED; urgency=low
* Drop -1 debian revisions from build-deps to make lintian happy.
* Sanitize order of dh_installdeb, dh_shlibdeps and dh_makeshlibs in
debian/rules binary-arch (thanks, lintian!).
+ * Add Suggests on nickle and cairo-5c for the new xkeystone script.
-- Julien Cristau <jcristau@debian.org> Sun, 03 Aug 2008 01:26:58 +0200
diff --git a/debian/control b/debian/control
index a851255..f340340 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,7 @@ Conflicts: iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrg
Replaces: xbase-clients (<< 1:7.3), xutils (<< 1:7.2),
iceauth, sessreg, xgamma, xhost, xmodmap, xrandr, xrdb, xrefresh, xrgb, xset,
xsetmode, xsetpointer, xsetroot, xstdcmap, xtrap, xvidtune
+Suggests: nickle, cairo-5c
Description: X server utilities
An X client is a program that interfaces with an X server (almost always via
the X libraries), and thus with some input and output hardware like a
commit fa3e8da5916b9368d022b70c2b9588cc072ca31f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 15:41:12 2009 +0100
Fix ordering of debhelper calls
Sanitize order of dh_installdeb, dh_shlibdeps and dh_makeshlibs in debian/rules
binary-arch (thanks, lintian!).
diff --git a/debian/changelog b/debian/changelog
index 69a79b2..fd4e2f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x11-xserver-utils (7.3+6) UNRELEASED; urgency=low
* Refresh 01_sessreg_implement_hostname_hashing.diff.
* Bump libxrandr-dev build-dep to 2:1.2.99.3.
* Drop -1 debian revisions from build-deps to make lintian happy.
+ * Sanitize order of dh_installdeb, dh_shlibdeps and dh_makeshlibs in
+ debian/rules binary-arch (thanks, lintian!).
-- Julien Cristau <jcristau@debian.org> Sun, 03 Aug 2008 01:26:58 +0200
diff --git a/debian/rules b/debian/rules
index 1e3bb62..fe8fbf3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,9 +93,9 @@ binary-arch: build install
dh_strip
dh_compress
dh_fixperms
- dh_installdeb
- dh_shlibdeps
dh_makeshlibs
+ dh_shlibdeps
+ dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
commit a9603bc7ac22da5e6ee16a9b7e638dd9649a56a7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 15:38:10 2009 +0100
Drop -1 debian revisions from build-deps to make lintian happy.
diff --git a/debian/changelog b/debian/changelog
index d4be54d..69a79b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11-xserver-utils (7.3+6) UNRELEASED; urgency=low
* Drop all xrandr patches (included upstream).
* Refresh 01_sessreg_implement_hostname_hashing.diff.
* Bump libxrandr-dev build-dep to 2:1.2.99.3.
+ * Drop -1 debian revisions from build-deps to make lintian happy.
-- Julien Cristau <jcristau@debian.org> Sun, 03 Aug 2008 01:26:58 +0200
diff --git a/debian/control b/debian/control
index 49ccaff..a851255 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-1),
- libxaw7-dev (>= 1:1.0.1-1), libxext-dev (>= 1:1.0.0-1),
- libxi-dev (>= 1:1.0.0-3), libxmuu-dev (>= 1:1.0.1-1),
- libxrandr-dev (>= 2:1.2.99.3), libxt-dev (>= 1:1.0.0-1),
- libxtrap-dev (>= 1:1.0.0-1), libxxf86vm-dev (>= 1:1.0.0-1), xbitmaps, quilt,
+Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0),
+ libxaw7-dev (>= 1:1.0.1), libxext-dev (>= 1:1.0.0),
+ libxi-dev (>= 1:1.0.0-3), libxmuu-dev (>= 1:1.0.1),
+ libxrandr-dev (>= 2:1.2.99.3), libxt-dev (>= 1:1.0.0),
+ libxtrap-dev (>= 1:1.0.0), libxxf86vm-dev (>= 1:1.0.0), xbitmaps, quilt,
x11proto-input-dev (>= 1.4), libxxf86misc-dev
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
commit a6ac975717c9f3b875d56b90123667922a2e421d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 15:30:00 2009 +0100
Bump libxrandr-dev build-dep to 2:1.2.99.3.
diff --git a/debian/changelog b/debian/changelog
index 3a5d9fc..d4be54d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x11-xserver-utils (7.3+6) UNRELEASED; urgency=low
* xrandr 1.2.99.4.
* Drop all xrandr patches (included upstream).
* Refresh 01_sessreg_implement_hostname_hashing.diff.
+ * Bump libxrandr-dev build-dep to 2:1.2.99.3.
-- Julien Cristau <jcristau@debian.org> Sun, 03 Aug 2008 01:26:58 +0200
diff --git a/debian/control b/debian/control
index 4b13a97..49ccaff 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.
Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-1),
libxaw7-dev (>= 1:1.0.1-1), libxext-dev (>= 1:1.0.0-1),
libxi-dev (>= 1:1.0.0-3), libxmuu-dev (>= 1:1.0.1-1),
- libxrandr-dev (>= 2:1.2.0-1), libxt-dev (>= 1:1.0.0-1),
+ libxrandr-dev (>= 2:1.2.99.3), libxt-dev (>= 1:1.0.0-1),
libxtrap-dev (>= 1:1.0.0-1), libxxf86vm-dev (>= 1:1.0.0-1), xbitmaps, quilt,
x11proto-input-dev (>= 1.4), libxxf86misc-dev
# Reasons for build-depends:
commit 8d18dcf7a20b448facef68ec8f3d7d46eb251bbe
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 15:27:37 2009 +0100
Refresh 01_sessreg_implement_hostname_hashing.diff.
diff --git a/debian/changelog b/debian/changelog
index c638a45..3a5d9fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11-xserver-utils (7.3+6) UNRELEASED; urgency=low
COPYING.
* xrandr 1.2.99.4.
* Drop all xrandr patches (included upstream).
+ * Refresh 01_sessreg_implement_hostname_hashing.diff.
-- Julien Cristau <jcristau@debian.org> Sun, 03 Aug 2008 01:26:58 +0200
diff --git a/debian/patches/01_sessreg_implement_hostname_hashing.diff b/debian/patches/01_sessreg_implement_hostname_hashing.diff
index 69787a4..84f2410 100644
--- a/debian/patches/01_sessreg_implement_hostname_hashing.diff
+++ b/debian/patches/01_sessreg_implement_hostname_hashing.diff
@@ -15,9 +15,9 @@ Not submitted to XFree86.
Index: sessreg/sessreg.c
===================================================================
---- sessreg/sessreg.c.orig 2005-10-18 19:45:25.000000000 -0400
-+++ sessreg/sessreg.c 2005-10-18 21:36:02.000000000 -0400
-@@ -182,6 +182,18 @@
+--- sessreg/sessreg.c.orig
++++ sessreg/sessreg.c
+@@ -96,6 +96,18 @@
const char *host, Time_t date, int addp);
#endif
@@ -36,7 +36,7 @@ Index: sessreg/sessreg.c
int wflag, uflag, lflag;
char *wtmp_file, *utmp_file, *line;
#ifdef USE_UTMPX
-@@ -469,21 +481,23 @@
+@@ -384,21 +396,23 @@
bzero (u->ut_name, sizeof (u->ut_name));
#ifdef SYSV
if (line) {
@@ -72,7 +72,7 @@ Index: sessreg/sessreg.c
bzero (u->ut_id, sizeof (u->ut_id));
if (addp) {
u->ut_pid = getppid ();
-@@ -722,3 +736,129 @@
+@@ -637,3 +651,129 @@
return freeslot;
}
#endif
commit 9511c67950cc2ce81158233f5012c165a781c69c
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 15:26:55 2009 +0100
Drop all xrandr patches (included upstream).
diff --git a/debian/changelog b/debian/changelog
index 3906ed9..c638a45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x11-xserver-utils (7.3+6) UNRELEASED; urgency=low
* Add sessreg copyright and license to debian/copyright, from sessreg's
COPYING.
* xrandr 1.2.99.4.
+ * Drop all xrandr patches (included upstream).
-- Julien Cristau <jcristau@debian.org> Sun, 03 Aug 2008 01:26:58 +0200
diff --git a/debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch b/debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch
deleted file mode 100644
index 47bebd0..0000000
--- a/debian/patches/03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 4dcc8ae1a6903434def1a2706f7c68ff9e2a17c4 Mon Sep 17 00:00:00 2001
-From: Hong Liu <hong.liu@intel.com>
-Date: Mon, 10 Mar 2008 21:37:09 -0700
-Subject: [PATCH] Move outputs among crtcs as necessary. Fixes 14570
-
-This patch makes new requests override existing crtc allocations. Outputs
-with restricted crtc usage can now force existing outputs to switch
-automatcially.
----
- xrandr.c | 9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/xrandr/xrandr.c b/xrandr/xrandr.c
-index e2a657f..41e15dd 100644
---- a/xrandr/xrandr.c
-+++ b/xrandr/xrandr.c
-@@ -1241,7 +1241,7 @@ mark_changing_crtcs (void)
- * Test whether 'crtc' can be used for 'output'
- */
- Bool
--check_crtc_for_output (crtc_t *crtc, output_t *output)
-+check_crtc_for_output (crtc_t *crtc, output_t *output, Bool ignore_state)
- {
- int c;
- int l;
-@@ -1272,6 +1272,9 @@ check_crtc_for_output (crtc_t *crtc, output_t *output)
- return False;
- }
-
-+ if (ignore_state)
-+ return True;
-+
- if (crtc->noutput)
- {
- /* make sure the state matches */
-@@ -1313,7 +1316,7 @@ find_crtc_for_output (output_t *output)
- crtc = find_crtc_by_xid (output->output_info->crtcs[c]);
- if (!crtc) fatal ("cannot find crtc 0x%x\n", output->output_info->crtcs[c]);
-
-- if (check_crtc_for_output (crtc, output))
-+ if (check_crtc_for_output (crtc, output, False))
- return crtc;
- }
- return NULL;
-@@ -1518,7 +1521,7 @@ pick_crtcs_score (output_t *outputs)
-
- /* reset crtc allocation for following outputs */
- disable_outputs (outputs);
-- if (!check_crtc_for_output (crtc, output))
-+ if (!check_crtc_for_output (crtc, output, True))
- continue;
-
- my_score = 1000;
---
-1.5.6.3
-
diff --git a/debian/patches/04_xrandr-Fix-for-64bit-feed-a-pointer-to-the-right-size-vari.patch b/debian/patches/04_xrandr-Fix-for-64bit-feed-a-pointer-to-the-right-size-vari.patch
deleted file mode 100644
index 2a2fdf7..0000000
--- a/debian/patches/04_xrandr-Fix-for-64bit-feed-a-pointer-to-the-right-size-vari.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3046799a06ecb79211ef0f4a2db9de4eec7233fb Mon Sep 17 00:00:00 2001
-From: Egbert Eich <eich@freedesktop.org>
-Date: Sun, 3 Aug 2008 13:24:49 +0200
-Subject: [PATCH] Fix for 64bit: feed a pointer to the right size variable to scanf().
-
-XID is unsigned long, however %x in scanf takes a pointer to an unsigned int.
-Thus with XID xid, a sscanf(..., "0x%x", &xid) will most likely produce the
-wrong results.
----
- xrandr.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/xrandr.c b/xrandr.c
-index 41e15dd..b1e133e 100644
---- a/xrandr/xrandr.c
-+++ b/xrandr/xrandr.c
-@@ -428,7 +428,8 @@ set_name_all (name_t *name, name_t *old)
- static void
- set_name (name_t *name, char *string, name_kind_t valid)
- {
-- XID xid;
-+ unsigned int xid; /* don't make it XID (which is unsigned long):
-+ scanf() takes unsigned int */
- int index;
-
- if ((valid & name_xid) && sscanf (string, "0x%x", &xid) == 1)
---
-1.5.6.3
-
diff --git a/debian/patches/05_xrandr-update-the-manpage.patch b/debian/patches/05_xrandr-update-the-manpage.patch
deleted file mode 100644
index 45630f5..0000000
--- a/debian/patches/05_xrandr-update-the-manpage.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-From 977275a13be0687efc3db1fd3763174ff1256210 Mon Sep 17 00:00:00 2001
-From: Eric Piel <E.A.B.Piel@tudelft.nl>
-Date: Sun, 10 Aug 2008 23:28:25 +0200
-Subject: [PATCH] update the manpage
-
-Describe all the options supported, including: --dryrun, -display,
---q1, --q12, and --rate for 1.1
-Describe all short and long version of the option.
-Use the usual man style for the option arugments.
-Move the four --*mode options out of the output section as they are
-independant of an output.
-Mention cvt for computing modelines.
-Gives some examples.
----
- xrandr.man | 143 +++++++++++++++++++++++++++++++++++++----------------------
- 1 files changed, 90 insertions(+), 53 deletions(-)
-
-diff --git a/xrandr.man b/xrandr.man
-index c6bbd42..ac29367 100644
---- a/xrandr/xrandr.man
-+++ b/xrandr/xrandr.man
-@@ -29,42 +29,46 @@ xrandr \- primitive command line interface to RandR extension
- [\-help] [\-display \fIdisplay\fP]
- [\-q] [\-v]
- [\-\-verbose]
-+[\-\-dryrun]
- [\-\-screen \fIsnum\fP]
-+[\-\-q1]
-+[\-\-q12]
- .br
- .B RandR version 1.2 options
- .br
- [\-\-prop]
--[\-\-fb <width>x<height>]
--[\-\-fbmm <width>x<height>]
--[\-\-dpi <dpi>]
-+[\-\-fb \fIwidth\fPx\fIheight\fP]
-+[\-\-fbmm \fIwidth\fPx\fIheight\fP]
-+[\-\-dpi \fIdpi\fP]
-+[\-\-newmode \fIname\fP \fImode\fP]
-+[\-\-rmmode \fIname\fP]
-+[\-\-addmode \fIoutput\fP \fIname\fP]
-+[\-\-delmode \fIoutput\fP \fIname\fP]
- .br
- .B Per-output options
- .br
--[\-\-output <output>]
-+[\-\-output \fIoutput\fP]
- [\-\-auto]
--[\-\-mode <mode>]
-+[\-\-mode \fImode\fP]
- [\-\-preferred]
--[\-\-pos <x>x<y>]
--[\-\-rate <rate>]
-+[\-\-pos \fIx\fPx\fIy\fP]
-+[\-\-rate \fIrate\fP]
- [\-\-reflect \fIreflection\fP]
- [\-\-rotate \fIorientation\fP]
--[\-\-left\-of <output>\]
--[\-\-right\-of <output>\]
--[\-\-above <output>\]
--[\-\-below <output>\]
--[\-\-same-as <output>\]
--[\-\-set <property> <value>]
-+[\-\-left\-of \fIoutput\fP\]
-+[\-\-right\-of \fIoutput\fP\]
-+[\-\-above \fIoutput\fP\]
-+[\-\-below \fIoutput\fP\]
-+[\-\-same-as \fIoutput\fP\]
-+[\-\-set \fIproperty\fP \fIvalue\fP]
- [\-\-off]
--[\-\-crtc <crtc>]
--[\-\-newmode <name> \fImode\fP]
--[\-\-rmmode <name>]
--[\-\-addmode <output> <name>]
--[\-\-delmode <output> <name>]
-+[\-\-crtc \fIcrtc\fP]
- .br
- .B RandR version 1.0 and version 1.1 options
- .br
- [\-o \fIorientation\fP]
- [\-s \fIsize\fP]
-+[\-r \fIrate\fP]
- [\-x] [\-y]
- .SH DESCRIPTION
- .I Xrandr
-@@ -79,57 +83,83 @@ There are a few global options. Other options modify the last output that is
- specified in earlier parameters in the command line. Multiple outputs may
- be modified at the same time by passing mutiple \-\-output options followed
- immediately by their corresponding modifying options.
--.IP \-\-help
-+.IP \-help
- Print out a summary of the usage and exit.
--.IP \-v
-+.IP "\-v, \-\-version"
- Print out the RandR version reported by the X server and exit.
- .IP \-\-verbose
--causes xrandr to be more verbose. When used with \-q (or without other
-+Causes xrandr to be more verbose. When used with \-q (or without other
- options), xrandr will display more information about the server state. When
- used along with options that reconfigure the system, progress will be
- reported while executing the configuration changes.
--.IP \-q
-+.IP "\-q, \-\-query"
- When this option is present, or when no configuration changes are requested,
--xrandr will display the current state of the system.
--.IP "\-screen \fIsnum\fP"
-+xrandr will display the current state of the system.
-+.IP "\-\-dryrun"
-+Performs all the actions specified excepted that not changes are made.
-+.IP "\-d, \-display \fIname\fP"
-+This option selects the X display to use. Note this refers to the X
-+screen abstraction, not the monitor (or output).
-+.IP "\-\-screen \fIsnum\fP"
- This option selects which screen to manipulate. Note this refers to the X
- screen abstraction, not the monitor (or output).
-+.IP \-\-q1
-+Forces the usage of the RandR version 1.1 protocol, even if a higher version
-+is available.
-+.IP \-\-q12
-+Forces the usage of the RandR version 1.2 protocol, even the display does not
-+report it as supported or a higher version is available.
- .SH "RandR version 1.2 options"
- These options are only available for X server supporting RandR version 1.2
- or newer.
--.IP \-\-prop
-+.IP "\-\-prop, \-\-properties"
- This option causes xrandr to display the contents of properties for each
- output. \-\-verbose also enables \-\-prop.
--.IP "\-\-fb <width>x<height>"
-+.IP "\-\-fb \fIwidth\fPx\fIheight\fP"
- Reconfigures the screen to the specified size. All configured monitors must
- fit within this size. When this option is not provided, xrandr computes the
- smallest screen size that will hold the set of configured outputs; this
- option provides a way to override that behaviour.
--.IP "\-\-fbmm <width>x<height>"
-+.IP "\-\-fbmm \fIwidth\fPx\fIheight\fP"
- Sets the reported values for the physical size of the screen. Normally,
- xrandr resets the reported physical size values to keep the DPI constant.
- This overrides that computation.
--.IP "\-\-dpi <dpi>"
-+.IP "\-\-dpi \fIdpi\fP"
- This also sets the reported physical size values of the screen, it uses the
- specified DPI value to compute an appropriate physical size using whatever
- pixel size will be set.
-+.IP "\-\-newmode \fIname\fP \fImode\fP"
-+New modelines can be added to the server and then associated with outputs.
-+This option does the former. The \fImode\fP is specified using the ModeLine
-+syntax for xorg.conf: hdisp hsyncstart hsyncend htotal vdisp vsyncstart
-+vsyncend vtotal \fIflags\fP. \fIflags\fP can be zero or more of +HSync,
-+-HSync, +VSync, -VSync, Interlace, DoubleScan, CSync, +CSync, -CSync. Several
-+tools permit to compute the usual modeline from a heigh, width, and refresh
-+rate, for instance you can use \fBcvt\fR.
-+.IP "\-\-rmmode \fIname\fP"
-+This removes a mode from the server if it is otherwise unused.
-+.IP "\-\-addmode \fIoutput\fP \fIname\fP"
-+Add a mode to the set of valid modes for an output.
-+.IP "\-\-delmode \fIoutput\fP \fIname\fP"
-+Remove a mode from the set of valid modes for an output.
- .PP
- .B "Per-output options"
--.IP "\-\-output <output>"
-+.IP "\-\-output \fIoutput\fP"
- Selects an output to reconfigure. Use either the name of the output or the
- XID.
- .IP \-\-auto
- For connected but disabled outputs, this will enable them using their
- preferred mode (or, something close to 96dpi if they have no preferred
- mode). For disconnected but enabled outputs, this will disable them.
--.IP "\-\-mode <mode>"
--This selects a mode. Use either the name or the XID for <mode>
-+.IP "\-\-mode \fImode\fP"
-+This selects a mode. Use either the name or the XID for \fImode\fP
- .IP "\-\-preferred"
- This selects the same mode as \-\-auto, but it doesn't automatically enable or
- disable the output.
--.IP "\-\-pos <x>x<y>"
--Position the output within the screen using pixel coordinates.
--.IP "\-\-rate <rate>"
-+.IP "\-\-pos \fIx\fPx\fIy\fP"
-+Position the output within the screen using pixel coordinates. In case reflection
-+or rotation is applied, the translation is applied after the effects.
-+.IP "\-\-rate \fIrate\fP"
- This marks a preference for refresh rates close to the specified value, when
- multiple modes have the same name, this will select the one with the nearest
- refresh rate.
-@@ -138,54 +168,61 @@ Reflection can be one of 'normal' 'x', 'y' or 'xy'. This causes the output
- contents to be reflected across the specified axes.
- .IP "\-\-rotate \fIrotation\fP"
- Rotation can be one of 'normal', 'left', 'right' or 'inverted'. This causes
--the output contents to be rotated in the specified direction.
--.IP "\-\-left\-of, \-\-right\-of, \-\-above, \-\-below, \-\-same-as <another output>"
-+the output contents to be rotated in the specified direction. 'right' specifies
-+a clockwise rotation of the picture and 'left' specifies a counter-clockwise
-+rotation.
-+.IP "\-\-left\-of, \-\-right\-of, \-\-above, \-\-below, \-\-same-as \fIanother-output\fP"
- Use one of these options to position the output relative to the position of
- another output. This allows convenient tiling of outputs within the screen.
- The position is always computed relative to the new position of the other
- output, so it is not valid to say \-\-output a \-\-left\-of b \-\-output
- b \-\-left\-of a.
--.IP "\-\-set <property> <value>"
-+.IP "\-\-set \fIproperty\fP \fIvalue\fP"
- Sets an output property. Integer properties may be specified as a valid
- (see \-\-prop) decimal or hexadecimal (with a leading 0x) value. Atom properties
- may be set to any of the valid atoms (see \-\-prop). String properties may be
- set to any value.
- .IP "\-\-off"
- Disables the output.
--.IP "\-\-crtc <crtc>"
-+.IP "\-\-crtc \fIcrtc\fP"
- Uses the specified crtc (either as an index in the list of CRTCs or XID).
- In normal usage, this option is not required as xrandr tries to make
- sensible choices about which crtc to use with each output. When that fails
- for some reason, this option can override the normal selection.
--.IP "\-\-newmode <name> \fImode\fP"
--New modelines can be added to the server and then associated with outputs.
--This option does the former. The \fImode\fP is specified using the ModeLine
--syntax for xorg.conf: hdisp hsyncstart hsyncend htotal vdisp vsyncstart
--vsyncend vtotal \fIflags\fP. \fIflags\fP can be zero or more of +HSync,
---HSync, +VSync, -VSync, Interlace, DoubleScan, CSync, +CSync, -CSync.
--.IP "\-\-rmmode <name>"
--This removes a mode from the server if it is otherwise unused.
--.IP "\-\-addmode <output> <name>"
--Add a mode to the set of valid modes for an output.
--.IP "\-\-delmode <output> <name>"
--Remove a mode from the set of valid modes for an output.
- .PP
- .SH "RandR version 1.1 options"
- These options are available for X servers supporting RandR version 1.1 or
- older. They are still valid for newer X servers, but they don't interact
- sensibly with version 1.2 options on the same command line.
--.IP "\-s <size index> or \-s <width>x<height>"
-+.IP "\-s, \-\-size \fIsize-index\fP or \-\-size \fIwidth\fPx\fIheight\fP"
- This sets the screen size, either matching by size or using the index into
- the list of available sizes.
--.IP "\-o \fIrotation\fP"
-+.IP "\-r, \-\-rate, \-\-refresh \fIrate\fP"
-+This sets the refresh rate closest to the specified value.
-+.IP "\-o, \-\-orientation \fIrotation\fP"
- This specifies the orientation of the screen,
- and can be one of normal, inverted, left or right.
- .IP \-x
- Reflect across the X axis.
- .IP \-y
- Reflect across the Y axis.
-+.SH EXAMPLES
-+Sets an output called LVDS to its preferred mode, and on its right put an
-+output called VGA to preferred mode of a screen which has been physically rotated clockwise:
-+.RS
-+xrandr --output LVDS --auto --rotate normal --pos 0x0 --output VGA --auto --rotate left --right-of LVDS
-+.RE
-+.PP
-+Forces to use a 1024x768 mode on an output called VGA:
-+.RS
-+xrandr --newmode "1024x768" 63.50 1024 1072 1176 1328 768 771 775 798 -hsync +vsync
-+.br
-+xrandr --addmode VGA 1024x768
-+.br
-+xrandr --output VGA --mode 1024x768
-+.RE
- .SH "SEE ALSO"
--Xrandr(3)
-+Xrandr(3), cvt(1)
- .SH AUTHORS
- Keith Packard,
- Open Source Technology Center, Intel Corporation.
---
-1.5.6.3
-
diff --git a/debian/patches/06_xrandr-Manpage-typo-fixes.patch b/debian/patches/06_xrandr-Manpage-typo-fixes.patch
deleted file mode 100644
index 4b76f47..0000000
--- a/debian/patches/06_xrandr-Manpage-typo-fixes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8ef4595aef15b7326822849a50c273f2a2b4ba30 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Fri, 15 Aug 2008 21:23:13 +0200
-Subject: [PATCH] Manpage typo fixes
-
----
- xrandr.man | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/xrandr.man b/xrandr.man
-index ac29367..9b6378c 100644
---- a/xrandr/xrandr.man
-+++ b/xrandr/xrandr.man
-@@ -96,7 +96,7 @@ reported while executing the configuration changes.
- When this option is present, or when no configuration changes are requested,
- xrandr will display the current state of the system.
- .IP "\-\-dryrun"
--Performs all the actions specified excepted that not changes are made.
-+Performs all the actions specified except that no changes are made.
- .IP "\-d, \-display \fIname\fP"
- This option selects the X display to use. Note this refers to the X
- screen abstraction, not the monitor (or output).
-@@ -107,8 +107,8 @@ screen abstraction, not the monitor (or output).
- Forces the usage of the RandR version 1.1 protocol, even if a higher version
- is available.
- .IP \-\-q12
--Forces the usage of the RandR version 1.2 protocol, even the display does not
--report it as supported or a higher version is available.
-+Forces the usage of the RandR version 1.2 protocol, even if the display does
-+not report it as supported or a higher version is available.
- .SH "RandR version 1.2 options"
- These options are only available for X server supporting RandR version 1.2
- or newer.
-@@ -134,7 +134,7 @@ This option does the former. The \fImode\fP is specified using the ModeLine
- syntax for xorg.conf: hdisp hsyncstart hsyncend htotal vdisp vsyncstart
- vsyncend vtotal \fIflags\fP. \fIflags\fP can be zero or more of +HSync,
- -HSync, +VSync, -VSync, Interlace, DoubleScan, CSync, +CSync, -CSync. Several
--tools permit to compute the usual modeline from a heigh, width, and refresh
-+tools permit to compute the usual modeline from a height, width, and refresh
- rate, for instance you can use \fBcvt\fR.
- .IP "\-\-rmmode \fIname\fP"
- This removes a mode from the server if it is otherwise unused.
---
-1.5.6.3
-
diff --git a/debian/patches/series b/debian/patches/series
index 543c5a7..3dcbcaf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,2 @@
01_sessreg_implement_hostname_hashing.diff -p0
02_xmodmap_manpage.diff
-03_xrandr-Move-outputs-among-crtcs-as-necessary.-Fixes-14570.patch
-04_xrandr-Fix-for-64bit-feed-a-pointer-to-the-right-size-vari.patch
-05_xrandr-update-the-manpage.patch
-06_xrandr-Manpage-typo-fixes.patch
commit 18aa05e26a01e9bad6b89f187c7792d5ab21779b
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 15:23:28 2009 +0100
xrandr 1.2.99.4.
diff --git a/debian/changelog b/debian/changelog
index 5aac990..3906ed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ x11-xserver-utils (7.3+6) UNRELEASED; urgency=low
* sessreg 1.0.4.
* Add sessreg copyright and license to debian/copyright, from sessreg's
COPYING.
+ * xrandr 1.2.99.4.
-- Julien Cristau <jcristau@debian.org> Sun, 03 Aug 2008 01:26:58 +0200
diff --git a/xrandr/ChangeLog b/xrandr/ChangeLog
index 824eda7..57cdc1f 100644
--- a/xrandr/ChangeLog
+++ b/xrandr/ChangeLog
@@ -1,3 +1,343 @@
+commit 880f045202d1e70368b855c3783604e19be946b8
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Feb 1 14:39:30 2009 +0100
+
+ Bump to 1.2.99.4
+
+commit 010dfc4bdd309256aecd006bb2b5b6937c2a119c
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Feb 1 14:34:15 2009 +0100
+
+ Document the --primary and --noprimary options
+
+commit 48014498d275a9aab986b4bf295538a5b38ddfeb
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Feb 1 14:12:21 2009 +0100
+
+ Document the --current option
+
+commit 909defc8a2b009ab845d875ba10e1ca01fb9d648
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Jan 30 20:37:34 2009 -0800
+
+ Add --noprimary option
+
+commit 6c70e0ee693ea293e8674d049249b462f3d36855
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Jan 30 20:11:10 2009 -0800
+
+ Add --primary option
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 77891e7900765a320ad3d43b56bbb1f3081b6582
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Jan 30 20:11:02 2009 -0800
+
+ Add --nograb option
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6f3e2bb207cff069791811ef2bbe7798759ed810
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Dec 9 21:26:50 2008 -0800
+
+ Add --current option to use new XRRGetScreenResourcesCurrent API
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d98d1f4055d8fbae1dc8d8c54467bfef21010694
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Fri Jan 30 17:46:05 2009 +0100
+
+ Several fatal() were missing \n.
+
+commit 9ea6e4210d49c13991a7d07e54f6f59e3dc8ce72
+Author: Éric Piel <E.A.B.Piel@tudelft.nl>
+Date: Mon Jan 19 16:18:46 2009 +0100
+
+ Add docs for --transform and --scale.
+
+ The new --transform and --scale options were added, but not yet
+ documented. This includes also an example of usage of panning and
+ scaling at the same time.
+
+commit 4d381d6a88fe147f8b6eabd765a2f42c6402d8c6
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Mon Jan 26 16:40:59 2009 -0200
+
+ Correct make distcheck and gcc/sparse warnings.
+
+commit 7509ecb290689e0b1d5e1000c9fbd312f1efb4ca
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date: Mon Jan 5 19:47:21 2009 +0100
+
+ Stay away from doublescan modes unless a refresh rate is specified.
+
+commit f77ad847c0d3f8f0c6e8ffbf0bec39e5e9c5ded0
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date: Mon Dec 22 19:46:24 2008 +0100
+
+ Fix gamma computation.
+
+ - The previous version sometimes overflowed.
+
+commit 5ddde7151841a8db99a2f38689a176114b2a45e5
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Thu Dec 18 16:09:39 2008 +0100
+
+ Print multiple Atom and INT32 properties.
+
+ Improve output formating of strings.
+
+commit 96af64f0de71f4149740b486baaefca744bb1bc1
+Author: Maarten Maathuis <madman2003@gmail.com>
+Date: Wed Dec 17 17:18:14 2008 +0100
+
+ randr-1.2: support gamma changes.
+
+commit 9b7a2a3d4ac7891bd5372a581e6a55a1c81497ef
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Mon Dec 15 20:39:43 2008 +0100
+
+ Bump to 1.2.99.3
+
+commit e80add8a407a9327bda209ff11a97dc3336e0cab
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Mon Dec 15 21:00:55 2008 +0100
+
+ Add keystone.5c to EXTRA_DIST
+
+commit c98591b0bf4753c4c075eccde6023ef644f8bf96
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Mon Dec 15 20:36:40 2008 +0100
+
+ Don't trash panning area, except if --panning or --fb is given.
+
+ Almost anything used to reduce the screen size to the current mode size, which
+ is counter-productive when panning is active.
+
+commit 8cb63b6df9e46e8b06a57cb54ad460355b604399
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Thu Dec 11 17:09:47 2008 +0100
+
+ Panning tracking areas describe full screen if set to 0. Use it as default.
+
+ Also improve reduced output on default tracking and borders.
+
+commit b5efbb31ec7c27895507add4497dbfc87f930bb3
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Dec 8 16:37:59 2008 -0500
+
+ Accept --props synonym for --prop
+
+commit 57cabac91099a8abd5afad75de64e54930c078ec
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Mon Dec 8 12:24:37 2008 +0100
+
+ Only set transforms if actually changed.
+
+ Re-enables other crtc settings if transforms are not supported.
+
+commit 970f689651fc86fa7a2ba24f0fab5f86f01af349
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Thu Dec 4 17:47:05 2008 +0100
+
+ Add manpage entry.
+
+commit d030ae78e8516b916e9ea1ea81e3b4859bf35875
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Thu Dec 4 15:57:22 2008 +0100
+
+ Bump to 1.2.99.2, RandR requirements to 1.2.99.2
+
+commit f6b5862f87ba7e1729c46136ef7754a06301853f
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Fri Nov 28 17:16:11 2008 +0100
+
+ Add panning support.
+
+commit 1dc67ca918446cb7db4819f60f36e7bc6f4c047b
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sat Dec 6 11:40:53 2008 +0100
+
+ Don't use GNU make only constructs.
+
+commit 7963d4217c12d2e4b0c38ad4ff185462784609f7
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon Dec 1 23:27:51 2008 +0100
+
+ Require libXrandr 1.2.91
+
+commit ba78e14c8c43a141fc5227e7bb75d6cfd0f70dba
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon Dec 1 21:45:47 2008 +0100
+
+ Fix build outside of the source dir
+
+commit 63ba316bcbe8ad61ba63d9fe62c82e7d56dcc399
+Merge: a813c4d... 1b95e32...
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon Dec 1 21:33:35 2008 +0100
+
+ Merge branch 'transform-proposal' of git.freedesktop.org:/git/xorg/app/xrandr
+
+commit 1b95e32b4b0a4a114e0fbebe8a18316d2f9010cf
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Nov 14 14:14:24 2008 -0800
+
+ Add --scale and --transform to --help output
+
+commit e9a5d1c598cd0440f062240430a9b86b4d514ada
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Nov 14 14:13:51 2008 -0800
+
+ Check return value from XRRGetCrtcTransform
+
+ XRRGetCrtcTransform will return 0 if the X server does not support this
+ request.
+
+commit a813c4da7f0b166ee9001fa97c5d8d64e5b5b560
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Aug 19 09:39:00 2008 -0700
+
+ Man page typo fix
+
+commit 8ef4595aef15b7326822849a50c273f2a2b4ba30
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Aug 15 21:23:13 2008 +0200
+
+ Manpage typo fixes
+
+commit 977275a13be0687efc3db1fd3763174ff1256210
+Author: Eric Piel <E.A.B.Piel@tudelft.nl>
+Date: Sun Aug 10 23:28:25 2008 +0200
+
+ update the manpage
+
+ Describe all the options supported, including: --dryrun, -display,
+ --q1, --q12, and --rate for 1.1
+ Describe all short and long version of the option.
+ Use the usual man style for the option arugments.
+ Move the four --*mode options out of the output section as they are
+ independant of an output.
+ Mention cvt for computing modelines.
+ Gives some examples.
+
+commit 3046799a06ecb79211ef0f4a2db9de4eec7233fb
+Author: Egbert Eich <eich@freedesktop.org>
+Date: Sun Aug 3 13:24:49 2008 +0200
+
+ Fix for 64bit: feed a pointer to the right size variable to scanf().
+
+ XID is unsigned long, however %x in scanf takes a pointer to an unsigned int.
+ Thus with XID xid, a sscanf(..., "0x%x", &xid) will most likely produce the
+ wrong results.
+
+commit 0d2082e9eb25cb7410309eed908b7f95abb8da79
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Apr 1 23:46:02 2008 -0700
+
+ Exit when select output is not available
+
+commit 18a189993b3df8bc54a79e0d62240ef203d6f34f
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Apr 1 23:44:50 2008 -0700
+
+ Fix up xkeystone to use current screen/output settings
+
+commit 9e8860f9231926090462ea20132cc9e1d64e5fe4
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Mar 30 19:03:53 2008 -0700
+
+ Execute xrandr to set keystone correction
+
+commit 206bfbea4ebe854fdfa66e8a6fbd9296b6004c0e
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Mar 30 19:03:29 2008 -0700
+
+ add --transform none to reset to identity
+
+commit 443e1f80c885133ae6df590f1a7663833c76b7f3
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Mar 21 23:29:41 2008 -0700
+
+ Build and install xkeystone program from keystone.5c
+
+commit a7a7eea510b5a87c1e12516fadae4d13bd26e0a0
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Mar 21 23:26:30 2008 -0700
+
+ Track toolkit name change (chrome->nichrome)
+
+commit 74dae9d4b06369a1863e7a68b7b3772751e06ff1
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Mar 21 03:17:44 2008 -0700
+
+ Add keystone.5c program to help compute transforms.
Reply to: