--- xserver-xorg-video-s3-0.6.5.orig/autogen.sh +++ xserver-xorg-video-s3-0.6.5/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-s3-0.6.5.orig/debian/README.source +++ xserver-xorg-video-s3-0.6.5/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-s3-0.6.5.orig/debian/changelog +++ xserver-xorg-video-s3-0.6.5/debian/changelog @@ -0,0 +1,289 @@ +xserver-xorg-video-s3 (1:0.6.5-0ubuntu4) trusty; urgency=medium + + * Rebuild for xorg 1.15 abi. + + -- Maarten Lankhorst Wed, 05 Feb 2014 10:08:31 +0000 + +xserver-xorg-video-s3 (1:0.6.5-0ubuntu3.1) raring; urgency=low + + * remove-mibstore.diff: Remove mibstore.h. + + -- Timo Aaltonen Fri, 08 Feb 2013 14:11:39 +0200 + +xserver-xorg-video-s3 (1:0.6.5-0ubuntu2) raring; urgency=low + + * Rebuild to pick up new Xserver dependencies. + + -- Timo Aaltonen Fri, 08 Feb 2013 11:59:09 +0200 + +xserver-xorg-video-s3 (1:0.6.5-0ubuntu1) quantal-proposed; urgency=low + + * Sync from unreleased debian git. + + -- Timo Aaltonen Thu, 02 Aug 2012 00:07:51 +0300 + +xserver-xorg-video-s3 (1:0.6.5-1) UNRELEASED; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.9.3 (no changes needed). + + -- Maarten Lankhorst Wed, 18 Jul 2012 15:05:26 +0200 + +xserver-xorg-video-s3 (1:0.6.3-4) 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. + * 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). + * Add quilt build-dep for future use. + + -- Cyril Brulebois Sat, 05 Feb 2011 14:54:24 +0100 + +xserver-xorg-video-s3 (1:0.6.3-3) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + * Add myself to Uploaders. + + -- Cyril Brulebois Sat, 16 Oct 2010 20:44:50 +0200 + +xserver-xorg-video-s3 (1:0.6.3-2) unstable; urgency=medium + + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + * Update xsfbs, use new ${xviddriver:Depends} substvar. + + -- Julien Cristau Sat, 15 May 2010 16:18:28 +0200 + +xserver-xorg-video-s3 (1:0.6.3-1) experimental; urgency=low + + [ Brice Goglin ] + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + Disable patch system and remove quilt from build-deps. + + [ Timo Aaltonen ] + * New upstream release. + * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. + + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 02:00:55 +0100 + +xserver-xorg-video-s3 (1:0.6.2-1) unstable; urgency=low + + * Add README.source, bump Standards-Version to 3.8.2. + * New upstream release. + + Fix 24bits support (for Virtual PC 2007), closes: #470408. + * Install the s3.4 manpage, closes: #374059. + + -- Brice Goglin Mon, 20 Jul 2009 18:42:04 +0200 + +xserver-xorg-video-s3 (1:0.6.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Thu, 09 Apr 2009 11:10:16 +0100 + +xserver-xorg-video-s3 (1:0.6.1-1) experimental; urgency=low + + * New upstream release. + * Build against xserver 1.6 rc1. + * Allow parallel builds. + * Run autoreconf on build; add build-deps on automake, libtool and + xutils-dev. + * Add myself to Uploaders. + + -- Brice Goglin Wed, 04 Feb 2009 07:47:57 +0100 + +xserver-xorg-video-s3 (1:0.6.0-2) experimental; urgency=low + + * Build against xserver 1.5. + + -- Julien Cristau Fri, 05 Sep 2008 02:00:17 +0200 + +xserver-xorg-video-s3 (1:0.6.0-1) unstable; urgency=low + + [ Brice Goglin ] + * Add upstream URL to debian/copyright. + + [ Julien Cristau ] + * New upstream release. + * Refresh 01_gen_pci_ids.diff. + * Remove Branden from Uploaders with his permission. + * Bump Standards-Version to 3.7.3. + * Drop the XS- prefix from Vcs-* control fields. + * Add myself to Uploaders. + * 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. + + -- Julien Cristau Fri, 06 Jun 2008 11:57:22 +0200 + +xserver-xorg-video-s3 (1:0.5.0-4) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 15:43:47 -0400 + +xserver-xorg-video-s3 (1:0.5.0-3) experimental; urgency=low + + * Build against xserver 1.4 and build-dep on it as well + * Add 01_gen_pci_ids.diff. This patch provides a set of PCI id's supported + by this driver so that the server can automatically load it + + -- David Nusinow Thu, 13 Sep 2007 20:50:28 -0400 + +xserver-xorg-video-s3 (1:0.5.0-2) unstable; urgency=low + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-s3. + + [ Brice Goglin ] + * Install the upstream changelog. + * 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-s3 + module in the long description. + + -- Julien Cristau Wed, 02 May 2007 14:58:44 +0200 + +xserver-xorg-video-s3 (1:0.5.0-1) experimental; urgency=low + + * New upstream release plus fixes from upstream + * Remove obsolete 01_enable_new_mmio.diff + * Generate server dependencies automatically from the ABI + + -- David Nusinow Wed, 28 Feb 2007 23:21:48 -0500 + +xserver-xorg-video-s3 (1:0.4.1-5) unstable; urgency=low + + [ Julien Cristau ] + * 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. + + [ David Nusinow ] + * Replace old 01_enable_new_mmio.diff with new patch that doesn't break old + chips that don't have the new mmio scheme. Thanks Eugene Konev for + pointing out the problem and Evgeny M. Zubok for writing the patch. + Closes: #377386 + + -- David Nusinow Sat, 25 Nov 2006 14:07:01 -0500 + +xserver-xorg-video-s3 (1:0.4.1-4) unstable; urgency=low + + [ Drew Parsons ] + * Provides: xserver-xorg-video-1.0. Closes: #362883. + + [ David Nusinow ] + * Add 01_enable_new_mmio.diff for a define that was lost in the move to 7.1. + Thanks Anton Martchukov for the report and Evgeny M. Zubok for the patch. + Closes: #377386 + * Remove Fabio from uploaders with his permission. He's always welcome back. + * Bump standards version to 3.7.2.2. No changes necessary. + * Exclude s3_drv.la from dh_install + + -- David Nusinow Sat, 7 Oct 2006 22:37:01 -0400 + +xserver-xorg-video-s3 (1:0.4.1-3) unstable; urgency=low + + [ Steve Langasek ] + * Upload to unstable + + -- David Nusinow Mon, 18 Sep 2006 19:57:47 -0400 + +xserver-xorg-video-s3 (1:0.4.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:37 +0000 + +xserver-xorg-video-s3 (1:0.4.1-1) experimental; urgency=low + + [ Andres Salomon ] + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + + [ 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. + * Bump debhelper compat to 5 + * Don't try to install manpages, there aren't any + + -- David Nusinow Tue, 15 Aug 2006 00:37:53 +0000 + +xserver-xorg-video-s3 (1:0.3.5.4-3) unstable; urgency=low + + * Correctly name the .install file. Thanks Frank Gevaerts. (closes: #362471) + + -- David Nusinow Thu, 13 Apr 2006 19:06:21 -0400 + +xserver-xorg-video-s3 (1:0.3.5.4-2) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:25:51 -0500 + +xserver-xorg-video-s3 (1:0.3.5.4-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:39:41 -0500 + +xserver-xorg-driver-s3 (1:0.3.5.4-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 09:11:26 +1100 + +xserver-xorg-driver-s3 (1:0.3.5.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 12 Dec 2005 13:12:37 +1100 + +xserver-xorg-driver-s3 (1:0.3.5.2-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev, + x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:56:48 +1100 + +xserver-xorg-driver-s3 (1:0.3.5.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:05:54 +1100 + +xserver-xorg-driver-s3 (1:0.3.5.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 17:09:19 +1000 + +xserver-xorg-driver-s3 (1:0.3.5-1) breezy; urgency=low + + * First xserver-xorg-driver-s3 release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-s3-0.6.5.orig/debian/compat +++ xserver-xorg-video-s3-0.6.5/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-video-s3-0.6.5.orig/debian/control +++ xserver-xorg-video-s3-0.6.5/debian/control @@ -0,0 +1,41 @@ +Source: xserver-xorg-video-s3 +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian X Strike Force +Uploaders: Cyril Brulebois +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + quilt, + pkg-config, + xserver-xorg-dev (>= 2:1.9.4), + x11proto-video-dev, + x11proto-core-dev, + x11proto-fonts-dev, + x11proto-randr-dev, + x11proto-render-dev, + x11proto-xext-dev, + xutils-dev +Standards-Version: 3.9.3 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-s3 +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-s3.git + +Package: xserver-xorg-video-s3 +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + ${xviddriver:Provides} +Description: X.Org X server -- legacy S3 display driver + This package provides the driver for certain legacy S3 video card chipsets, + including the Trio64 and 96x cards. It does not provide support for + ViRGE/Trio3D or Savage chipsets; support for these cards is provided by + xserver-xorg-video-s3virge and xserver-xorg-driver-savage, respectively. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-s3 driver module. --- xserver-xorg-video-s3-0.6.5.orig/debian/copyright +++ xserver-xorg-video-s3-0.6.5/debian/copyright @@ -0,0 +1,25 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + + Copyright 2001 Ani Joshi + + XFree86 4.x driver for S3 chipsets + + +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 Ani Joshi not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. Ani Joshi makes no representations +about the suitability of this software for any purpose. It is provided +"as-is" without express or implied warranty. + +ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ANI JOSHI 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. --- xserver-xorg-video-s3-0.6.5.orig/debian/patches/remove-mibstore.diff +++ xserver-xorg-video-s3-0.6.5/debian/patches/remove-mibstore.diff @@ -0,0 +1,20 @@ +diff --git a/src/s3_driver.c b/src/s3_driver.c +index 61242ad..85763ba 100644 +--- a/src/s3_driver.c ++++ b/src/s3_driver.c +@@ -52,7 +52,6 @@ + #include "compiler.h" + #include "mipointer.h" + #include "micmap.h" +-#include "mibstore.h" + #include "fb.h" + #include "inputstr.h" + #include "shadowfb.h" +@@ -822,7 +821,6 @@ static Bool S3ScreenInit(SCREEN_INIT_ARGS_DECL) + fbPictureInit (pScreen, 0, 0); + S3DGAInit(pScreen); + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* framebuffer manager setup */ --- xserver-xorg-video-s3-0.6.5.orig/debian/patches/series +++ xserver-xorg-video-s3-0.6.5/debian/patches/series @@ -0,0 +1 @@ +remove-mibstore.diff --- xserver-xorg-video-s3-0.6.5.orig/debian/rules +++ xserver-xorg-video-s3-0.6.5/debian/rules @@ -0,0 +1,17 @@ +#!/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 + +# 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-s3-0.6.5.orig/debian/watch +++ xserver-xorg-video-s3-0.6.5/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-s3 +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-s3-(.*)\.tar\.gz --- xserver-xorg-video-s3-0.6.5.orig/debian/xserver-xorg-video-s3.install +++ xserver-xorg-video-s3-0.6.5/debian/xserver-xorg-video-s3.install @@ -0,0 +1,2 @@ +usr/lib/xorg/modules/drivers/*.so +usr/share/man/man4/* --- xserver-xorg-video-s3-0.6.5.orig/debian/xserver-xorg-video-s3.links +++ xserver-xorg-video-s3-0.6.5/debian/xserver-xorg-video-s3.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-s3/script