--- xserver-xorg-video-trident-lts-raring-1.3.6.orig/autogen.sh +++ xserver-xorg-video-trident-lts-raring-1.3.6/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-trident-lts-raring-1.3.6.orig/debian/watch +++ xserver-xorg-video-trident-lts-raring-1.3.6/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-trident +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-trident-(.*)\.tar\.gz --- xserver-xorg-video-trident-lts-raring-1.3.6.orig/debian/rules +++ xserver-xorg-video-trident-lts-raring-1.3.6/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-trident-lts-raring-1.3.6.orig/debian/changelog +++ xserver-xorg-video-trident-lts-raring-1.3.6/debian/changelog @@ -0,0 +1,270 @@ +xserver-xorg-video-trident-lts-raring (1:1.3.6-0ubuntu2~precise1) precise-proposed; urgency=low + + * Initial lts-raring xserver stack upload, i386 and amd64 only. (LP: + #1177679) + + -- Maarten Lankhorst Wed, 08 May 2013 09:08:03 +0200 + +xserver-xorg-video-trident (1:1.3.6-0ubuntu2) quantal; urgency=low + + * fix-loading.diff: Move TRIDENT_Sync inside #ifdef HAVE_XAA_H. Allows + the driver to load. (LP: #1044820) + + -- Timo Aaltonen Wed, 26 Sep 2012 11:02:15 +0300 + +xserver-xorg-video-trident (1:1.3.6-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Maarten Lankhorst Thu, 19 Jul 2012 13:21:51 +0200 + +xserver-xorg-video-trident (1:1.3.5-1) unstable; urgency=low + + * New upstream release: + - Fix FTBFS with X server 1.12. + + -- Cyril Brulebois Tue, 01 May 2012 19:49:17 +0200 + +xserver-xorg-video-trident (1:1.3.4-2) 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! + * Remove long obsolete Replaces/Conflicts. + * Wrap Depends/Provides. + + -- Cyril Brulebois Sat, 05 Feb 2011 14:59:03 +0100 + +xserver-xorg-video-trident (1:1.3.4-1) experimental; urgency=low + + [ Christopher James Halse Rogers ] + * New upstream version + - Fixes build against Xserver 1.9, which dropped ISA support and mibank.h + * Bump Standards-Version to 3.9.1 (no changes needed) + + [ Cyril Brulebois ] + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois Sat, 16 Oct 2010 21:26:40 +0200 + +xserver-xorg-video-trident (1:1.3.3-2) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + + [ Cyril Brulebois ] + * Update to new xsfbs, replace deprecated ${xserver:Depends} with + ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev + accordingly. + * Add myself to Uploaders. + * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed). + + -- Cyril Brulebois Tue, 04 May 2010 00:50:44 +0200 + +xserver-xorg-video-trident (1:1.3.3-1) experimental; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + * Bump Standards-Version to 3.8.3. + * Build against Xserver 1.7. + * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to + choose a driver during autoconfiguration. + + [ Cyril Brulebois ] + * Upload to experimental. + + -- Cyril Brulebois Sun, 06 Dec 2009 01:12:19 +0100 + +xserver-xorg-video-trident (1:1.3.1-1) unstable; urgency=low + + * New upstream release. + * Run autoreconf on build. + * Allow parallel builds. + * Upload to unstable. + + -- Julien Cristau Thu, 09 Apr 2009 12:24:19 +0100 + +xserver-xorg-video-trident (1:1.3.0-2) experimental; urgency=low + + * Build against xserver 1.5. + + -- Julien Cristau Wed, 10 Sep 2008 12:45:40 +0100 + +xserver-xorg-video-trident (1:1.3.0-1) unstable; urgency=low + + * New upstream release. + * Refresh patch 01_gen_pci_ids.diff. + * Remove Branden from Uploaders with his permission, and add myself. + * Bump Standards-Version to 3.7.3. + * 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 13:19:04 +0200 + +xserver-xorg-video-trident (1:1.2.4-1) unstable; urgency=low + + * New upstream release. + + Fix XV overlay on XP4, closes: #407620. + * Drop XS- prefix from Vcs-* fields. + * Add upstream URL to debian/copyright. + + -- Brice Goglin Sun, 10 Feb 2008 22:21:05 +0100 + +xserver-xorg-video-trident (1:1.2.3-6) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Sun, 16 Sep 2007 15:43:49 -0400 + +xserver-xorg-video-trident (1:1.2.3-5) experimental; urgency=low + + * Build against and build-dep on xserver 1.4 + + -- David Nusinow Sun, 09 Sep 2007 22:58:40 -0400 + +xserver-xorg-video-trident (1:1.2.3-4) experimental; urgency=low + + * Build against xserver 1.3.99.0. Build-dep on it as well. + * Add 01_gen_pci_ids.diff. This patch provides a list of the pci id's that + the driver supports so that the server can automatically load it under the + right circumstances. + + Enable our patch system and add quilt to build-depends + + -- David Nusinow Mon, 20 Aug 2007 22:11:21 -0400 + +xserver-xorg-video-trident (1:1.2.3-3) UNRELEASED; urgency=low + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-trident. + + [ 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-trident + module in the long description. + * Remove Fabio from uploaders with his permission. He's always welcome back. + + -- Brice Goglin Mon, 30 Apr 2007 01:10:08 +0200 + +xserver-xorg-video-trident (1:1.2.3-2) experimental; urgency=low + + * Generate server dependencies automatically from the ABI + + -- David Nusinow Wed, 21 Feb 2007 22:54:43 -0500 + +xserver-xorg-video-trident (1:1.2.3-1) 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 ] + * New upstream release + * Fixes broken blitting on XP4/XP5 cards + * Bump standards version to 3.7.2.2. No changes needed. + * Exclude .la file from being installed + + -- David Nusinow Sat, 25 Nov 2006 12:18:20 -0500 + +xserver-xorg-video-trident (1:1.2.1-3) unstable; urgency=low + + [ Steve Langasek ] + * Upload to unstable + + -- David Nusinow Mon, 18 Sep 2006 19:58:10 -0400 + +xserver-xorg-video-trident (1:1.2.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:47 +0000 + +xserver-xorg-video-trident (1:1.2.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 + + -- David Nusinow Wed, 16 Aug 2006 00:50:05 +0000 + +xserver-xorg-video-trident (1:1.0.1.2-2) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:26:23 -0500 + +xserver-xorg-video-trident (1:1.0.1.2-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:42:16 -0500 + +xserver-xorg-driver-trident (1:1.0.1.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Add provides on xserver-xorg-driver. + + -- Daniel Stone Wed, 4 Jan 2006 20:07:55 +1100 + +xserver-xorg-driver-trident (1:1.0.1.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 09:13:39 +1100 + +xserver-xorg-driver-trident (1:1.0.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 12 Dec 2005 13:08:51 +1100 + +xserver-xorg-driver-trident (1:1.0.0.2-0ubuntu2) dapper; urgency=low + + * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev, + x11proto-randr-dev, x11proto-render-dev). + + -- Daniel Stone Mon, 5 Dec 2005 12:58:39 +1100 + +xserver-xorg-driver-trident (1:1.0.0.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:37:42 +1100 + +xserver-xorg-driver-trident (1:1.0.0.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 17:11:39 +1000 + +xserver-xorg-driver-trident (1:1.0.0-1) breezy; urgency=low + + * First xserver-xorg-driver-trident release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-trident-lts-raring-1.3.6.orig/debian/copyright +++ xserver-xorg-video-trident-lts-raring-1.3.6/debian/copyright @@ -0,0 +1,22 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +Copyright 1997-2003 by Alan Hourihane, North Wales, UK. + +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 Alan Hourihane not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Alan Hourihane makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ALAN HOURIHANE 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-trident-lts-raring-1.3.6.orig/debian/README.source +++ xserver-xorg-video-trident-lts-raring-1.3.6/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-trident-lts-raring-1.3.6.orig/debian/compat +++ xserver-xorg-video-trident-lts-raring-1.3.6/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-video-trident-lts-raring-1.3.6.orig/debian/control +++ xserver-xorg-video-trident-lts-raring-1.3.6/debian/control @@ -0,0 +1,43 @@ +Source: xserver-xorg-video-trident-lts-raring +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian X Strike Force +Uploaders: Cyril Brulebois +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + pkg-config, + quilt, + xutils-dev, + xserver-xorg-dev-lts-raring (>= 2:1.9.4), + x11proto-video-dev, + x11proto-xext-dev, + x11proto-xf86dga-dev, + x11proto-core-dev, + x11proto-fonts-dev, + x11proto-randr-dev, + x11proto-render-dev, +Standards-Version: 3.9.3 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-trident +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-trident.git + +Package: xserver-xorg-video-trident-lts-raring +Architecture: amd64 i386 +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + xserver-xorg-video-trident, xorg-renamed-package, xorg-renamed-package-lts-raring, + ${xviddriver:Provides} +Description: X.Org X server -- Trident display driver + This package provides the driver for Trident Blade/Image/ProVidia/TGUI/9xxx + video cards. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-trident driver module. +Replaces: xserver-xorg-video-trident +Conflicts: xserver-xorg-video-trident, xorg-renamed-package-lts-quantal, --- xserver-xorg-video-trident-lts-raring-1.3.6.orig/debian/xserver-xorg-video-trident-lts-raring.links +++ xserver-xorg-video-trident-lts-raring-1.3.6/debian/xserver-xorg-video-trident-lts-raring.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-trident/script --- xserver-xorg-video-trident-lts-raring-1.3.6.orig/debian/xserver-xorg-video-trident-lts-raring.install +++ xserver-xorg-video-trident-lts-raring-1.3.6/debian/xserver-xorg-video-trident-lts-raring.install @@ -0,0 +1,3 @@ +usr/lib/xorg/modules/drivers/*.so +usr/share/man/man4/* + --- xserver-xorg-video-trident-lts-raring-1.3.6.orig/debian/patches/fix-loading.diff +++ xserver-xorg-video-trident-lts-raring-1.3.6/debian/patches/fix-loading.diff @@ -0,0 +1,32 @@ +commit 48c15909691e28ad2c188a2978b1c8ef3d9d8760 +Author: Timo Aaltonen +Date: Wed Sep 26 11:01:26 2012 +0300 + + Fix loading the driver without XAA + +diff --git a/src/trident_dga.c b/src/trident_dga.c +index 0263aa7..c4b5b9a 100644 +--- a/src/trident_dga.c ++++ b/src/trident_dga.c +@@ -37,10 +37,10 @@ + static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, + int *, int *, int *); + static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr); +-static void TRIDENT_Sync(ScrnInfoPtr); + static int TRIDENT_GetViewport(ScrnInfoPtr); + static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int); + #ifdef HAVE_XAA_H ++static void TRIDENT_Sync(ScrnInfoPtr); + static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long); + static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int); + #if 0 +@@ -56,8 +56,8 @@ DGAFunctionRec TRIDENTDGAFuncs = { + TRIDENT_SetMode, + TRIDENT_SetViewport, + TRIDENT_GetViewport, +- TRIDENT_Sync, + #ifdef HAVE_XAA_H ++ TRIDENT_Sync, + TRIDENT_FillRect, + TRIDENT_BlitRect, + #if 0 --- xserver-xorg-video-trident-lts-raring-1.3.6.orig/debian/patches/series +++ xserver-xorg-video-trident-lts-raring-1.3.6/debian/patches/series @@ -0,0 +1 @@ +fix-loading.diff