Import Ubuntu changes

debian/changelog

@@ -1,3 +1,18 @@
+x11-xserver-utils (7.5+1ubuntu2) lucid; urgency=low
+
+  * Add 101_xset_spellfix.patch: Spelling fix in help docs
+    (LP: #426152)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 17 Mar 2010 15:23:57 -0700
+
+x11-xserver-utils (7.5+1ubuntu1) lucid; urgency=low
+
+  * Merge from Debian.  Remaining Ubuntu changes:
+    - Add 100_xrandr-output.patch: When using --scale or --transform, verify
+      a valid output parameter is used; crashes otherwise.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 08 Jan 2010 18:38:47 -0800
+
 x11-xserver-utils (7.5+1) unstable; urgency=low
 
   [ Julien Cristau ]
@@ -31,6 +46,28 @@ x11-xserver-utils (7.5+1) unstable; urgency=low
 
  -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 20:41:37 +0100
 
+x11-xserver-utils (7.4+2ubuntu3) karmic; urgency=low
+
+  * 100_xrandr-output.patch: Refresh patch to apply cleanly, fixing
+    FTBFS.  LP: #432079
+
+ -- Michael Terry <michael.terry@canonical.com>  Thu, 17 Sep 2009 15:46:30 -0400
+
+x11-xserver-utils (7.4+2ubuntu2) karmic; urgency=low
+
+  * 100_xrandr-output.patch: Replace with patch sent upstream.
+    (LP: #354715)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 02 Sep 2009 02:15:48 -0700
+
+x11-xserver-utils (7.4+2ubuntu1) karmic; urgency=low
+
+  * Add 100_xrandr-output.patch: When using --scale or --transform, verify
+    a valid output parameter is used; crashes otherwise.
+    (LP: #354715)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 02 Sep 2009 01:18:10 -0700
+
 x11-xserver-utils (7.4+2) unstable; urgency=low
 
   * xrandr 1.3.

debian/control

@@ -1,7 +1,8 @@
 Source: x11-xserver-utils
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-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),
  libxaw7-dev (>= 1:1.0.1), libxext-dev (>= 1:1.0.0),

debian/patches/100_xrandr-output.patch

@@ -0,0 +1,30 @@
+From dc627718d77b0e853311e480bba90eddefd0b891 Mon Sep 17 00:00:00 2001
+From: Bryce Harrington <bryce@bryceharrington.org>
+Date: Wed, 2 Sep 2009 01:46:50 -0700
+Subject: [PATCH] Check output pointer validity for --sale and --transform
+
+Signed-off-by: Bryce Harrington <bryce@bryceharrington.org>
+---
+ xrandr.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+Index: x11-xserver-utils-7.4+2ubuntu2/xrandr/xrandr.c
+===================================================================
+--- x11-xserver-utils-7.4+2ubuntu2.orig/xrandr/xrandr.c	2009-09-17 15:45:26.000000000 -0400
++++ x11-xserver-utils-7.4+2ubuntu2/xrandr/xrandr.c	2009-09-17 15:45:46.000000000 -0400
+@@ -2327,6 +2327,7 @@
+ 	{
+ 	    double  sx, sy;
+ 	    if (++i>=argc) usage();
++            if (!output) usage();
+ 	    if (sscanf (argv[i], "%lfx%lf", &sx, &sy) != 2)
+ 		usage ();
+ 	    init_transform (&output->transform);
+@@ -2346,6 +2347,7 @@
+ 	    double  transform[3][3];
+ 	    int	    k, l;
+ 	    if (++i>=argc) usage ();
++            if (!output) usage();
+ 	    init_transform (&output->transform);
+ 	    if (strcmp (argv[i], "none") != 0)
+ 	    {

debian/patches/101_xset_spellfix.patch

@@ -0,0 +1,14 @@
+diff -Nurp x11-xserver-utils-7.4+2ubuntu3/xset/xset.c working/xset/xset.c
+--- x11-xserver-utils-7.4+2ubuntu3/xset/xset.c	2009-02-01 05:04:01.000000000 -0800
++++ working/xset/xset.c	2010-03-15 19:02:50.000000000 -0700
+@@ -1554,8 +1554,8 @@ usage(char *fmt, ...)
+ #ifdef FONTCACHE
+     fprintf(stderr, "    To control font cache:\n");
+     fprintf(stderr, "\t fc [hi-mark [low-mark [balance]]]\n");
+-    fprintf(stderr, "\t    both mark values spcecified in KB\n");
+-    fprintf(stderr, "\t    balance value spcecified in percent (10 - 90)\n");
++    fprintf(stderr, "\t    both mark values specified in KB\n");
++    fprintf(stderr, "\t    balance value specified in percent (10 - 90)\n");
+     fprintf(stderr, "    Show font cache statistics:\n");
+     fprintf(stderr, "\t fc s\n");
+ #endif

debian/patches/series

@@ -1 +1,3 @@
 01_sessreg_implement_hostname_hashing.diff
+100_xrandr-output.patch
+101_xset_spellfix.patch