--- xserver-xorg-video-vmware-11.0.3.orig/ChangeLog +++ xserver-xorg-video-vmware-11.0.3/ChangeLog @@ -1,3 +1,11 @@ +commit 8f8f71f0075d9d5cbbfca93425462ba03c5b8046 +Author: Thomas Hellstrom +Date: Tue Nov 9 14:31:30 2010 +0100 + + Bump package version to 11.0.3 for release + + Signed-off-by: Thomas Hellstrom + commit 30ac6eaf64aa4831025555b72b65843686a35094 Author: Jesse Adkins Date: Tue Sep 28 13:29:52 2010 -0700 --- xserver-xorg-video-vmware-11.0.3.orig/autogen.sh +++ xserver-xorg-video-vmware-11.0.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-vmware-11.0.3.orig/debian/compat +++ xserver-xorg-video-vmware-11.0.3/debian/compat @@ -0,0 +1 @@ +8 --- xserver-xorg-video-vmware-11.0.3.orig/debian/control +++ xserver-xorg-video-vmware-11.0.3/debian/control @@ -0,0 +1,41 @@ +Source: xserver-xorg-video-vmware +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Uploaders: Drew Parsons , Cyril Brulebois +Build-Depends: + debhelper (>= 8), + dh-autoreconf, + quilt, + pkg-config, + xserver-xorg-dev (>= 2:1.9.4), + x11proto-core-dev, + x11proto-fonts-dev, + x11proto-randr-dev, + x11proto-render-dev, + x11proto-xext-dev, + x11proto-xinerama-dev, + xutils-dev (>= 1:7.5+4), + libdrm-dev [!hurd-i386], + libxext-dev, + libx11-dev, +Standards-Version: 3.9.1 +Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-vmware +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-vmware.git + +Package: xserver-xorg-video-vmware +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xviddriver:Depends}, +Provides: + ${xviddriver:Provides} +Description: X.Org X server -- VMware display driver + This package provides the driver for VMware client sessions, i.e. if Linux + is running inside a VMware session. + . + More information about X.Org can be found at: + + . + This package is built from the X.org xf86-video-vmware driver module. --- xserver-xorg-video-vmware-11.0.3.orig/debian/rules +++ xserver-xorg-video-vmware-11.0.3/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +# Enable unit test client tool: +override_dh_auto_configure: + dh_auto_configure -- --enable-vmwarectrl-client + +# 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-vmware-11.0.3.orig/debian/xserver-xorg-video-vmware.links +++ xserver-xorg-video-vmware-11.0.3/debian/xserver-xorg-video-vmware.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-vmware/script --- xserver-xorg-video-vmware-11.0.3.orig/debian/copyright +++ xserver-xorg-video-vmware-11.0.3/debian/copyright @@ -0,0 +1,50 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/driver/ + +Copyright 2006 by VMware, Inc. +Copyright 2007 by VMware, Inc. + +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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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. + +Except as contained in this notice, the name of the copyright holder(s) +and author(s) shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Software without prior written +authorization from the copyright holder(s) and author(s). + +Copyright 2010 VMware, Inc. 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 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-vmware-11.0.3.orig/debian/changelog +++ xserver-xorg-video-vmware-11.0.3/debian/changelog @@ -0,0 +1,299 @@ +xserver-xorg-video-vmware (1:11.0.3-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 & 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:59:54 +0100 + +xserver-xorg-video-vmware (1:11.0.3-1) experimental; urgency=low + + * New upstream release. + * No longer require libdrm-dev on hurd-i386, since upstream now supports + building and running without libdrm. + * Add build-dep on libx11-dev, needed for vmwarectrl. + * Pass --enable-vmwarectrl-client to enable the vmwarectrl unit test + client tool. + * Add usr/bin/vmwarectrl to .install file accordingly. + + -- Cyril Brulebois Tue, 09 Nov 2010 17:47:08 +0100 + +xserver-xorg-video-vmware (1:11.0.2-1) experimental; urgency=low + + [ Robert Hooker ] + * New upstream release. + * Bump xutils-dev requirement for new util-macros. + + [ Cyril Brulebois ] + * Update debian/copyright. + * Switch from --list-missing to --fail-missing for additional safety. + * Exclude .la files accordingly. + + -- Cyril Brulebois Sat, 06 Nov 2010 23:06:22 +0100 + +xserver-xorg-video-vmware (1:11.0.1-3) experimental; urgency=low + + * Build against Xserver 1.9.1 rc1. + + -- Cyril Brulebois Sat, 16 Oct 2010 22:05:33 +0200 + +xserver-xorg-video-vmware (1:11.0.1-2) unstable; urgency=low + + [ Julien Cristau ] + * Update xsfbs, use new ${xviddriver:Depends} substvar. + + [ Cyril Brulebois ] + * Cherry-pick e647511e4b9b924b0617171c56b3bb485674b3ff from upstream + to stop crashing the server on Xorg -configure (Closes: #579910). + + -- Cyril Brulebois Tue, 13 Jul 2010 17:57:43 +0200 + +xserver-xorg-video-vmware (1:11.0.1-1) unstable; urgency=low + + [ Julien Cristau ] + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + + [ Cyril Brulebois ] + * New upsteam release. + * Add libdrm-dev to Build-Depends, needed for the new chainloader + driver. + * Add myself to Uploaders. + + -- Cyril Brulebois Tue, 06 Apr 2010 05:38:23 +0200 + +xserver-xorg-video-vmware (1:10.16.9-1) unstable; urgency=low + + [ Timo Aaltonen ] + * New upstream release. + + fixes loading with server 1.7 (closes: #564922) + + [ Julien Cristau ] + * Bump build-dep on xutils-dev for util-macros 1.4. + * Don't install a list of pci ids, the server doesn't use this anymore. + + -- Julien Cristau Sat, 16 Jan 2010 15:52:44 +0000 + +xserver-xorg-video-vmware (1:10.16.8-1) experimental; urgency=low + + [ 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 00:43:15 +0100 + +xserver-xorg-video-vmware (1:10.16.7-1) unstable; urgency=low + + * New upstream release. + * Add README.source, bump Standards-Version to 3.8.2. + + -- Brice Goglin Thu, 30 Jul 2009 00:52:36 +0200 + +xserver-xorg-video-vmware (1:10.16.6-1) unstable; urgency=low + + * New upstream release. + + -- Brice Goglin Wed, 13 May 2009 07:41:44 +0200 + +xserver-xorg-video-vmware (1:10.16.5-3) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Thu, 09 Apr 2009 13:43:15 +0100 + +xserver-xorg-video-vmware (1:10.16.5-2) experimental; urgency=low + + * Build against xserver 1.6 rc. + + -- Julien Cristau Mon, 02 Feb 2009 22:18:28 +0100 + +xserver-xorg-video-vmware (1:10.16.5-1) experimental; urgency=low + + * Build against xserver 1.5. + * Switch to running autoreconf at build time. Build-depend on automake, + libtool and xutils-dev, and remove generated files in clean. + * New upstream release. + * Support parallel builds. + + -- Julien Cristau Wed, 10 Sep 2008 13:56:32 +0100 + +xserver-xorg-video-vmware (1:10.16.2-1) unstable; urgency=low + + * New upstream release. + * Build-depend on dpkg-dev >= 1.14.17 for dpkg-shlibdeps --warnings. + + -- Brice Goglin Fri, 13 Jun 2008 22:15:37 +0200 + +xserver-xorg-video-vmware (1:10.16.1-1) unstable; urgency=low + + [ Brice Goglin ] + * New upstream release. + * Bump Standards-Version to 3.7.3 (no changes). + * The Vcs-* fields are now recognized by dpkg, so drop the XS- prefix. + * 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. + + [ Timo Aaltonen ] + * Add vmware.ids. Thanks Soren Hansen! + + -- Brice Goglin Sun, 20 Apr 2008 14:58:19 +0200 + +xserver-xorg-video-vmware (1:10.15.2-1) unstable; urgency=low + + [ Brice Goglin ] + * Add upstream URL to debian/copyright. + + [ Drew Parsons ] + * New upstream version. + + -- Drew Parsons Mon, 29 Oct 2007 01:45:06 +1100 + +xserver-xorg-video-vmware (1:10.15.0-1) unstable; urgency=low + + [ Timo Aaltonen ] + * Replaces/Conflicts: xserver-xorg-driver-vmware. + + [ Brice Goglin ] + * New upstream release. + + Pull more upstream fixes up-to 0c76b95e7aeac034cc598ea6a407187f76466411 + * 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-vmware + module in the long description. + * Remove Fabio from uploaders with his permission. He's always welcome back. + + [ David Nusinow ] + * Build against xserver 1.4 and upload to unstable + * Remove Branden from uploaders with his permission. + + -- David Nusinow Sun, 16 Sep 2007 17:05:31 -0400 + +xserver-xorg-video-vmware (1:10.14.1-2) experimental; urgency=low + + * Add build-dep on x11proto-xinerama-dev to fix FTBFS, and bump build-dep on + the server to >= 2:1.2.0-6 to get correct Provides (closes: #413104). + Thanks, Frank Lichtenheld! + * Bump Standards-Version to 3.7.2 (no changes). + + -- Julien Cristau Fri, 2 Mar 2007 23:20:38 +0100 + +xserver-xorg-video-vmware (1:10.14.1-1) experimental; urgency=low + + [ David Nusinow ] + * New upstream release + * Generate server dependencies automatically from the ABI + + [ 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 Wed, 21 Feb 2007 22:54:48 -0500 + +xserver-xorg-video-vmware (1:10.13.0-3) unstable; urgency=low + + [ Steve Langasek ] + * Upload to unstable + + -- David Nusinow Mon, 18 Sep 2006 19:58:16 -0400 + +xserver-xorg-video-vmware (1:10.13.0-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:51 +0000 + +xserver-xorg-video-vmware (1:10.13.0-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 19:28:58 +0000 + +xserver-xorg-video-vmware (1:10.11.1.3-2) unstable; urgency=low + + * Upload to modular + + -- David Nusinow Sun, 26 Mar 2006 20:26:31 -0500 + +xserver-xorg-video-vmware (1:10.11.1.3-1) experimental; urgency=low + + * First upload to Debian + * Add vmware copyright info + * Change source package, package, and provides names to denote the + type of driver and that they are for xserver-xorg + + -- David Nusinow Thu, 19 Jan 2006 20:09:42 -0500 + +xserver-xorg-driver-vmware (1:10.11.1.3-0ubuntu1) dapper; urgency=low + + * New upstream release. + * Add provides on xserver-xorg-driver. + + -- Daniel Stone Wed, 4 Jan 2006 20:10:31 +1100 + +xserver-xorg-driver-vmware (1:10.11.1.2-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 19 Dec 2005 09:16:02 +1100 + +xserver-xorg-driver-vmware (1:10.11.1.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Mon, 12 Dec 2005 13:10:31 +1100 + +xserver-xorg-driver-vmware (1:10.11.1-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 13:00:04 +1100 + +xserver-xorg-driver-vmware (1:10.11.1-0ubuntu1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 22 Nov 2005 13:39:10 +1100 + +xserver-xorg-driver-vmware (1:10.11.0.1-1) dapper; urgency=low + + * New upstream release. + + -- Daniel Stone Tue, 25 Oct 2005 17:13:07 +1000 + +xserver-xorg-driver-vmware (1:10.10.2-1) breezy; urgency=low + + * First xserver-xorg-driver-vmware release. + + -- Daniel Stone Wed, 6 Jul 2005 15:48:17 +1000 --- xserver-xorg-video-vmware-11.0.3.orig/debian/xserver-xorg-video-vmware.install +++ xserver-xorg-video-vmware-11.0.3/debian/xserver-xorg-video-vmware.install @@ -0,0 +1,3 @@ +usr/lib/xorg/modules/drivers/*.so +usr/share/man/man4/* +usr/bin/vmwarectrl --- xserver-xorg-video-vmware-11.0.3.orig/debian/README.source +++ xserver-xorg-video-vmware-11.0.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-vmware-11.0.3.orig/debian/watch +++ xserver-xorg-video-vmware-11.0.3/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-vmware +version=3 +http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-vmware-(.*)\.tar\.gz --- xserver-xorg-video-vmware-11.0.3.orig/debian/patches/series +++ xserver-xorg-video-vmware-11.0.3/debian/patches/series @@ -0,0 +1 @@ +# placeholder