--- xserver-xorg-video-mach64-6.9.3.orig/ChangeLog +++ xserver-xorg-video-mach64-6.9.3/ChangeLog @@ -1,446 +1,3 @@ -commit 2776fc9cd69f18ba6f09f39ca747f3a9333bf9e4 -Author: Dave Airlie -Date: Tue Jul 17 16:05:09 2012 +1000 - - xf86-video-mach64: bump to version 6.9.3 - - Signed-off-by: Dave Airlie - -commit a2213da6d87baa8b5f49d3894513ced2c6974259 -Author: Dave Airlie -Date: Mon Jul 16 04:29:53 2012 +0100 - - mach64: fix build against server without XAA - - Signed-off-by: Dave Airlie - -commit 3fce61b475355820f735e50b7070ee6fc906083d -Author: Dave Airlie -Date: Mon Jul 2 12:23:03 2012 +0100 - - mach64: bump to 6.9.2 - - Signed-off-by: Dave Airlie - -commit 68572c1e41cf6de2f0ef2c9442111384ce863308 -Author: Dave Airlie -Date: Wed Jun 6 10:42:26 2012 +0100 - - ati: only include deprecated file in one place. - - reduces warnings. - - Signed-off-by: Dave Airlie - -commit a9f3a66e355b9f19c312d399771fb1d8eb2e046d -Author: Dave Airlie -Date: Wed Jun 6 10:41:11 2012 +0100 - - mach64: port to new compat API. - - Signed-off-by: Dave Airlie - -commit 84468ba28853fa57170025d9c25cb0029a386ff4 -Author: Alan Coopersmith -Date: Fri Mar 30 19:02:07 2012 -0700 - - Readme updates - - Stop saying Radeon & Rage128 are not "yet" supported by this driver, - since no one is working on reuniting the ATI driver family. - - Update URL to check for latest X.Org code releases. - - Stop calling it an "XAA" driver now that it also supports EXA. - - Signed-off-by: Alan Coopersmith - -commit 5e09e744b27b5ada9dd064e250fa98eddf1a58c3 -Author: Alan Coopersmith -Date: Fri Mar 23 18:56:44 2012 -0700 - - xf86-video-mach64 6.9.1 - - Signed-off-by: Alan Coopersmith - -commit fa20f8f2408ac81ff04d81196a56c907fba01c45 -Author: Adam Jackson -Date: Mon Dec 19 16:45:25 2011 -0500 - - Fall back to shadowfb if XAA is unavailable - - Signed-off-by: Adam Jackson - -commit 0de234329fa1c3365954498819da93d64a978911 -Author: Jeremy Huddleston -Date: Sat Oct 29 18:53:48 2011 -0700 - - Use pci_device_map_legacy rather than xf86MapDomainMemory - - Signed-off-by: Jeremy Huddleston - -commit 75166a0fc92220b496eb67451ec1b11cb8b72091 -Author: Jeremy Huddleston -Date: Sat Oct 29 18:54:10 2011 -0700 - - Use unsigned long rather than deprecated IOADDRESS - - Signed-off-by: Jeremy Huddleston - -commit ef55d1f123972ccc001bf8b41db45d281be35a62 -Author: Julien Cristau -Date: Thu Apr 28 17:23:42 2011 +0200 - - Bump to 6.9.0 - - Signed-off-by: Julien Cristau - -commit 39c6d1da8af563afa665d5bb149c9693e24c6eab -Author: Julien Cristau -Date: Thu Apr 28 17:31:52 2011 +0200 - - Replace deprecated xalloc/xfree/xrealloc with malloc/free/realloc - - Signed-off-by: Julien Cristau - -commit d60087f0b6dd4d082230312580ae35e14acd0c6e -Author: Dave Airlie -Date: Thu Dec 2 19:11:05 2010 +1000 - - mach64: fix the pixmap private API change. - -commit e7bc106247d9ba10a922936e137a4f5ecc54ef9e -Author: Alan Coopersmith -Date: Sat Oct 30 09:37:17 2010 -0700 - - Sun's copyrights now belong to Oracle - - Signed-off-by: Alan Coopersmith - -commit 1732886624c7590a8084bb7d92e87ff341aa6d66 -Author: Mark Kettenis -Date: Sun Aug 29 18:07:01 2010 +0200 - - Don't play wrapping games - - The driver calls the wrapped CloseScreen function in the middle of messing - with the hardware state. On multi-card setups this may cause the VGA - arbiter to switch to a different card while we're in the middle of things, - with obvious disastrous effects. This fixes things by making sure we - only call the wrapped CloseScreen function at the very end of the driver's - CloseScreen function. - - Signed-off-by: Mark Kettenis - -commit 7a1549678a19c6e94e1ecb3223c74effbd5009d2 -Author: Mark Kettenis -Date: Sun Aug 29 17:54:19 2010 +0200 - - Don't attempt to stop video on Mach64's without hardware overlay support - - Older Mach64 variants don't have hardware overlay support. This is handled - properly when the XVideo adapter is initialized (we bail out early), but - ATICloseXVideo() unconditionally tries to stop video during screen termination. - This causes the server to hang on certain multi-card setups. Fix the issue - by checking Block1Base before proceeding with stopping video. - - Signed-off-by: Mark Kettenis - -commit 88a176df8df09812719eb179b293ce4dc851f2e5 -Author: Gaetan Nadon -Date: Wed Jul 21 16:49:04 2010 -0400 - - config: add comments for main statements - -commit 18ee3aa1b7a4c9de9cc705cb10e05864d3ab6406 -Author: Gaetan Nadon -Date: Wed Jul 21 16:07:00 2010 -0400 - - config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES - - Signed-off-by: Gaetan Nadon - -commit d061e00d4d09e8fbecc8bad95354551d36197dd4 -Author: Gaetan Nadon -Date: Wed Jul 21 14:37:41 2010 -0400 - - config: replace deprecated AC_HELP_STRING with AS_HELP_STRING - - Signed-off-by: Gaetan Nadon - -commit 69da993c9bdb8982c650533ca44a34fa2d7589fa -Author: Gaetan Nadon -Date: Wed Jul 21 14:05:22 2010 -0400 - - config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS - - Signed-off-by: Gaetan Nadon - -commit 37f35b579e9ea1a4b5b50f3ae570e3329664c38e -Author: Gaetan Nadon -Date: Wed Jul 21 09:27:42 2010 -0400 - - config: complete AC_INIT m4 quoting - - Signed-off-by: Gaetan Nadon - -commit 1cb6b6939e5d466797721a2e59afdd067e769fcc -Author: Gaetan Nadon -Date: Tue Jul 20 21:54:11 2010 -0400 - - config: remove unrequired AC_SUBST([DRI_CFLAGS]) - - This macro is called by PKG_CHECK_MODULES - - Signed-off-by: Gaetan Nadon - -commit 590d1989f22c38d8db01146b2207d440bc59f285 -Author: Gaetan Nadon -Date: Tue Jul 20 21:44:57 2010 -0400 - - config: remove unrequired AC_SUBST([XORG_CFLAGS]) - - This macro is called by PKG_CHECK_MODULES - - Signed-off-by: Gaetan Nadon - -commit 7bf12fb07625bd5503c5de3e5e07bd69c6de54b3 -Author: Gaetan Nadon -Date: Tue Jul 20 20:24:42 2010 -0400 - - config: remove unrequired AC_HEADER_STDC - - Autoconf says: - "This macro is obsolescent, as current systems have conforming - header files. New programs need not use this macro". - - Signed-off-by: Gaetan Nadon - -commit 3518273c2117c0d8e51efecb2f9184d5f8274ae0 -Author: Gaetan Nadon -Date: Tue Jul 20 19:41:31 2010 -0400 - - config: remove AC_PROG_CC as it overrides AC_PROG_C_C99 - - XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls - AC_PROG_C_C99. This sets gcc with -std=gnu99. - If AC_PROG_CC macro is called afterwards, it resets CC to gcc. - - Signed-off-by: Gaetan Nadon - -commit 03dd23597e64f440e5530bd8bfbd222b8f825d5a -Author: Gaetan Nadon -Date: Tue Jul 20 18:45:19 2010 -0400 - - config: update AC_PREREQ statement to 2.60 - - Unrelated to the previous patches, the new value simply reflects - the reality that the minimum level for autoconf to configure - all x.org modules is 2.60 dated June 2006. - - ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz - - Signed-off-by: Gaetan Nadon - -commit d5b5e2bb4139b723df35a422b945d514caf4db2d -Author: Gaetan Nadon -Date: Tue Jul 20 16:15:29 2010 -0400 - - config: upgrade to util-macros 1.8 for additional man page support - - Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS - The value of MAN_SUBST is the same for all X.Org packages. - -commit 6da9520fe6c482c1d4cb9dd6119c13789ed9715a -Author: Gaetan Nadon -Date: Mon Jun 21 10:37:11 2010 -0400 - - config: remove optional check for xf86miscproto - - This extension is obsolete and is not used by this driver. - - Signed-off-by: Gaetan Nadon - -commit 1f1e665f7dab55eceb314adb185636b8ee64fbc6 -Author: Gaetan Nadon -Date: Mon Jun 14 08:43:04 2010 -0400 - - README: keep the text version of README, discard the sgml version - - The linuxdoc doc tool is deprecated. - README files are exclusively text files. - Normalize to one plain text README file. - - Signed-off-by: Gaetan Nadon - -commit 2863c5617ccb4a09a699c43c72d9b496480db102 -Author: Gaetan Nadon -Date: Mon Jun 14 08:38:59 2010 -0400 - - README: fix linuxdoc content - - defs.ent are located under X11 directory - ident tag is not a Linuxdoc tag - replace docbook email tag with linuxdoc email tag - - Signed-off-by: Gaetan Nadon - -commit ebfb29a00384ae8070d9f10726c591c0ca92637c -Author: Matt Turner -Date: Mon Mar 8 10:52:54 2010 -0500 - - Don't check for Xinerama. - - It doesn't seem to be used anywhere, so don't require it. - - CC: Jerome Glisse - CC: Alex Deucher - CC: Dave Airlie - Signed-off-by: Matt Turner - -commit 383903574b9660f9d7831b149f2a9b339a871586 -Author: Alan Coopersmith -Date: Fri Jan 15 15:54:36 2010 -0800 - - Update Sun license notices to current X.Org standard form - - Signed-off-by: Alan Coopersmith - -commit 0059e1e49b1e6861aad801b93ccf846a236a42a7 -Author: Gaetan Nadon -Date: Tue Dec 15 21:47:06 2009 -0500 - - configure.ac: use backticks rather than $() for cmd subs - - Use "$PKG_CONFIG" rather than hard coded "pkg-config" - - Acked-by: Dan Nicholson - Acked-by: Daniel Stone - - Signed-off-by: Gaetan Nadon - -commit 8f84a92309e62655de69c09affa2e6922cc46aa1 -Author: Gaetan Nadon -Date: Mon Nov 23 09:25:05 2009 -0500 - - Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES - - Now that the INSTALL file is generated. - Allows running make maintainer-clean. - -commit da3afdb69d426db6423c505f1c4ec10b9cd40304 -Author: Gaetan Nadon -Date: Wed Oct 28 14:41:41 2009 -0400 - - INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 - - Automake 'foreign' option is specified in configure.ac. - Remove from Makefile.am - -commit a0b11f322c440ccf13347c42d08ed5e0b208d79c -Author: Gaetan Nadon -Date: Wed Oct 28 14:09:09 2009 -0400 - - INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 - - Add missing INSTALL file. Use standard GNU file on building tarball - README may have been updated - Remove AUTHORS file as it is empty and no content available yet. - Remove NEWS file as it is empty and no content available yet. - -commit 963be32d684b32957d7e646eb19259d7710bf66a -Author: Gaetan Nadon -Date: Mon Oct 26 12:54:21 2009 -0400 - - Several driver modules do not have a ChangeLog target in Makefile.am #23814 - - The git generated ChangeLog replaces the hand written one. - Update configure.ac to xorg-macros level 1.3. - Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros - Update Makefile.am to add ChangeLog target if missing - Remove ChangeLog from EXTRA_DIST or *CLEAN variables - This is a pre-req for the INSTALL_CMD - -commit 3e54585250d22541a31068b5b8f0c8743dbccce6 -Author: Gaetan Nadon -Date: Thu Oct 22 12:34:17 2009 -0400 - - .gitignore: use common defaults with custom section # 24239 - - Using common defaults will reduce errors and maintenance. - Only the very small or inexistent custom section need periodic maintenance - when the structure of the component changes. Do not edit defaults. - -commit 2013b64cf19fce32edb052ee6d8529d3ce69d409 -Author: Dave Airlie -Date: Thu Jul 30 12:04:28 2009 +1000 - - mach64: bump for release 6.8.2 - -commit 4f08e83e50059df494f5f53cd05eb8809d18656e -Author: Dave Airlie -Date: Tue Jul 28 15:22:40 2009 +1000 - - mach64: change to using ABI version check - -commit 64960253ea5dcfb01d92b5b684790f16be5b73be -Author: Dave Airlie -Date: Tue Jul 28 13:32:31 2009 +1000 - - mach64: update for resources/RAC API removal - -commit 965614f27d42106e859000264a6eb89d9fcba67e -Author: Peter Hutterer -Date: Thu Jul 16 11:43:33 2009 +1000 - - Update to xextproto 7.1 support. - - DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers - need to include dpmsconst.h if xextproto 7.1 is available. - - Signed-off-by: Peter Hutterer - -commit 9caef14defaf892d957875f6d774003a036bad45 -Author: Alan Coopersmith -Date: Mon May 11 22:06:40 2009 -0700 - - Fill in COPYING file, add SubmittingPatches URL to README - -commit d9d787167795862909738892195fcdc751c413ed -Author: Alan Coopersmith -Date: Sun May 10 16:56:02 2009 -0700 - - Doublecheck pictFormat is a supported format - - Fixes these warnings from parfait source checker: - - Error: Read buffer overflow at src/atimach64render.c:601 - in function 'Mach64PrepareTexture' [Symbolic analysis] - In array dereference of Mach64TexFormats[i] with index 'i' - Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6 - Error: Read buffer overflow at src/atimach64render.c:712 - in function 'Mach64PrepareComposite' [Symbolic analysis] - In array dereference of Mach64TexFormats[i] with index 'i' - Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6 - - Signed-off-by: Alan Coopersmith - -commit 99db87ed49d7eca8de2ff1f7d53b580637ebb916 -Author: Alan Coopersmith -Date: Wed Apr 29 17:32:47 2009 -0700 - - Version 6.8.1 - - Signed-off-by: Alan Coopersmith - -commit 193744b015e8f2b8c25d90094b7f0b502bc1287b -Author: Alan Coopersmith -Date: Wed Apr 29 17:21:53 2009 -0700 - - Convert to XORG_CWARNFLAGS & XORG_CHANGELOG - - Signed-off-by: Alan Coopersmith - commit d394e0b8269ea0a7d36ee8edb38947df170399c9 Author: Alan Coopersmith Date: Fri Jan 30 20:41:43 2009 -0800 --- xserver-xorg-video-mach64-6.9.3.orig/autogen.sh +++ xserver-xorg-video-mach64-6.9.3/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" --- xserver-xorg-video-mach64-6.9.3.orig/debian/copyright +++ xserver-xorg-video-mach64-6.9.3/debian/copyright @@ -0,0 +1,108 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +that the name of Marc Aurele La France not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. Marc Aurele La France makes no representations +about the suitability of this software for any purpose. It is provided +"as-is" without express or implied warranty. + +MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO +EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +************************************************************************* + +Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, + Precision Insight, Inc., Cedar Park, Texas, and + VA Linux Systems Inc., Fremont, California. + +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation on the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX +SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +************************************************************************* +Copyright 2000 Gareth Hughes +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +************************************************************************* + +Copyright 2006, 2007 George Sapountzis +All Rights Reserved. + +Based on the mach64 DRI and DRM drivers: +Copyright 2000 Gareth Hughes +Copyright 2002-2003 Leif Delgass +All Rights Reserved. + +Based on the ati hw/kdrive driver: +Copyright 2003 Eric Anholt, Anders Carlsson + +Based on the via hw/xfree86 driver: +Copyright 2006 Thomas Hellstrom. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. --- xserver-xorg-video-mach64-6.9.3.orig/debian/compat +++ xserver-xorg-video-mach64-6.9.3/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-video-mach64-6.9.3.orig/debian/rules +++ xserver-xorg-video-mach64-6.9.3/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +# Install in debian/tmp to retain control through dh_install: +override_dh_auto_install: + dh_auto_install --destdir=debian/tmp + +# Kill *.la files, and forget no-one: +override_dh_install: + find debian/tmp -name '*.la' -delete + dh_install --fail-missing + +# Debug package: +override_dh_strip: + dh_strip --dbg-package=xserver-xorg-video-mach64-dbg + +# That's a plugin, use appropriate warning level: +override_dh_shlibdeps: + dh_shlibdeps -- --warnings=6 + +%: + dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ --- xserver-xorg-video-mach64-6.9.3.orig/debian/watch +++ xserver-xorg-video-mach64-6.9.3/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-mach64 +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-mach64-(.*)\.tar\.gz --- xserver-xorg-video-mach64-6.9.3.orig/debian/xserver-xorg-video-mach64.links +++ xserver-xorg-video-mach64-6.9.3/debian/xserver-xorg-video-mach64.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-mach64/script --- xserver-xorg-video-mach64-6.9.3.orig/debian/changelog +++ xserver-xorg-video-mach64-6.9.3/debian/changelog @@ -0,0 +1,556 @@ +xserver-xorg-video-mach64 (6.9.3-0ubuntu1) quantal-proposed; urgency=low + + * Sync from unreleased debian git. + + -- Timo Aaltonen Wed, 01 Aug 2012 18:34:58 +0300 + +xserver-xorg-video-mach64 (6.9.3-1) UNRELEASED; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.9.3 + * Add 01_fix_build.diff to build on new X + + -- Maarten Lankhorst Wed, 18 Jul 2012 16:10:36 +0200 + +xserver-xorg-video-mach64 (6.9.1-2) unstable; urgency=low + + * Drop usr/share/man from dh_install, there's no manpage to ship for + this driver. + + -- Cyril Brulebois Tue, 01 May 2012 14:41:22 +0200 + +xserver-xorg-video-mach64 (6.9.1-1) unstable; urgency=low + + * New upstream release. + + -- Cyril Brulebois Mon, 02 Apr 2012 02:27:58 +0000 + +xserver-xorg-video-mach64 (6.9.0-1+exp1) experimental; urgency=low + + * Build against Xserver 1.12 RC1. + + -- Cyril Brulebois Sun, 01 Jan 2012 05:04:24 +0100 + +xserver-xorg-video-mach64 (6.9.0-1) unstable; urgency=low + + [ Cyril Brulebois ] + * Get rid of debian/NEWS, things from 2007/2008 are old now. This fixes + the epoch mismatch and NEWS prompting on every upgrade, thanks to + Jonathan Nieder for the notice (Closes: #615522). + * Add ${misc:Depends} to Depends for the debug package. + * Bump Standards-Version to 3.9.2 (no changes needed). + + [ Julien Cristau ] + * New upstream release, integrates fix for 1.10 compatibility. + + -- Cyril Brulebois Tue, 03 May 2011 17:13:20 +0200 + +xserver-xorg-video-mach64 (6.8.2-5+exp2) experimental; urgency=low + + * Rebuild against Xserver 1.10 rc3. + + -- Cyril Brulebois Fri, 25 Feb 2011 15:38:31 +0100 + +xserver-xorg-video-mach64 (6.8.2-5+exp1) experimental; urgency=low + + * Rebuild against Xserver 1.10 rc2. + * Cherry-pick from upstream to build against 1.10: + - mach64: fix the pixmap private API change. + + -- Cyril Brulebois Sun, 20 Feb 2011 14:12:20 +0100 + +xserver-xorg-video-mach64 (6.8.2-5) unstable; urgency=low + + * Switch to dh: + - Use debhelper 8. + - Use dh-autoreconf. + - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf + debhelper sequence. + - Specify usr/share/man in .install, remove .manpages accordingly. + * Remove xsfbs accordingly. + * Update Uploaders list. Thanks, David & Brice! + * Remove long obsolete Replaces/Conflicts. + * Wrap Depends/Provides. + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Cyril Brulebois Sat, 05 Feb 2011 14:51:19 +0100 + +xserver-xorg-video-mach64 (6.8.2-4) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + * Add myself to Uploaders. + + -- Cyril Brulebois Sat, 16 Oct 2010 18:55:23 +0200 + +xserver-xorg-video-mach64 (6.8.2-3) unstable; urgency=medium + + * Drop obsolete build-dep on xf86miscproto. + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Update xsfbs and use new ${xviddriver:Depends} substvar. + + -- Julien Cristau Sat, 15 May 2010 11:50:16 +0200 + +xserver-xorg-video-mach64 (6.8.2-2) experimental; urgency=low + + [ Timo Aaltonen ] + * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. + + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 02:54:30 +0100 + +xserver-xorg-video-mach64 (6.8.2-1) unstable; urgency=low + + * New upstream release. + * Move -dbg package to section debug. + * Remove 01_gen_pci_ids.diff. The X server now uses a built-in table to + choose drivers. + * Add README.source, bump Standards-Version to 3.8.2. + * Update debian/copyright from upstream COPYING. + + -- Brice Goglin Sat, 01 Aug 2009 01:17:03 +0200 + +xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-2) unstable; urgency=low + + * Upload to unstable. + + -- Brice Goglin Thu, 09 Apr 2009 13:33:03 +0200 + +xserver-xorg-video-mach64 (6.8.0+git20090201.d394e0b8-1) experimental; urgency=low + + * New upstream snapshot, up to commit d394e0b8. + * Allow parallel builds. + * Run autoreconf on build; add build-deps on automake, libtool and + xutils-dev. + * Build against xserver 1.6 rc1. + + -- Brice Goglin Sun, 01 Feb 2009 16:50:21 +0100 + +xserver-xorg-video-mach64 (6.8.0-3) experimental; urgency=low + + * Build against xserver 1.5. + + -- Julien Cristau Thu, 04 Sep 2008 20:42:00 +0200 + +xserver-xorg-video-mach64 (6.8.0-2) experimental; urgency=low + + * Build against xserver 1.5 rc5. + + -- Brice Goglin Mon, 21 Jul 2008 01:59:38 +0200 + +xserver-xorg-video-mach64 (6.8.0-1) unstable; urgency=low + + * New upstream release. + * Drop the useless epoch for the first upload to unstable. + * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from + /usr/bin/Xorg and other modules, and that's not a bug, so we want + dpkg-shlibdeps to shut up about symbols it can't find. + + Build-depend on dpkg-dev >= 1.14.17. + + -- Brice Goglin Fri, 13 Jun 2008 00:42:10 +0200 + +xserver-xorg-video-mach64 (1:6.8.1~git20080301.56a1c9f0-3) experimental; urgency=low + + * Add Conflicts with xserver-xorg-video-ati (<= 1:6.8.0-1) to ease switching + between unstable and experimental for now, closes: #469541. + + -- Brice Goglin Mon, 10 Mar 2008 23:59:52 +0100 + +xserver-xorg-video-mach64 (1:6.8.1~git20080301.56a1c9f0-2) experimental; urgency=low + + * Fix Replaces, thanks Michael Biebl, closes: #469142. + + -- Brice Goglin Mon, 03 Mar 2008 18:21:05 +0100 + +xserver-xorg-video-mach64 (1:6.8.1~git20080301.56a1c9f0-1) experimental; urgency=low + + * New upstream snapshot after the split of xf86-video-mach64 out of + xf86-video-ati. + + Replaces xserver-xorg-driver-ati (<= 1:6.8.0-1). + + Drop obsolete conflicts/replaces. + + Update 01_gen_pci_ids.diff to use all MACH64 entries from + /usr/include/xorg/xf86PciInfo.h. + + Add a NEWS entry about the need to change Driver ati into mach64. + * Bump Standards-Version: to 3.7.3, no change needed. + * Remove XS- prefix to Vcs-Browser and Vcs-Git fields. + + -- Brice Goglin Sun, 02 Mar 2008 12:55:35 +0100 + +xserver-xorg-video-ati (1:6.8.0-1) unstable; urgency=low + + * New upstream release. + + Bring back to life planar-to-packed conversion for rs4xx, + closes: #448577. + + -- Brice Goglin Tue, 19 Feb 2008 08:24:35 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080203.f65e8dfa-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to f65e8dfa. + + Reverts "Default to 1x again with non-v3 AGP cards", closes: #457767. + + -- Brice Goglin Sun, 03 Feb 2008 10:49:43 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080117.6bd510a2-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to 6bd510a2. + + -- Brice Goglin Thu, 17 Jan 2008 10:54:03 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080109.10e7636c-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to 10e7636c. + + -- Brice Goglin Wed, 09 Jan 2008 23:43:53 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080102.30cab1db-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to 30cab1db. + + -- Brice Goglin Wed, 02 Jan 2008 22:04:12 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20080101.f65374f5-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to f65374f5. + + -- Brice Goglin Tue, 01 Jan 2008 11:37:58 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20071223.ad3325f6-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to ad3325f6. + + Add IgnoreLidStatus option to enable lid even when closed, + closes: #457612, #457516. + + Fix PLL input setup on mac cards, closes: #457563. + + -- Brice Goglin Sun, 23 Dec 2007 23:24:43 +0100 + +xserver-xorg-video-ati (1:6.7.198~git20071221.be7f8fd3-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to be7f8fd3. + + New atombios based support for r500 and r600 boards. + + Zaphod mode is back, reimplemented on top of RandR 1.2. + + -- Brice Goglin Fri, 21 Dec 2007 08:39:57 +0100 + +xserver-xorg-video-ati (1:6.7.197-1) unstable; urgency=low + + * New upstream release candidate. + * Upload to unstable since this release candidate is supposed + to be much better than the old 1:6.6.193-3. + * Add a NEWS entry pointing to some RandR 1.2 documentation. + + -- Brice Goglin Fri, 21 Dec 2007 08:11:07 +0100 + +xserver-xorg-video-ati (1:6.7.197~git20071219.ce4fa1ce-1) experimental; urgency=low + + * New upstream snapshot, containing commits up to ce4fa1ce. + + Default to 1x again with non-v3 AGP cards, closes: #444049. + + -- Brice Goglin Wed, 19 Dec 2007 08:44:33 +0100 + +xserver-xorg-video-ati (1:6.7.196-2) experimental; urgency=low + + * New upstream snapshot, containing commits up to 5022d006. + + Fix the washed out color, closes: #440174. + + Update 01_gen_pci_ids.diff to use the new ati_pciids_gen.h. + + -- Brice Goglin Mon, 03 Dec 2007 21:26:02 +0100 + +xserver-xorg-video-ati (1:6.7.196-1) experimental; urgency=low + + * New upstream release candidate. + + -- Brice Goglin Mon, 12 Nov 2007 08:38:43 +0100 + +xserver-xorg-video-ati (1:6.7.195-2) experimental; urgency=low + + * New upstream snapshot, + based on commit ddec5783103045084a66a34d71326cc6e4a3f598 + + Fixes some LVDS issues, closes: #445746. + + -- Brice Goglin Tue, 09 Oct 2007 18:27:22 +0200 + +xserver-xorg-video-ati (1:6.7.195-1) experimental; urgency=low + + * New upstream release candidate. + + -- Julien Cristau Sat, 06 Oct 2007 02:56:56 +0200 + +xserver-xorg-video-ati (1:6.7.194-1) experimental; urgency=low + + * New upstream release candidate. + + Add MacModel "mini" option to support Mac Mini connector table, + closes: #443570. + + Fix crash when Xv window is outside of either crtc, + closes: #441902. + + -- Brice Goglin Mon, 24 Sep 2007 07:59:36 +0200 + +xserver-xorg-video-ati (1:6.7.193-1) experimental; urgency=low + + * New upstream release candidate. + + Fix distortion after lid close/reopen, closes: #435114. + + Stop wrongly detecting the TV-output as connected, closes: #439322. + + Fix outputs after VT switch, closes: #443151. + + -- Brice Goglin Thu, 20 Sep 2007 07:34:02 +0200 + +xserver-xorg-video-ati (1:6.7.192-4) experimental; urgency=low + + * Really build against xserver 2:1.4. + * Pull upstream commits up to 2d78e2b6f36c21812b15eea0f1c7004e748fd5ab. + + -- Brice Goglin Thu, 13 Sep 2007 22:35:56 +0200 + +xserver-xorg-video-ati (1:6.7.192-3) experimental; urgency=low + + * Build against xserver 2:1.4-1. + + -- Brice Goglin Fri, 07 Sep 2007 17:52:57 +0200 + +xserver-xorg-video-ati (1:6.7.192-2) experimental; urgency=low + + * Build against xserver 1.3.99.2. + + -- Brice Goglin Tue, 04 Sep 2007 19:12:45 +0200 + +xserver-xorg-video-ati (1:6.7.192-1) experimental; urgency=low + + * New upstream release candidate. + + UseFBDev option removed, closes: #372920. + + Monitor detection fixed, closes: #413500. + + -- Brice Goglin Mon, 27 Aug 2007 08:26:38 +0200 + +xserver-xorg-video-ati (1:6.7.191-1) experimental; urgency=low + + * New upstream release candidate. + + TV-output support, closes: #332410, #360186, #378594, #435691. + + Bump x11proto-randr-dev build-dependency to >= 1.2 for RandR-1.2 + support. + + -- Brice Goglin Thu, 23 Aug 2007 08:15:03 +0200 + +xserver-xorg-video-ati (1:6.6.193-2) experimental; urgency=low + + * Build against xserver 1.3.99.0. + * Add 01_gen_pci_ids.diff. This patch adds a list of pci id's that the + driver supports so that the server can automatically load it. + * Use ${binary:Version} instead of ${Source-Version}. + + -- Brice Goglin Mon, 20 Aug 2007 19:49:33 +0200 + +xserver-xorg-video-ati (1:6.6.193-1) experimental; urgency=low + + [ Brice Goglin ] + * New upstream release candidate. + + Add references to radeon and r128 manpages in SEE ALSO + in the ati(4) manpage (closes: #386001). + + Fix typo in "specifying" in the radeon(4) manpage + (closes: #432059). + + Fully zero-initialize info->CRT2pScrn->monitor (closes: #422777). + + Avoid crash in MACH64 Xv code (closes: #320828). + + Drop 01_ati_r128_update_chip_identification.diff since + this information is redundant and does not matter anyway + since the driver auto-detects how the card is connected + to the system. + + Drop 02_radeon_manpage.diff, merged upstream. + + [ Julien Cristau ] + * Add upstream URL to debian/copyright. Thanks, Loïc Minier. + + -- Brice Goglin Sat, 4 Aug 2007 15:14:49 +0200 + +xserver-xorg-video-ati (1:6.6.192-1) experimental; urgency=low + + [ Brice Goglin ] + * Build a xserver-xorg-video-ati-dbg package with debugging symbols. + * Fix Provides: xf86-video-driver-atimisc to match Replaces: and + Conflicts: xserver-xorg-video-atimisc. + Thanks to Eric Lavarde (closes: #372312). + * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902 + (needed to let xsfbs get access to serverminver). + * Add XS-Vcs-*. + * Add a link to www.X.org and a reference to the xf86-video-ati + module in the long description (closes: #425321). + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-ati. + + [ Julien Cristau ] + * New upstream release candidate + * Refresh patch 02_radeon_manpage.diff. + + -- Julien Cristau Mon, 21 May 2007 01:28:33 +0200 + +xserver-xorg-video-ati (1:6.6.191-1) experimental; urgency=low + + [ Brice Goglin ] + * New upstream release candidate. + * autoreconf. + + [ Julien Cristau ] + * Drop Fabio and Branden from Uploaders, with their permission. Hopefully + they'll come back when they have more time! + + -- Julien Cristau Wed, 28 Mar 2007 14:26:43 +0200 + +xserver-xorg-video-ati (1:6.6.3-5) experimental; urgency=low + + * Bump build-dep on libdrm-dev to >= 2.2 to fix FTBFS (closes: #413100). + Thanks, Frank Lichtenheld! + * Add patch 02_radeon_manpage.diff to replace non-ascii character with the + corresponding groff escape sequence in the radeon manpage. + + -- Julien Cristau Fri, 2 Mar 2007 22:44:03 +0100 + +xserver-xorg-video-ati (1:6.6.3-4) experimental; urgency=low + + * Generate server dependencies automatically from the ABI + * Merge changes from upstream pre-release + * Remove obsolete 02_radeon_memmap_fbdev.diff + + -- David Nusinow Wed, 21 Feb 2007 22:54:17 -0500 + +xserver-xorg-video-ati (1:6.6.3-3) UNRELEASED; urgency=low + + * Add link to xserver-xorg-core bug script, so that bugreports contain + the user's config and log files. + * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous + versions don't have the bug script. + + -- Julien Cristau Tue, 7 Nov 2006 07:30:39 +0100 + +xserver-xorg-video-ati (1:6.6.3-2) unstable; urgency=low + + * Add 02_radeon_memmap_fbdev.diff. This should fix breakage when using + fbdev. Thanks Michel Dänzer. Closes: #369167 + * Don't require libdrm-dev on hurd-i386. Thanks Michael Banck. + Closes: #392876 + + -- David Nusinow Sat, 14 Oct 2006 14:30:22 -0400 + +xserver-xorg-video-ati (1:6.6.3-1) unstable; urgency=low + + * New upstream release + + -- David Nusinow Fri, 13 Oct 2006 14:02:45 -0400 + +xserver-xorg-video-ati (1:6.6.2-2) unstable; urgency=low + + [ Drew Parsons ] + * Include upstream ChangeLog. Closes: #365104. + * Upload to unstable (X11R7.1 transition). + + -- David Nusinow Mon, 18 Sep 2006 19:57:28 -0400 + +xserver-xorg-video-ati (1:6.6.2-1) experimental; urgency=low + + * New upstream version. Happy birthday. + * Use debhelper 5. + * Standards version 3.7.2. + * Add reference to /usr/share/common-licenses/GPL to debian/copyright. + * Use dh_installman to install man pages. + * Exclude .la files from dh_install. + + -- Drew Parsons Thu, 31 Aug 2006 21:36:05 +1000 + +xserver-xorg-video-ati (1:6.6.1-2) experimental; urgency=low + + [ Drew Parsons ] + * Provides: xserver-xorg-video-1.0 not xserver-xorg-video. + + [ David Nusinow ] + * Bump xserver (build-)depends epochs to 2: to deal with botched + server upload + + -- David Nusinow Tue, 22 Aug 2006 23:46:26 +0000 + +xserver-xorg-video-ati (1:6.6.1-1) experimental; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + + [ David Nusinow ] + * New upstream release + * Bump dependency on xserver-xorg-core to >= 1:1.1.1. Do the same thing for + the build-dep on xserver-xorg-dev. + + -- David Nusinow Sun, 6 Aug 2006 20:15:19 +0000 + +xserver-xorg-video-ati (1:6.5.8.0-1) unstable; urgency=low + + * New upstream release + * Use dh_install with --list-missing + * Add build-dep on quilt + * Remove obsolete 02_ppc_fix.diff. Now incorporated upstream. + + -- David Nusinow Tue, 25 Apr 2006 22:11:48 -0400 + +xserver-xorg-video-ati (1:6.5.7.3-3) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:26 -0500 + +xserver-xorg-video-ati (1:6.5.7.3-2) experimental; urgency=low + + * Port patches from trunk + + general/043_ati_r128_update_chip_identification.diff + * Apply ppc-fix.patch and incorporate it in to our patch system instead of + just having it sit in the debian directory + + -- David Nusinow Sun, 26 Feb 2006 17:46:59 -0500 + +xserver-xorg-video-ati (1:6.5.7.3-1) experimental; urgency=low + + * First upload to Debian + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Fri, 13 Jan 2006 00:35:49 -0500 + +xserver-xorg-driver-ati (1:6.5.7.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Also install Rage Theatre multimedia modules. + + -- Daniel Stone Wed, 4 Jan 2006 17:21:27 +1100 + +xserver-xorg-driver-ati (1:6.5.7-0ubuntu3) dapper; urgency=low + + * Add missing Build-Depends (x11proto-fonts-dev, x11proto-randr-dev, + x11proto-render-dev, libdrm (>> 1.0.5), x11proto-xf86dri-dev). + + -- Daniel Stone Mon, 5 Dec 2005 14:52:47 +1100 + +xserver-xorg-driver-ati (1:6.5.7-0ubuntu2) dapper; urgency=low + + * Apply patch from https://bugs.freedesktop.org/attachment.cgi?id=3620 to + fix hard crash on powerpc. The patch is also stored in + debian/ppc-fix.patch. + NOTE: according to benh the patch still needs some extra polishing. + + -- Fabio M. Di Nitto Fri, 25 Nov 2005 11:34:33 +0100 + +xserver-xorg-driver-ati (1:6.5.7-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:25:16 +1100 + +xserver-xorg-driver-ati (1:6.5.6.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 18:01:13 +1000 + +xserver-xorg-driver-ati (1:6.5.6-1) breezy; urgency=low + + * First xserver-xorg-driver-ati release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-mach64-6.9.3.orig/debian/control +++ xserver-xorg-video-mach64-6.9.3/debian/control @@ -0,0 +1,58 @@ +Source: xserver-xorg-video-mach64 +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian X Strike Force +Uploaders: Drew Parsons , Cyril Brulebois +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + pkg-config, + xserver-xorg-dev (>= 2:1.11.99.901), + x11proto-gl-dev, + x11proto-xext-dev, + x11proto-core-dev, + x11proto-video-dev, + x11proto-xinerama-dev, + libgl1-mesa-dev | libgl-dev, + x11proto-fonts-dev, + x11proto-randr-dev (>= 1.2), + x11proto-render-dev, + libdrm-dev (>> 2.2) [!hurd-i386], + x11proto-xf86dri-dev, + quilt, + xutils-dev +Standards-Version: 3.9.3 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-mach64 +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-mach64.git + +Package: xserver-xorg-video-mach64 +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + ${xviddriver:Provides} +Description: X.Org X server -- ATI Mach64 display driver + This driver for the X.Org X server (see xserver-xorg for a further description) + provides support for the ATI Mach64 series. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-mach64 driver module. + +Package: xserver-xorg-video-mach64-dbg +Architecture: any +Depends: + xserver-xorg-video-mach64 (= ${binary:Version}), + ${misc:Depends}, +Section: debug +Priority: extra +Description: X.Org X server -- ATI display driver (debugging symbols) + This driver for the X.Org X server (see xserver-xorg for a further description) + provides support for the ATI Mach64 series. + . + This package provides debugging symbols for the Xorg X server ATI Mach64 + display driver. --- xserver-xorg-video-mach64-6.9.3.orig/debian/README.source +++ xserver-xorg-video-mach64-6.9.3/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated using this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. --- xserver-xorg-video-mach64-6.9.3.orig/debian/xserver-xorg-video-mach64.install +++ xserver-xorg-video-mach64-6.9.3/debian/xserver-xorg-video-mach64.install @@ -0,0 +1 @@ +usr/lib/xorg/modules/drivers/*.so --- xserver-xorg-video-mach64-6.9.3.orig/debian/patches/series +++ xserver-xorg-video-mach64-6.9.3/debian/patches/series @@ -0,0 +1 @@ +01_fix_build.diff --- xserver-xorg-video-mach64-6.9.3.orig/debian/patches/01_fix_build.diff +++ xserver-xorg-video-mach64-6.9.3/debian/patches/01_fix_build.diff @@ -0,0 +1,13 @@ +diff --git a/src/atiscreen.c b/src/atiscreen.c +index 2957877..b1fbd3c 100644 +--- a/src/atiscreen.c ++++ b/src/atiscreen.c +@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL) + #ifdef TV_OUT + /* Fix-up TV out after ImpacTV probe */ + if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO) +- ATISwitchMode(0, pScreenInfo->currentMode, 0); ++ ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode)); + #endif /* TV_OUT */ + + #ifdef XF86DRI_DEVEL