diff -Nru xserver-xorg-video-geode-2.11.19/debian/changelog xserver-xorg-video-geode-2.11.19/debian/changelog --- xserver-xorg-video-geode-2.11.19/debian/changelog 2017-03-28 11:02:40.000000000 +0000 +++ xserver-xorg-video-geode-2.11.19/debian/changelog 2018-05-26 12:32:09.000000000 +0000 @@ -1,3 +1,13 @@ +xserver-xorg-video-geode (2.11.19-4) unstable; urgency=medium + + * Merged patch from Git: + 0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch (Closes: #900108) + * Fixed reported Lintian reports: + W: source: dh-quilt-addon-but-quilt-source-format dh --with quilt (line 37) + I: source: debian-watch-uses-insecure-uri ftp:// + + -- Martin-Éric Racine Sat, 26 May 2018 15:32:09 +0300 + xserver-xorg-video-geode (2.11.19-3) unstable; urgency=medium * Merged patch from Git: @@ -108,7 +118,7 @@ xserver-xorg-video-geode (2.11.16-6) unstable; urgency=medium - * debian/xserver-xorg-video-geode-dbg.maintscript: + * debian/xserver-xorg-video-geode-dbg.maintscript: + New file. Handles dir_to_symlink for 2.11.13-5 (Closes: #775471). * debian/control: + xserver-xorg-video-geode-dbg: Pre-Depends: dpkg (>= 1.17.14) @@ -293,7 +303,7 @@ * Migrated CDBS patch management from simple-patchsys.mk to patchsys-quilt.mk. + Adopted the short README.source from "Quilt for Debian Maintainers" as-is. - + Added a Build-Depends on quilt. + + Added a Build-Depends on quilt. * Bumped Standards-Version up to 3.9.2 (no change required). -- Martin-Éric Racine Mon, 29 Aug 2011 19:40:39 +0300 @@ -301,7 +311,7 @@ xserver-xorg-video-geode (2.11.12-1) unstable; urgency=low * New upstream release. - - Dropping patches from 2.11.11-2 (merged upstream). + - Dropping patches from 2.11.11-2 (merged upstream). -- Martin-Éric Racine Sun, 13 Feb 2011 22:01:28 +0200 @@ -310,8 +320,8 @@ * The "Congratulations to the Squeeze team!" release. * Added two patches from GIT: + Fix packed overlay offscreen allocations. - - Stop including "linux/videodev.h" in z4l.c: - V4L1 support was dropped as of Linux kernel 2.6.38 + - Stop including "linux/videodev.h" in z4l.c: + V4L1 support was dropped as of Linux kernel 2.6.38 and our driver builds fine without it. -- Martin-Éric Racine Mon, 07 Feb 2011 02:13:37 +0200 @@ -321,7 +331,7 @@ * New upstream release. * Updated my contact info in [debian/*] files. * Dropped CFLAGS+="-march=geode -mtune=geode" from the build environment - and corresponding Build-Depends on GCC (>= 4.3). Not needed on Ubuntu + and corresponding Build-Depends on GCC (>= 4.3). Not needed on Ubuntu since Maverick, plus it hampers operation on GX2 hardware on Debian. -- Martin-Éric Racine Mon, 27 Dec 2010 15:53:59 +0200 @@ -352,8 +362,8 @@ xserver-xorg-video-geode (2.11.9-5) unstable; urgency=low * Merged patches from upstream GIT: - + Fix a typo on a panel resolution's sync frequency. - + Add native support for the 1024x600 panel resolution used on the + + Fix a typo on a panel resolution's sync frequency. + + Add native support for the 1024x600 panel resolution used on the Hercules eCafe EC800 (LP: #433142) -- Martin-Éric Racine Wed, 29 Sep 2010 17:01:31 +0300 @@ -502,7 +512,7 @@ * New upstream release: + Cleanups in the GX2 "Red Cloud" chipset support. + Several maintenance upgrades to autotool scripts. - + Some typo fixes in the documentation and in source code comments, + + Some typo fixes in the documentation and in source code comments, including 93f0303f79ce29e896e4817e945709c6a1d3df69. * Bumped Standards-Version up to 3.8.4 (no change required). @@ -533,8 +543,8 @@ xserver-xorg-video-geode (2.11.6-1) unstable; urgency=low * New upstream release: - Revert "LX validate display modes" because it breaks detection of - arbitrary non-VESA resolutions such as with the OLPC (LP: #433228). + Revert "LX validate display modes" because it breaks detection of + arbitrary non-VESA resolutions such as with the OLPC (LP: #433228). -- Martin-Éric Racine Sun, 27 Sep 2009 12:16:46 +0000 @@ -578,7 +588,7 @@ * New upstream release: + Some header upgrades for newer X servers. + Numerous documentation improvements. - + Some GX2 fixes. + + Some GX2 fixes. * Dropped patch 0001_make_XAA_default_on_GX2; merged upstream. NOTE: We're aware that GX2 support is still somewhat broken. @@ -588,8 +598,8 @@ xserver-xorg-video-geode (2.11.3-2) unstable; urgency=low - * Added patch 0001_make_XAA_default_on_GX2 - from upstream GIT commit 255c0b985731350fdfd38987a95310e72f4e5381 + * Added patch 0001_make_XAA_default_on_GX2 + from upstream GIT commit 255c0b985731350fdfd38987a95310e72f4e5381 EXA support is broken for GX2 so we disable it and use XAA for now. * Updated the Homepage to http://wiki.x.org/wiki/GeodeDriver * Bumped Standards-Version up to 3.8.3 (no change required). @@ -612,14 +622,14 @@ xserver-xorg-video-geode (2.11.2-1) unstable; urgency=low * New upstream release. - * Migrated -dbg packages to the new Section:debug. + * Migrated -dbg packages to the new Section:debug. -- Martin-Éric Racine Thu, 21 May 2009 23:30:04 +0300 xserver-xorg-video-geode (2.11.1-1) unstable; urgency=low * New upstream release: - Supercedes both previous versions of the Mask Transform patches. + Supercedes both previous versions of the Mask Transform patches. -- Martin-Éric Racine Tue, 17 Feb 2009 09:01:31 +0200 @@ -661,7 +671,7 @@ xserver-xorg-video-geode (2.10.1-3) experimental; urgency=low - * Reintroduced debian/control and debian/rules changes from 2.10.1-1 + * Reintroduced debian/control and debian/rules changes from 2.10.1-1 and uploaded to experimental. * Reintroduced Build-Depends on X core to >= 2:1.4.99 until Lenny. @@ -669,7 +679,7 @@ xserver-xorg-video-geode (2.10.1-2) unstable; urgency=low - * Reverted debian/control and debian/rules changes to 2.10.0-4 status, + * Reverted debian/control and debian/rules changes to 2.10.0-4 status, as requested by Release Management team, for inclusion in Lenny. -- Martin-Éric Racine Mon, 18 Aug 2008 12:17:41 +0300 @@ -769,9 +779,9 @@ "Teach libDDC to access the DDC pins on the Geode natively, instead of using the BIOS which has proven to be broken time and time again." - This libDDC support makes DDC polling succeed on any Geode GX/LX + This libDDC support makes DDC polling succeed on any Geode GX/LX hardware, regardless of how buggy the BIOS implementation is. If - DDC still fails on your hardware, it means that the DDC pins are + DDC still fails on your hardware, it means that the DDC pins are not physically connected to the VGA port. BADMANUFACTURER error! * Ran autogen.sh to regenerate the autotool files. @@ -849,7 +859,7 @@ xserver-xorg-video-amd (2.7.7.6-1) unstable; urgency=low * New upstream release: - + Default depth raised to 16-bit. + + Default depth raised to 16-bit. + Several GCC warning fixes. -- Martin-Éric Racine Sat, 26 Jan 2008 02:32:59 +0200 @@ -914,7 +924,7 @@ * New upstream release: This is the first official upstream release to come out of GIT. - Many thanks go to AMD's Jordan Crouse and to other OLPC developers + Many thanks go to AMD's Jordan Crouse and to other OLPC developers for making this release happen. -- Martin-Éric Racine Sun, 2 Sep 2007 14:21:21 +0300 @@ -930,7 +940,7 @@ * Added a link to the xserver-xorg-core bug script, to ensure that bug reports contain the user's config and log files. - This feature Depends on xserver-xorg-core >= 2:1.1.1-11, which - still works for backports since Etch has 2:1.1.1-21 in stock. + still works for backports since Etch has 2:1.1.1-21 in stock. -- Martin-Éric Racine Tue, 7 Aug 2007 23:00:53 +0300 diff -Nru xserver-xorg-video-geode-2.11.19/debian/copyright xserver-xorg-video-geode-2.11.19/debian/copyright --- xserver-xorg-video-geode-2.11.19/debian/copyright 2015-10-28 06:49:33.000000000 +0000 +++ xserver-xorg-video-geode-2.11.19/debian/copyright 2018-05-26 12:16:54.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Source: ftp://ftp.freedesktop.org/pub/xorg/individual/driver/ Files: * diff -Nru xserver-xorg-video-geode-2.11.19/debian/patches/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch xserver-xorg-video-geode-2.11.19/debian/patches/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch --- xserver-xorg-video-geode-2.11.19/debian/patches/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch 1970-01-01 00:00:00.000000000 +0000 +++ xserver-xorg-video-geode-2.11.19/debian/patches/0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch 2018-05-26 12:11:12.000000000 +0000 @@ -0,0 +1,30 @@ +From 8382e6bb0c76a8029493eae3f2d7a3dbfd0cfc12 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 5 Mar 2018 10:28:15 -0500 +Subject: [PATCH] gx: Fix RANDR initialization for xserver 1.20 + +xf86DisableRandR() doesn't exist anymore, and we don't need it anyway, +the core code will notice that we set up RANDR ourselves. + +Signed-off-by: Adam Jackson +--- + src/gx_driver.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gx_driver.c b/src/gx_driver.c +index ab57df1..4de336e 100644 +--- a/src/gx_driver.c ++++ b/src/gx_driver.c +@@ -1426,7 +1426,9 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL) + + /* Set up RandR */ + ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24 + xf86DisableRandR(); /* We provide our own RandR goodness */ ++#endif + + /* Try to set up the shadow FB for rotation */ + +-- +2.11.0 + diff -Nru xserver-xorg-video-geode-2.11.19/debian/patches/series xserver-xorg-video-geode-2.11.19/debian/patches/series --- xserver-xorg-video-geode-2.11.19/debian/patches/series 2017-03-28 11:02:40.000000000 +0000 +++ xserver-xorg-video-geode-2.11.19/debian/patches/series 2018-05-26 12:12:59.000000000 +0000 @@ -1 +1,2 @@ 0001-Remove-call-to-LoaderGetOS.patch +0002-gx-Fix-RANDR-initialization-for-xserver-1.20.patch diff -Nru xserver-xorg-video-geode-2.11.19/debian/rules xserver-xorg-video-geode-2.11.19/debian/rules --- xserver-xorg-video-geode-2.11.19/debian/rules 2017-03-16 10:21:28.000000000 +0000 +++ xserver-xorg-video-geode-2.11.19/debian/rules 2018-05-26 12:19:45.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f # debhelper-7 [debian/rules] for xserver-xorg-video-geode # -# COPYRIGHT © 2007-2015 Martin-Éric Racine +# COPYRIGHT © 2007-2018 Martin-Éric Racine # # LICENSE # GPLv2+: GNU GPL version 2 or later @@ -34,7 +34,7 @@ dh_strip --dbgsym-migration=xserver-xorg-video-geode-dbg %: - dh $@ --with quilt,autoreconf --builddirectory=build/ + dh $@ --with autoreconf --builddirectory=build/ # Check for xserver-xorg-dev (<< 1.7) Depends: xserver-xorg-core. XMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) diff -Nru xserver-xorg-video-geode-2.11.19/debian/watch xserver-xorg-video-geode-2.11.19/debian/watch --- xserver-xorg-video-geode-2.11.19/debian/watch 2014-08-27 08:48:43.000000000 +0000 +++ xserver-xorg-video-geode-2.11.19/debian/watch 2018-05-26 12:31:35.000000000 +0000 @@ -1,4 +1,4 @@ version=3 opts=passive,pgpsigurlmangle=s/$/.sig/ \ -ftp://ftp.freedesktop.org/pub/xorg/individual/driver/xf86-video-geode-(.*)\.tar\.gz \ +https://xorg.freedesktop.org/releases/individual/driver/ xf86-video-geode-(.+)\.tar\.gz debian uupdate --no-symlink