From 57531c3522734dc73b8c446e15e21efb021701b4 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Wed, 6 Apr 2011 13:17:16 +0300 Subject: [PATCH] Import Ubuntu changes --- debian/changelog | 44 ++++++++++++++++++++++++++ debian/control | 3 +- debian/patches/101_xset_spellfix.patch | 14 ++++++++ debian/patches/series | 1 + 4 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 debian/patches/101_xset_spellfix.patch diff --git a/debian/changelog b/debian/changelog index 0791f05..84c6d15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x11-xserver-utils (7.5+2ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining Ubuntu changes: + - 101_xset_spellfix.patch: Spelling fix in help docs. + + -- Robert Hooker Mon, 09 Aug 2010 10:24:12 -0400 + x11-xserver-utils (7.5+2) unstable; urgency=low [ Julien Cristau ] @@ -17,6 +24,21 @@ x11-xserver-utils (7.5+2) unstable; urgency=low -- Cyril Brulebois Sat, 24 Jul 2010 16:27:24 +0200 +x11-xserver-utils (7.5+1ubuntu2) lucid; urgency=low + + * Add 101_xset_spellfix.patch: Spelling fix in help docs + (LP: #426152) + + -- Bryce Harrington 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 Fri, 08 Jan 2010 18:38:47 -0800 + x11-xserver-utils (7.5+1) unstable; urgency=low [ Julien Cristau ] @@ -50,6 +72,28 @@ x11-xserver-utils (7.5+1) unstable; urgency=low -- Brice Goglin 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 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 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 Wed, 02 Sep 2009 01:18:10 -0700 + x11-xserver-utils (7.4+2) unstable; urgency=low * xrandr 1.3. diff --git a/debian/control b/debian/control index f10e3b1..43923ac 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: x11-xserver-utils Section: x11 Priority: optional -Maintainer: Debian X Strike Force +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian X Strike Force Uploaders: David Nusinow , Brice Goglin , Cyril Brulebois 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), diff --git a/debian/patches/101_xset_spellfix.patch b/debian/patches/101_xset_spellfix.patch new file mode 100644 index 0000000..c378593 --- /dev/null +++ b/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 diff --git a/debian/patches/series b/debian/patches/series index 2044539..8ed6665 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01_sessreg_implement_hostname_hashing.diff +101_xset_spellfix.patch