debian/changelog | 7 + debian/patches/04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff | 41 ++++++++++ debian/patches/series | 1 3 files changed, 49 insertions(+)
New commits: commit ac659fd0be36d8d65952015eb12c4395ff6abe09 Author: Julien Cristau <jcris...@debian.org> Date: Fri May 11 22:59:23 2012 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 22975f5..22d1254 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -x11-xserver-utils (7.7~3) UNRELEASED; urgency=low +x11-xserver-utils (7.7~3) unstable; urgency=low * xrandr: keystone.5c: cairo-5 box semantics changed default layout (allows to work with new cairo-5c) - -- Julien Cristau <jcris...@debian.org> Fri, 11 May 2012 22:52:04 +0200 + -- Julien Cristau <jcris...@debian.org> Fri, 11 May 2012 22:58:40 +0200 x11-xserver-utils (7.7~2) unstable; urgency=low commit 4039112f06bbf6ad9d236b6dab622d805f6b7341 Author: Julien Cristau <jcris...@debian.org> Date: Fri May 11 22:58:18 2012 +0200 Fix xkeystone for new cairo-5c keystone.5c: cairo-5 box semantics changed default layout (allows to work with new cairo-5c) diff --git a/debian/changelog b/debian/changelog index a41f831..22975f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x11-xserver-utils (7.7~3) UNRELEASED; urgency=low + + * xrandr: keystone.5c: cairo-5 box semantics changed default layout (allows + to work with new cairo-5c) + + -- Julien Cristau <jcris...@debian.org> Fri, 11 May 2012 22:52:04 +0200 + x11-xserver-utils (7.7~2) unstable; urgency=low * xrandr: update keystone program to run with new nichrome bits diff --git a/debian/patches/04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff b/debian/patches/04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff new file mode 100644 index 0000000..df2af15 --- /dev/null +++ b/debian/patches/04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff @@ -0,0 +1,41 @@ +From b9d260a49961b5e311e77e8600e7e5a8f2e8d475 Mon Sep 17 00:00:00 2001 +From: Keith Packard <kei...@keithp.com> +Date: Tue, 1 May 2012 21:53:02 -0700 +Subject: [PATCH] keystone.5c: cairo-5 box semantics changed default layout + +cairo-5c version 1.6 includes a new 2D box layout widget that +needs widget stretch defined in both dimensions to create +the desired layout. + +Signed-off-by: Keith Packard <kei...@keithp.com> +--- + keystone.5c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/xrandr/keystone.5c b/xrandr/keystone.5c +index c616f12..4b698ee 100644 +--- a/xrandr/keystone.5c ++++ b/xrandr/keystone.5c +@@ -543,15 +543,14 @@ void main () + &box_t hbox = Box::new (Box::dir_t.horizontal, + Box::widget_item (&doit, 0), + Box::widget_item (&show, 0), +- + Box::widget_item (&quit, 0), + Box::glue_item (1)); + &box_t box = Box::new (Box::dir_t.vertical, + Box::box_item (&hbox), +- Box::widget_item (label[0], 0), +- Box::widget_item (label[1], 0), +- Box::widget_item (label[2], 0), +- Box::widget_item (&space, 0), ++ Box::widget_item (label[0], 1, 0), ++ Box::widget_item (label[1], 1, 0), ++ Box::widget_item (label[2], 1, 0), ++ Box::widget_item (&space, 1, 0), + Box::widget_item (&quad, 1)); + Nichrome::set_box (&nichrome, &box); + Nichrome::main_loop (&nichrome); +-- +1.7.10 + diff --git a/debian/patches/series b/debian/patches/series index 8962555..7b620cb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 01_sessreg_implement_hostname_hashing.diff 02_xmodmap-include-config.h-before-system-headers.diff 03_xrandr-Update-keystone-program-to-run-with-new-nichrome.diff +04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1ssyvx-00040o...@vasks.debian.org