--- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.install.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.install.in @@ -0,0 +1,28 @@ +debian/#DRIVERNAME#.override usr/share/lintian/overrides +#Blacklist some card ids from GRUB gfxpayload=keep +debian/#DRIVERNAME#.grub-gfxpayload #PKGDATADIR# + +#DIRNAME#/usr/X11R6/lib/modules/drivers/nvidia_drv.so #PKGDRIVERSDIR# +#DIRNAME#/usr/X11R6/lib/modules/extensions/libglx.so.#VERSION# #NVIDIAEXTENSION# + +#DIRNAME#/usr/lib/libGL*.so* #PKGLIBDIR# +#DIRNAME#/usr/lib/libnvidia*.so* #PKGLIBDIR# + +#DIRNAME#/usr/lib/tls/*.so* #PKGTLSDIR# + +#DIRNAME#/usr/X11R6/lib/libXvMCNVIDIA.so.#VERSION# #PKGLIBDIR# + +debian/dkms/patches/* usr/src/#DRIVERNAME#-#VERSION#/patches +debian/dkms.conf usr/src/#DRIVERNAME#-#VERSION# +debian/temp/modules/nvidia-kernel/nv/* usr/src/#DRIVERNAME#-#VERSION# + +#DIRNAME#/usr/bin/nvidia-bug-report.sh #PKGBINDIR# +#DIRNAME#/usr/bin/nvidia-xconfig #PKGBINDIR# +#DIRNAME#/usr/bin/nvidia-smi #PKGBINDIR# + +#DIRNAME#/usr/share/pixmaps/#DRIVERNAME#-settings.png #DATADIR#/pixmaps + +debian/ubuntu-nvidia-settings.desktop #PKGDESKDIR# + +debian/#AUTOSTARTFILE# #PKGDATADIR# + --- nvidia-graphics-drivers-173-173.14.30.orig/debian/copyright.in +++ nvidia-graphics-drivers-173-173.14.30/debian/copyright.in @@ -0,0 +1,195 @@ +This package was debianized by Randall Donald on +Mon, 31 Mar 2003 23:40:05 -0800. + +It was downloaded from +#URL# + +Upstream Author: NVIDIA + + +Copyright: + +First a note from the README file + +Q: Why does NVIDIA not provide rpms anymore? + +A: Not every Linux distribution uses rpm, and NVIDIA wanted a single + solution that would work across all Linux distributions. As indicated + in the NVIDIA Software License, Linux distributions are welcome to + repackage and redistribute the NVIDIA Linux driver in whatever package + format they wish. + +Furthermore, an email from NVIDIA: + +Greetings, Randall! Comments below: + +On 30 Jul 2003, Randall Donald wrote: + +> To whom it may concern, +> +> My name is Randall Donald and I am the maintainer for the Debian +> downloader packages nvidia-glx-src and nvidia-kernel-src. +> As stated in your license and the README file +> ( "As indicated in the NVIDIA Software License, Linux distributions +> are welcome to repackage and redistribute the NVIDIA Linux driver in +> whatever package format they wish." ) +> I wish to include packages containing the Linux driver files in the Debian archive. +> I'd like to know if it is legally permitted to distribute binary kernel modules +> compiled from the NVIDIA kernel module source and Debian kernel headers. + +This is fine; thanks for asking. + +> I am also wondering if the "No Separation of Components" clause +> ( No Separation of Components. The SOFTWARE is licensed as a +> single product. Its component parts may not be separated for use +> on more than one computer, nor otherwise used separately from the +> other parts.) applies to splitting the glx driver and kernel module source into +> multiple binary packages. + +This is also fine. I believe this section of the license was +intended to prevent users from doing things like using our Windows +control panel with a competitor's display driver (that's not actually +possible, but you get the idea...). In the case of separating the +driver into a glx package and a kernel package (like we used to +do ourselves), this is simply a packaging issue; of course users +will use the packages together when they install. + +Please feel free to redistribute the NVIDIA graphics driver. + +Thank you for doing this for the NVIDIA+Debian community! + +- Andy + + + +The NVIDIA Software Licence is as follows. + +From http://www.nvidia.com/view.asp?IO=nv_swlicense and extracted from the +installer: + + + License For Customer Use of NVIDIA Software + + +IMPORTANT NOTICE -- READ CAREFULLY: This License For Customer Use of +NVIDIA Software ("LICENSE") is the agreement which governs use of +the software of NVIDIA Corporation and its subsidiaries ("NVIDIA") +downloadable herefrom, including computer software and associated +printed materials ("SOFTWARE"). By downloading, installing, copying, +or otherwise using the SOFTWARE, you agree to be bound by the terms +of this LICENSE. If you do not agree to the terms of this LICENSE, +do not download the SOFTWARE. + +RECITALS + +Use of NVIDIA's products requires three elements: the SOFTWARE, the +hardware on a graphics controller board, and a personal computer. The +SOFTWARE is protected by copyright laws and international copyright +treaties, as well as other intellectual property laws and treaties. +The SOFTWARE is not sold, and instead is only licensed for use, +strictly in accordance with this document. The hardware is protected +by various patents, and is sold, but this agreement does not cover +that sale, since it may not necessarily be sold as a package with +the SOFTWARE. This agreement sets forth the terms and conditions +of the SOFTWARE LICENSE only. + +1. DEFINITIONS + +1.1 Customer. Customer means the entity or individual that +downloads the SOFTWARE. + +2. GRANT OF LICENSE + +2.1 Rights and Limitations of Grant. NVIDIA hereby grants Customer +the following non-exclusive, non-transferable right to use the +SOFTWARE, with the following limitations: + +2.1.1 Rights. Customer may install and use one copy of the SOFTWARE +on a single computer, and except for making one back-up copy of +the Software, may not otherwise copy the SOFTWARE. This LICENSE +of SOFTWARE may not be shared or used concurrently on different +computers. + +2.1.2 Linux Exception. Notwithstanding the foregoing terms of +Section 2.1.1, SOFTWARE designed exclusively for use on the Linux +operating system may be copied and redistributed, provided that +the binary files thereof are not modified in any way (except for +unzipping of compressed files). + +2.1.3 Limitations. + +No Reverse Engineering. Customer may not reverse engineer, +decompile, or disassemble the SOFTWARE, nor attempt in any other +manner to obtain the source code. + +No Separation of Components. The SOFTWARE is licensed as a +single product. Its component parts may not be separated for use +on more than one computer, nor otherwise used separately from the +other parts. + +No Rental. Customer may not rent or lease the SOFTWARE to someone +else. + +3. TERMINATION + +This LICENSE will automatically terminate if Customer fails to +comply with any of the terms and conditions hereof. In such event, +Customer must destroy all copies of the SOFTWARE and all of its +component parts. + +4. COPYRIGHT + +All title and copyrights in and to the SOFTWARE (including but +not limited to all images, photographs, animations, video, audio, +music, text, and other information incorporated into the SOFTWARE), +the accompanying printed materials, and any copies of the SOFTWARE, +are owned by NVIDIA, or its suppliers. The SOFTWARE is protected +by copyright laws and international treaty provisions. Accordingly, +Customer is required to treat the SOFTWARE like any other copyrighted +material, except as otherwise allowed pursuant to this LICENSE +and that it may make one copy of the SOFTWARE solely for backup or +archive purposes. + +5. APPLICABLE LAW + +This agreement shall be deemed to have been made in, and shall be +construed pursuant to, the laws of the State of California. + +6. DISCLAIMER OF WARRANTIES AND LIMITATION ON LIABILITY + +6.1 No Warranties. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE +LAW, THE SOFTWARE IS PROVIDED "AS IS" AND NVIDIA AND ITS SUPPLIERS +DISCLAIM ALL WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT +NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. + +6.2 No Liability for Consequential Damages. TO THE MAXIMUM +EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL NVIDIA OR +ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT, OR +CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, +DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS +OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS) ARISING OUT +OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF NVIDIA HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. MISCELLANEOUS + +The United Nations Convention on Contracts for the International +Sale of Goods is specifically disclaimed. If any provision of this +LICENSE is inconsistent with, or cannot be fully enforced under, +the law, such provision will be construed as limited to the extent +necessary to be consistent with and fully enforceable under the law. +This agreement is the final, complete and exclusive agreement between +the parties relating to the subject matter hereof, and supersedes +all prior or contemporaneous understandings and agreements relating +to such subject matter, whether oral or written. Customer agrees +that it will not ship, transfer or export the SOFTWARE into any +country, or use the SOFTWARE in any manner, prohibited by the +United States Bureau of Export Administration or any export laws, +restrictions or regulations. This LICENSE may only be modified in +writing signed by an authorized officer of NVIDIA. + +--------------------------------------------------------------------- + +The Debian packaging is (C) 2009, Canonical Ltd and is licensed +under the GPL, see `/usr/share/common-licenses/GPL'. --- nvidia-graphics-drivers-173-173.14.30.orig/debian/ubuntu-nvidia-settings.desktop +++ nvidia-graphics-drivers-173-173.14.30/debian/ubuntu-nvidia-settings.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=NVIDIA X Server Settings +Comment=Configure NVIDIA X Server Settings +Exec=/usr/bin/nvidia-settings +Icon=nvidia-173-settings +Categories=System;Settings; --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia_supported +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia_supported @@ -0,0 +1,81 @@ +#!/bin/sh + +set -e + +# This is a nasty kluge, but it seems to work. Better check the output when +# upgrading to a new release of the nvidia driver, though. + +# Whenever a PCI ID is supported by both nvidia and nvidia_legacy, it is only +# listed for nvidia, as long as nvidia_legacy is *after* nvidia in the +# parameter list. + +[ -n "$1" ] || { + echo "USAGE: $0 path/to/nv/nv-kernel.o nvidia \\" >&2 + echo " path/to/nv-legacy/nv-kernel.o nvidia_legacy [...]" >&2 + exit 1 +} + +echo "# Listing generated by nvidia_supported. Do not edit manually." + +device_ids() { + local filename="$1" + + local list_prev="$(mktemp)" + local list_cur="$(mktemp)" + + # Find the symbols of the .rodata section... + objdump --section=.rodata --syms "$filename" | + sed -nr '/SYMBOL TABLE/,/^$/ { + s/^([0-9a-f]+)\s+l\s+O\s+\S+\s+([0-9a-f]+)\s+\S+.*/\1 \2/p + }' | + while read start length; do + objdump --section=.rodata --full-contents \ + --start-address="0x$start" \ + --stop-address="$((0x$start+0x$length))" "$filename" | + sed -nr 's/^ [0-9a-f]+ ([0-9a-f]{2})([0-9a-f]{2}).*/\2\1/p' | + sort | uniq | grep -vx "0000" >"$list_cur" + + # The consistent thing between different releases has been that there are + # two subsequent symbols with the same PCI ID list near the beginning. Find + # them. + if [ -s "$list_prev" -a -s "$list_cur" ] && + cmp -s "$list_prev" "$list_cur"; then + cat "$list_cur" + break + fi + + cp "$list_cur" "$list_prev" + done + + rm -f "$list_prev" "$list_cur" +} + +seen_ids=' ' + +while [ -n "$1" ]; do + filename="$1"; shift + modname="$1"; shift + pkgname="$1"; shift + + orig_ids="$(device_ids "$filename")" + if [ -z "$orig_ids" ]; then + echo "WARNING: No IDs were found from $filename" >&2 + fi + + for id in $orig_ids; do + case "$seen_ids" in + *" $id "*) + # Already seen the ID. + ;; + *) + # Not seen it yet. + seen_ids="${seen_ids}${id} " + + printf "alias pci:v%08Xd%08Xsv*sd*bc03sc*i* %s %s\n" \ + 0x10de "0x$id" "$modname" "$pkgname" + ;; + esac + done +done | sort + +# vim:set et sw=2 sts=2: --- nvidia-graphics-drivers-173-173.14.30.orig/debian/dkms.conf.in +++ nvidia-graphics-drivers-173-173.14.30/debian/dkms.conf.in @@ -0,0 +1,21 @@ +PACKAGE_NAME="#DRIVERNAME#" +PACKAGE_VERSION="#VERSION#" +#Prevent builds with kernels newer than the ones we ship +OBSOLETE_BY=2.6.39 +CLEAN="make clean" +BUILT_MODULE_NAME[0]="nvidia" +DEST_MODULE_NAME[0]="#MODULENAME#" +MAKE[0]="make module KERNDIR=/lib/modules/$kernelver IGNORE_XEN_PRESENCE=1 IGNORE_CC_MISMATCH=1 SYSSRC=$kernel_source_dir" +DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm" +AUTOINSTALL="yes" +PATCH[0]="nvidia-2.6.36-ioctl.patch" +PATCH_MATCH[0]="^2.6.36" +PATCH[1]="blacklist-register-mapping.patch" +#PATCH[0]="NVIDIA_173.14.12_2.6.27.patch" +#PATCH_MATCH[0]="^2.6.2[7]" +#PATCH[1]="fall_back_on_mtrr_if_no_pat.patch" +#PATCH_MATCH[1]="2.6.31" +#PATCH[2]="nvidia-rt-compat-legacy.patch" +#PATCH_MATCH[2]="2.6.31" +#PATCH[3]="rt_preempt_31.patch" +#PATCH_MATCH[3]="2.6.31" --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-autostart.desktop.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-autostart.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=NVIDIA X Server Settings +Comment=Configure NVIDIA X Server Settings +Exec=sh -c '#BINDIR#/nvidia-settings --load-config-only' +Terminal=false +Icon=#DRIVERNAME#-settings +Categories=System;Settings; --- nvidia-graphics-drivers-173-173.14.30.orig/debian/copyright +++ nvidia-graphics-drivers-173-173.14.30/debian/copyright @@ -0,0 +1,195 @@ +This package was debianized by Randall Donald on +Mon, 31 Mar 2003 23:40:05 -0800. + +It was downloaded from +ftp://download.nvidia.com/XFree86/Linux-x86/173.14.30/NVIDIA-Linux-x86-173.14.30-pkg0.run + +Upstream Author: NVIDIA + + +Copyright: + +First a note from the README file + +Q: Why does NVIDIA not provide rpms anymore? + +A: Not every Linux distribution uses rpm, and NVIDIA wanted a single + solution that would work across all Linux distributions. As indicated + in the NVIDIA Software License, Linux distributions are welcome to + repackage and redistribute the NVIDIA Linux driver in whatever package + format they wish. + +Furthermore, an email from NVIDIA: + +Greetings, Randall! Comments below: + +On 30 Jul 2003, Randall Donald wrote: + +> To whom it may concern, +> +> My name is Randall Donald and I am the maintainer for the Debian +> downloader packages nvidia-glx-src and nvidia-kernel-src. +> As stated in your license and the README file +> ( "As indicated in the NVIDIA Software License, Linux distributions +> are welcome to repackage and redistribute the NVIDIA Linux driver in +> whatever package format they wish." ) +> I wish to include packages containing the Linux driver files in the Debian archive. +> I'd like to know if it is legally permitted to distribute binary kernel modules +> compiled from the NVIDIA kernel module source and Debian kernel headers. + +This is fine; thanks for asking. + +> I am also wondering if the "No Separation of Components" clause +> ( No Separation of Components. The SOFTWARE is licensed as a +> single product. Its component parts may not be separated for use +> on more than one computer, nor otherwise used separately from the +> other parts.) applies to splitting the glx driver and kernel module source into +> multiple binary packages. + +This is also fine. I believe this section of the license was +intended to prevent users from doing things like using our Windows +control panel with a competitor's display driver (that's not actually +possible, but you get the idea...). In the case of separating the +driver into a glx package and a kernel package (like we used to +do ourselves), this is simply a packaging issue; of course users +will use the packages together when they install. + +Please feel free to redistribute the NVIDIA graphics driver. + +Thank you for doing this for the NVIDIA+Debian community! + +- Andy + + + +The NVIDIA Software Licence is as follows. + +From http://www.nvidia.com/view.asp?IO=nv_swlicense and extracted from the +installer: + + + License For Customer Use of NVIDIA Software + + +IMPORTANT NOTICE -- READ CAREFULLY: This License For Customer Use of +NVIDIA Software ("LICENSE") is the agreement which governs use of +the software of NVIDIA Corporation and its subsidiaries ("NVIDIA") +downloadable herefrom, including computer software and associated +printed materials ("SOFTWARE"). By downloading, installing, copying, +or otherwise using the SOFTWARE, you agree to be bound by the terms +of this LICENSE. If you do not agree to the terms of this LICENSE, +do not download the SOFTWARE. + +RECITALS + +Use of NVIDIA's products requires three elements: the SOFTWARE, the +hardware on a graphics controller board, and a personal computer. The +SOFTWARE is protected by copyright laws and international copyright +treaties, as well as other intellectual property laws and treaties. +The SOFTWARE is not sold, and instead is only licensed for use, +strictly in accordance with this document. The hardware is protected +by various patents, and is sold, but this agreement does not cover +that sale, since it may not necessarily be sold as a package with +the SOFTWARE. This agreement sets forth the terms and conditions +of the SOFTWARE LICENSE only. + +1. DEFINITIONS + +1.1 Customer. Customer means the entity or individual that +downloads the SOFTWARE. + +2. GRANT OF LICENSE + +2.1 Rights and Limitations of Grant. NVIDIA hereby grants Customer +the following non-exclusive, non-transferable right to use the +SOFTWARE, with the following limitations: + +2.1.1 Rights. Customer may install and use one copy of the SOFTWARE +on a single computer, and except for making one back-up copy of +the Software, may not otherwise copy the SOFTWARE. This LICENSE +of SOFTWARE may not be shared or used concurrently on different +computers. + +2.1.2 Linux Exception. Notwithstanding the foregoing terms of +Section 2.1.1, SOFTWARE designed exclusively for use on the Linux +operating system may be copied and redistributed, provided that +the binary files thereof are not modified in any way (except for +unzipping of compressed files). + +2.1.3 Limitations. + +No Reverse Engineering. Customer may not reverse engineer, +decompile, or disassemble the SOFTWARE, nor attempt in any other +manner to obtain the source code. + +No Separation of Components. The SOFTWARE is licensed as a +single product. Its component parts may not be separated for use +on more than one computer, nor otherwise used separately from the +other parts. + +No Rental. Customer may not rent or lease the SOFTWARE to someone +else. + +3. TERMINATION + +This LICENSE will automatically terminate if Customer fails to +comply with any of the terms and conditions hereof. In such event, +Customer must destroy all copies of the SOFTWARE and all of its +component parts. + +4. COPYRIGHT + +All title and copyrights in and to the SOFTWARE (including but +not limited to all images, photographs, animations, video, audio, +music, text, and other information incorporated into the SOFTWARE), +the accompanying printed materials, and any copies of the SOFTWARE, +are owned by NVIDIA, or its suppliers. The SOFTWARE is protected +by copyright laws and international treaty provisions. Accordingly, +Customer is required to treat the SOFTWARE like any other copyrighted +material, except as otherwise allowed pursuant to this LICENSE +and that it may make one copy of the SOFTWARE solely for backup or +archive purposes. + +5. APPLICABLE LAW + +This agreement shall be deemed to have been made in, and shall be +construed pursuant to, the laws of the State of California. + +6. DISCLAIMER OF WARRANTIES AND LIMITATION ON LIABILITY + +6.1 No Warranties. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE +LAW, THE SOFTWARE IS PROVIDED "AS IS" AND NVIDIA AND ITS SUPPLIERS +DISCLAIM ALL WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT +NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE. + +6.2 No Liability for Consequential Damages. TO THE MAXIMUM +EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL NVIDIA OR +ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT, OR +CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, +DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS +OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS) ARISING OUT +OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF NVIDIA HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. MISCELLANEOUS + +The United Nations Convention on Contracts for the International +Sale of Goods is specifically disclaimed. If any provision of this +LICENSE is inconsistent with, or cannot be fully enforced under, +the law, such provision will be construed as limited to the extent +necessary to be consistent with and fully enforceable under the law. +This agreement is the final, complete and exclusive agreement between +the parties relating to the subject matter hereof, and supersedes +all prior or contemporaneous understandings and agreements relating +to such subject matter, whether oral or written. Customer agrees +that it will not ship, transfer or export the SOFTWARE into any +country, or use the SOFTWARE in any manner, prohibited by the +United States Bureau of Export Administration or any export laws, +restrictions or regulations. This LICENSE may only be modified in +writing signed by an authorized officer of NVIDIA. + +--------------------------------------------------------------------- + +The Debian packaging is (C) 2009, Canonical Ltd and is licensed +under the GPL, see `/usr/share/common-licenses/GPL'. --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.postinst.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.postinst.in @@ -0,0 +1,164 @@ +#!/bin/sh +# Copyright (C) 2007-2008 Mario Limonciello +# Copyright (C) 2009 Canonical Ltd +# Authors: Alberto Milone +set -e + +PACKAGE_NAME=#DRIVERNAME# +CVERSION=`dpkg-query -W -f='${Version}' $PACKAGE_NAME | awk -F "-" '{print $1}' | cut -d\: -f2` + +ARCH=`dpkg --print-architecture` +case $ARCH in + amd64) + ARCH="x86_64" + ;; + lpia) + ARCH="i686" + ;; + i386) + ARCH="i686" + ;; + *) + echo "WARNING: unsupported arch: $ARCH" + ARCH="$ARCH" + ;; +esac + +# Check the existence of a kernel named as $1 +_is_kernel_name_correct() { + CORRECT="no" + KERNEL_NAME=$1 + + for kernel in /boot/config-*; do + KERNEL=${kernel#*-} + if [ "${KERNEL}" = "${KERNEL_NAME}" ]; then + CORRECT="yes" + break + fi + done + + echo $CORRECT +} + +# Get the most recent kernel on Debian based systems. This keeps +# into account both the version and the ABI. If the current kernel +# is the most recent kernel then the function will print a null string. +_get_newest_kernel_debian() { + NEWEST_KERNEL= + NEWEST_VERSION= + NEWEST_ABI= + + for kernel in /boot/config-*; do + KERNEL=${kernel#*-} + KERNEL_VERSION=${KERNEL%%-*} + ABI=${KERNEL#*-} + ABI=${ABI%%-*} + + if [ -z "$NEWEST_KERNEL" ]; then + # The 1st time get a version which is bigger than $1 + COMPARE_TO=$1 + else + # Get the biggest version + COMPARE_TO="$NEWEST_VERSION-$NEWEST_ABI" + fi + + # if $kernel is greater than $COMPARE_TO + if [ `dpkg --compare-versions "$KERNEL_VERSION-$ABI" gt "$COMPARE_TO" && echo "yes" || \ + echo "no"` = "yes" ]; then + NEWEST_KERNEL=$KERNEL + NEWEST_VERSION=$KERNEL_VERSION + NEWEST_ABI=$ABI + fi + done + + echo "$NEWEST_KERNEL" +} + + +get_newest_kernel() { + NEWEST_KERNEL= + # Try Debian first as rpm can be installed in Debian based distros + if [ -e /usr/bin/dpkg ]; then + # If DEB based + CURRENT_KERNEL=$1 + CURRENT_VERSION=${CURRENT_KERNEL%%-*} + CURRENT_ABI=${CURRENT_KERNEL#*-} + CURRENT_FLAVOUR=${CURRENT_ABI#*-} + CURRENT_ABI=${CURRENT_ABI%%-*} + NEWEST_KERNEL=$(_get_newest_kernel_debian "$CURRENT_VERSION-$CURRENT_ABI") + + elif [ `which rpm &>/dev/null` ]; then + # If RPM based + NEWEST_KERNEL=$(_get_newest_kernel_rhel) + fi + + # Make sure that kernel name that we extracted corresponds to an installed + # kernel + if [ -n "$NEWEST_KERNEL" ] && [ `_is_kernel_name_correct $NEWEST_KERNEL` = "no" ]; then + NEWEST_KERNEL= + fi + + echo $NEWEST_KERNEL +} + +case "$1" in + configure) + # Deal with alternatives + + current_glconf="$(readlink -e #SYSCONFDIR#/ld.so.conf.d/GL.conf)" + + update-alternatives --force \ + --install #SYSCONFDIR#/ld.so.conf.d/GL.conf gl_conf #LDSOCONF# #ALTPRIORITY# \ + --slave #MANDIR#/nvidia-xconfig.1.gz man_nvidiaxconfig.gz #MANDIR#/alt-#DRIVERNAME#-xconfig.1.gz \ + --slave #DATADIR#/applications/ubuntu-nvidia-settings.desktop nvidia_desktop #PKGDESKDIR#/ubuntu-nvidia-settings.desktop \ + --slave #BINDIR#/nvidia-smi nvidia_smi #PKGBINDIR#/nvidia-smi \ + --slave #BINDIR#/nvidia-xconfig nvidia_xconfig #PKGBINDIR#/nvidia-xconfig \ + --slave #BINDIR#/nvidia-bug-report.sh nvidia_bug_report #PKGBINDIR#/nvidia-bug-report.sh \ + --slave #LIBDIR#/XvMCConfig xvmcconfig #PKGCONFIGDIR#/XvMCConfig \ + --slave #AUTOSTARTDIR#/#AUTOSTARTFILE# nvidia-autostart.desktop #PKGDATADIR#/#AUTOSTARTFILE# \ + --slave #LIBDIR#/xorg/modules/drivers/nvidia_drv.so nvidia_drv #PKGDRIVERSDIR#/nvidia_drv.so \ + --slave #SYSCONFDIR#/modprobe.d/nvidia-graphics-drivers.conf nvidia_modconf #PKGLIBCONFDIR#/modprobe.conf \ + --slave #XORGEXTRA# xorg_extra_modules #NVIDIAEXTENSION# \ + --slave #GRUBBLKLISTDIR#/10_$PACKAGE_NAME grub_fb_blacklist #PKGDATADIR#/#DRIVERNAME#.grub-gfxpayload + + # ldconfig needs to be run immediately as we're changing /etc/ld.so.conf.d/ with + # alternatives. + LDCONFIG_NOTRIGGER=y ldconfig + + # Update the grub gfxpayload blacklist + if which update-grub-gfxpayload >/dev/null 2>&1; then + update-grub-gfxpayload + fi + + # Trigger gmenu so that the icons will show up in the menu + dpkg-trigger --by-package=$PACKAGE_NAME gmenucache || true + + CURRENT_KERNEL=$(uname -r) + NEWEST_KERNEL=$(get_newest_kernel "$KERNELS") + + ALTERNATIVE=$(readlink /etc/alternatives/gl_conf) + if [ "$ALTERNATIVE" = "#LDSOCONF#" ]; then + # Update initramfs so that the blacklist ends up in the initramfs + update-initramfs -u + + if [ -n "$NEWEST_KERNEL" ] && [ ${CURRENT_KERNEL} != ${NEWEST_KERNEL} ]; then + # This can fail when dealing with a chroot see LP: #556653 + update-initramfs -u -k $CURRENT_KERNEL || true + fi + fi + + # Build the kernel module + /usr/lib/dkms/common.postinst $PACKAGE_NAME $CVERSION /usr/share/$PACKAGE_NAME $ARCH $2 + exit $? + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.postrm +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.postrm @@ -0,0 +1,42 @@ +#! /bin/sh +# postrm script for nvidia-173 +# +# see: dh_installdeb(1) +# +# Copyright (C) 2009-2010 Canonical Ltd +# Authors: Alberto Milone + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/share/doc/packaging-manual/ + +case "$1" in + remove|purge) + + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + ;; + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.examples.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.examples.in @@ -0,0 +1,2 @@ +#DIRNAME#/usr/share/doc/XF86Config.sample + --- nvidia-graphics-drivers-173-173.14.30.orig/debian/control +++ nvidia-graphics-drivers-173-173.14.30/debian/control @@ -0,0 +1,64 @@ +Source: nvidia-graphics-drivers-173 +Section: restricted/misc +Priority: optional +Maintainer: Ubuntu Developers +Build-Depends: debhelper (>> 4.0.0), sed (>> 3.0), libxext6, bzip2, + xserver-xorg-dev (>= 2:1.4), execstack, cdbs, dh-modaliases +Standards-Version: 3.8.0 + +Package: nvidia-173 +Architecture: i386 amd64 lpia +Depends: x11-common (>= 1:7.0.0), make, sed (>> 3.0), dkms, linux-libc-dev, libc6-dev, + linux-headers-generic | linux-headers, patch, acpid, ${shlibs:Depends}, + ${xviddriver:Depends} +Recommends: nvidia-settings +Provides: ${xviddriver:Provides} +Conflicts: nvidia-173-modaliases +Replaces: nvidia-173-modaliases +XB-Modaliases: ${modaliases} +Description: NVIDIA binary Xorg driver, kernel module and VDPAU library + The binary driver provide optimized hardware acceleration of OpenGL + applications via a direct-rendering X Server. AGP, PCIe, SLI, TV-out + and flat panel displays are also supported. + . + This package also includes the source for building the kernel module + required by the Xorg driver. + . + GPUs ranging from GeForce series 5 to GeForce series 9 are supported. + . + See /usr/share/doc/nvidia-173/README.txt.gz for a complete list + of supported GPUs and PCIIDs + . + +Package: nvidia-173-dev +Architecture: i386 amd64 lpia +Depends: nvidia-173 (>= 173.14.30) +Description: NVIDIA binary Xorg driver development files + This package contains the NVIDIA binary Xorg driver + development files. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-glx-173 +Architecture: i386 amd64 lpia +Depends: nvidia-173 +Description: Transitional package for nvidia-glx-173 + This is a transitional package for nvidia-glx-173, and can be safely removed + after the installation is complete. + +Package: nvidia-glx-173-dev +Architecture: i386 amd64 lpia +Depends: nvidia-173-dev +Description: Transitional package for nvidia-glx-173-dev + This is a transitional package for nvidia-glx-173-dev, and can be safely removed + after the installation is complete. + +Package: nvidia-173-kernel-source +Architecture: i386 amd64 lpia +Depends: nvidia-173 +Description: Transitional package for nvidia-glx-173-kernel-source + This is a transitional package for nvidia-glx-173-kernel-source, and can be + safely removed after the installation is complete. + + --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.README.Debian +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.README.Debian @@ -0,0 +1,89 @@ +NVIDIA video drivers for Ubuntu +============================ + +Further information can be found at http://www.nvidia.com/ -- look for +the "Download Drivers" tab and follow links to the Linux drivers. + +This package is generated from the official NVIDIA driver +installer that is available from the above homepage. + +DKMS +------------------------- + Ubuntu includes support to build modules using a utility developed by + Dell, called DKMS. It will automatically build your kernel module + for you when you first boot into the kernel (or as necessary). + + Note: the OBSOLETE_BY line in dkms.conf specifies a kernel version + which obsoletes the necessity for this particular DKMS module. + For example, OBSOLETE_BY=2.6.39 will prevent DKMS from building + modules for kernels >= 2.6.39. + + See the DKMS man page for more information. + +Kernel patches +------------------------- + If you need to provide a kernel patch (say for a kernel not formally + supported yet by NVIDIA), you can add this patch in the + debian/dkms/patches directory and mention the patch in the + debian/dkms.conf.in file. + + It is usually a good idea to restrict the use of a patch to certain + kernel versions with the PATCH_MATCH[n] variable. + + See the DKMS man page for more information. + +32 bit libraries on 64 bit systems +------------------------- + 32 bit libraries are provided on 64 bit systems for compatibility + reasons. + + The following templates are merged together into the same file on + amd64: + debian/nvidia-current.links32.in + debian/nvidia-current.links.in + + $ld_so_conf_path lets the system know where it should look for 32 + bit libraries. + +Update procedure +------------------------- +When a new NVIDIA is available, do the following to update +nvidia-173: + +0. On your build system, make sure you have the prerequisites + installed: + + $ sudo apt-get build-dep nvidia-173 + +1. Download the NVIDIA installers i.e. the .run files. + +2. dch -i to update the version in the debian/changelog so that it + matches the new upstream version. + + Also make sure that the changelog includes both the changes you + made (if any) to the files in debian/ changes and the changes from + upstream (i.e. NVIDIA) which you can find in the release notes of + the driver. + +3. debclean to regenerate most of the files in debian/ from their + templates. + +4. Temporarily move the debian/ directory out of the source directory + and compress it as $SOURCE_NAME _ $NEW_VERSION . orig . tar . gz + e.g. nvidia-graphics-drivers-173_173.14.30.orig.tar.gz + +5. Move the debian/ directory back to the source directory and type + debuild -S -sa to produce a new .dsc + +6. Verify the new .dsc produces valid .debs by running it through + pbuilder, sbuild, etc. as usual. + +7. Install and test the .debs, and then dput the .changes file + + +IMPORTANT NOTE: If any changes to files in debian/ are needed, make sure +to discuss your changes with the maintainer (Alberto aka tseliot) before +you upload. + + + -- Alberto Milone Mon, 21 Dec 2009 12:36:15 +0100 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/rules +++ nvidia-graphics-drivers-173-173.14.30/debian/rules @@ -0,0 +1,300 @@ +#!/usr/bin/make -f +# +# Copyright (C) 2009 Canonical Ltd +# Authors: Alberto Milone +# +# This file is based on the Mandriva nvidia packages, on Ubuntu's +# previous nvidia packaging scripts and on Ubuntu's fglrx scripts. + +############# HOW TO ENABLE A DRIVER #################### + +#- Run "update-alternatives --set gl_conf $(ld_so_conf_path)" as root. +#- Run "ldconfig" as root. + + +######################################################### + +include /usr/share/cdbs/1/rules/debhelper.mk + + +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) +INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) + +# Manual VIDEO ABI dependencies +# Comment out the following 2 lines to re-enable automatic ABI detection +#VIDEODEP = xorg-video-abi-8.0, xserver-xorg-core (>= 2:1.8.99.905-1ubuntu3) +#VIDEOABI = 8 + +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input + + +# Package names +PKG_driver := nvidia-173 +PKG_driver_dev := $(PKG_driver)-dev +PKG_version := $(shell dpkg-parsechangelog | awk -F' ' '/^Version:/ {print $$2}' | awk -F- '{print $$1}') +PKG_source := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') +PKG_module := $(PKG_driver) + +# Priority of the alternative +alt_priority := 9620 + +# Installer details +dirname_x86 := NVIDIA-Linux-x86-$(PKG_version)-pkg0 +dirname_x86_64 := NVIDIA-Linux-x86_64-$(PKG_version)-pkg2 +filename_x86 := $(dirname_x86).run +filename_x86_64 := $(dirname_x86_64).run +url := ftp://download.nvidia.com/XFree86/Linux-x86/$(PKG_version)/$(filename_x86) + +ifeq ($(DEB_BUILD_ARCH),amd64) +filename := $(filename_x86_64) +dirname := $(dirname_x86_64) +else +filename := $(filename_x86) +dirname := $(dirname_x86) +endif + +bindir := /usr/bin +datadir := /usr/share +PKG_datadir := $(datadir)/$(PKG_driver) +libdir := /usr/lib +libdir32 := /usr/lib32 +includedir := /usr/include +sysconfdir := /etc +PKG_libdir := $(libdir)/$(PKG_driver) +PKG_libdir32 := $(libdir32)/$(PKG_driver) +xorg_libdir := $(libdir)/xorg +xorg_extra_modules := $(xorg_libdir)/extra-modules +xorg_extensionsdir := $(xorg_libdir)/modules/extensions +PKG_driversdir := $(libdir)/$(PKG_driver)/xorg +PKG_extensionsdir := $(PKG_driversdir) +PKG_bindir := $(PKG_libdir)/bin +PKG_deskdir := $(PKG_datadir) +PKG_configdir := $(PKG_libdir) +ld_so_conf_dir := $(PKG_configdir) +ld_so_conf_file := ld.so.conf +ld_so_conf_path := $(ld_so_conf_dir)/$(ld_so_conf_file) +mandir := /usr/share/man/man1 +PKG_bugdir := /usr/share/bug/$(PKG_driver) +autostartdir := /etc/xdg/autostart +PKG_autostartdir := $(PKG_configdir) +autostartfile := nvidia-autostart.desktop +desktopfile := ubuntu-nvidia-settings.desktop +PKG_vdpaudir := $(PKG_libdir)/vdpau +PKG_tlsdir := $(PKG_libdir)/tls +PKG_vdpaudir32 := $(PKG_libdir32)/vdpau +PKG_tlsdir32 := $(PKG_libdir32)/tls +vdpaudir := $(libdir)/vdpau +tlsdir := $(libdir)/tls +vdpaudir32 := $(libdir32)/vdpau +tlsdir32 := $(libdir32)/tls +grub_blacklistdir := /usr/share/grub-gfxpayload-lists/blacklist + +# This is a hack to make sure that +# the blacklist file is available +# early in the boot process when +# /usr is on a separate partition. +# See LP: #538071. +PKG_libconfdir := /lib/$(PKG_driver) + + +# -Xlib32 +DEB_DH_SHLIBDEPS_ARGS_$(PKG_driver)="-Xtls -Xconf" -X$(PKG_libdir32)# +DEB_SHLIBDEPS_INCLUDE_$(PKG_driver) := $(CURDIR)/debian/$(PKG_driver)$(PKG_libdir)/:$(libdir)/ +DEB_SHLIBDEPS_INCLUDE_$(PKG_driver_dev) := $(CURDIR)/debian/$(PKG_driver_dev)$(PKG_libdir)/:$(libdir)/ + +# This makes sure that the xserver ABI is bumped to match the current one when the +# packages are built +.PHONY: serverabi +serverabi: +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' + @exit 1 +else + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PKG_driver).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PKG_driver).substvars + # the following is there for compatibility... + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PKG_driver).substvars + echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PKG_driver).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PKG_driver).substvars +endif + +.PHONY: regen-from-templates +regen-from-templates: + #Create important strings + for i in dkms.conf \ + $(PKG_driver).README.Debian \ + control \ + copyright \ + ubuntu-nvidia-settings.desktop \ + nvidia-autostart.desktop \ + $(PKG_driver).install \ + $(PKG_driver_dev).install \ + $(PKG_driver).links \ + $(PKG_driver).links32 \ + $(PKG_driver_dev).links \ + $(PKG_driver).override \ + $(PKG_driver).dirs \ + $(PKG_driver).docs \ + $(PKG_driver).examples \ + $(PKG_driver).postrm \ + $(PKG_driver).postinst \ + $(PKG_driver).preinst \ + $(PKG_driver).prerm \ + $(PKG_driver_dev).preinst; do \ + sed -e "s|#LIBDIR#|$(libdir)|g" \ + -e "s|#LIBDIR32#|$(libdir32)|g" \ + -e "s|#BINDIR#|$(bindir)|g" \ + -e "s|#VERSION#|$(PKG_version)|g" \ + -e "s|#SYSCONFDIR#|$(sysconfdir)|g" \ + -e "s|#MANDIR#|$(mandir)|g" \ + -e "s|#LDSOCONF#|$(ld_so_conf_path)|g" \ + -e "s|#ALTPRIORITY#|$(alt_priority)|g" \ + -e "s|#AUTOSTARTDIR#|$(autostartdir)|g" \ + -e "s|#AUTOSTARTFILE#|$(autostartfile)|g" \ + -e "s|#DATADIR#|$(datadir)|g" \ + -e "s|#PKGDESKDIR#|$(PKG_deskdir)|g" \ + -e "s|#PKGDATADIR#|$(PKG_datadir)|g" \ + -e "s|#PKGCONFIGDIR#|$(PKG_configdir)|g" \ + -e "s|#PKGBINDIR#|$(PKG_bindir)|g" \ + -e "s|#PKGLIBDIR#|$(PKG_libdir)|g" \ + -e "s|#PKGLIBDIR32#|$(PKG_libdir32)|g" \ + -e "s|#PKGDRIVERSDIR#|$(PKG_driversdir)|g" \ + -e "s|#XORGEXTRA#|$(xorg_extra_modules)|g" \ + -e "s|#NVIDIAEXTENSION#|$(PKG_extensionsdir)|g" \ + -e "s|#XORGEXTENSIONSDIR#|$(xorg_extensionsdir)|g" \ + -e "s|#DRIVERNAME#|$(PKG_driver)|g" \ + -e "s|#DRIVERDEVNAME#|$(PKG_driver_dev)|g" \ + -e "s|#DRIVERSRCNAME#|$(PKG_source)|g" \ + -e "s|#MODULENAME#|$(PKG_module)|g" \ + -e "s|#DIRNAME#|$(dirname)|g" \ + -e "s|#INCLUDEDIR#|$(includedir)|g" \ + -e "s|#URL#|$(url)|g" \ + -e "s|#VDPAUDIR#|$(vdpaudir)|g" \ + -e "s|#VDPAUDIR32#|$(vdpaudir32)|g" \ + -e "s|#TLSDIR#|$(tlsdir)|g" \ + -e "s|#PKGVDPAUDIR#|$(PKG_vdpaudir)|g" \ + -e "s|#PKGVDPAUDIR32#|$(PKG_vdpaudir32)|g" \ + -e "s|#PKGTLSDIR#|$(PKG_tlsdir)|g" \ + -e "s|#PKGLIBCONFDIR#|$(PKG_libconfdir)|g" \ + -e "s|#GRUBBLKLISTDIR#|$(grub_blacklistdir)|g" \ + debian/$$i.in > debian/$$i; \ + done +ifeq ($(DEB_BUILD_ARCH),amd64) + cat $(CURDIR)/debian/$(PKG_driver).links $(CURDIR)/debian/$(PKG_driver).links32 > \ + $(CURDIR)/debian/$(PKG_driver).links_new + mv -f $(CURDIR)/debian/$(PKG_driver).links_new $(CURDIR)/debian/$(PKG_driver).links +endif +# Pre-config +#makebuilddir/$(PKG_driver):: regen-from-templates + +configure/$(PKG_driver):: + rm -rf $(dirname_x86) $(dirname_x86_64) + + # Make the installers executable and extract them + chmod 755 $(filename_x86) + chmod 755 $(filename_x86_64) + ./$(filename_x86) --extract-only + ./$(filename_x86_64) --extract-only + + # Get around Xen checks + cp $(dirname)/usr/src/nv/nv.c $(dirname)/usr/src/nv/nv1.c + cp $(dirname)/usr/src/nv/nv-linux.h $(dirname)/usr/src/nv/nv-linux1.h + sed 's/CONFIG_XEN/CONFIG_ALB/g' $(dirname)/usr/src/nv/nv1.c > $(dirname)/usr/src/nv/nv.c + sed 's/CONFIG_XEN/CONFIG_ALB/g' $(dirname)/usr/src/nv/nv-linux1.h > $(dirname)/usr/src/nv/nv-linux.h + rm $(dirname)/usr/src/nv/nv1.c + rm $(dirname)/usr/src/nv/nv-linux1.h + + # kernel module source + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel/nv + cp -R $(CURDIR)/$(dirname)/usr/src/nv $(CURDIR)/debian/temp/modules/nvidia-kernel/ + cp $(CURDIR)/debian/temp/modules/nvidia-kernel/nv/Makefile.kbuild \ + $(CURDIR)/debian/temp/modules/nvidia-kernel/nv/Makefile + + # Rename the png file for nvidia-settings + mv $(dirname)/usr/share/pixmaps/nvidia-settings.png \ + $(dirname)/usr/share/pixmaps/$(PKG_driver)-settings.png + + # Disable the stack markings of binaries for security reasons. + # See (LP: #409456) + find $(dirname) -name *.so* | xargs -n1 execstack -c + +ifeq ($(DEB_BUILD_ARCH),amd64) + # Disable the stack markings of 32bit binaries on amd64 + # See (LP: #409456) + find $(dirname_x86) -name *.so* | xargs -n1 execstack -c +endif + # Disable the stack markings of other binaries (only for the current arch) + # Note: don't use for loops or pass more than 1 argument to execstack + # or it will fail. + execstack -c $(dirname)$(bindir)/nvidia-xconfig || true + execstack -c $(dirname)$(bindir)/nvidia-smi || true + + +#binary-install/$(PKG_driver_dev):: + +binary-install/$(PKG_driver):: serverabi +ifeq ($(DEB_BUILD_ARCH),amd64) + #32 bit libraries on 64 bit + dh_installdirs -p$(PKG_driver) "$(PKG_libdir32)" + dh_installdirs -p$(PKG_driver) "$(PKG_tlsdir32)" + + dh_install -p$(PKG_driver) "$(dirname_x86)$(libdir)/libGL*.so*" "$(PKG_libdir32)" + dh_install -p$(PKG_driver) "$(dirname_x86)$(libdir)/libnvidia*.so*" "$(PKG_libdir32)" + #dh_install -p$(PKG_driver) "$(dirname_x86)$(libdir)/libcuda*.so*" "$(PKG_libdir32)" + + dh_install -p$(PKG_driver) "$(dirname_x86)/usr/X11R6/lib/*.so*" "$(PKG_libdir32)" + dh_install -p$(PKG_driver) "$(dirname_x86)$(tlsdir)/lib*" "$(PKG_tlsdir32)" +endif + # Generate modaliases for Jockey and nvidia-common + mkdir -p $(CURDIR)/debian/$(PKG_driver)-modaliases/usr/share/jockey/modaliases/ + sh -e $(CURDIR)/debian/nvidia_supported \ + $(dirname)/usr/src/nv/nv-kernel.o nvidia_173 $(PKG_driver) \ + > $(CURDIR)/debian/$(PKG_driver).modaliases + dh_modaliases + rm $(CURDIR)/debian/$(PKG_driver).modaliases + + # Configuration stuff + + # ld.so.conf + dh_installdirs -p$(PKG_driver) "$(ld_so_conf_dir)" + echo "$(PKG_libdir)" > "$(CURDIR)/debian/$(PKG_driver)$(ld_so_conf_path)" +ifeq ($(DEB_BUILD_ARCH),amd64) + echo "$(PKG_libdir32)" >> $(CURDIR)/debian/$(PKG_driver)$(ld_so_conf_path) +endif + + # Blacklist any other driver that udev may want to load instead of $(PKG_module) + printf "blacklist nouveau\nblacklist lbm-nouveau\nblacklist nvidia-current\nblacklist nvidia-96\n" > $(CURDIR)/debian/$(PKG_driver)$(PKG_libconfdir)/modprobe.conf + # Create an alias for the module so that it can be used as nvidia + echo "alias nvidia $(PKG_module)" >> $(CURDIR)/debian/$(PKG_driver)$(PKG_configdir)/modprobe.conf + + # XvMCConfig + dh_installdirs -p$(PKG_driver) "$(PKG_configdir)" + echo "libXvMCNVIDIA_dynamic.so.1" > $(CURDIR)/debian/$(PKG_driver)/$(PKG_configdir)/XvMCConfig + + dh_install -p$(PKG_driver) $(dirname)$(mandir)/nvidia-xconfig.1.gz "$(mandir)"; + dh_install -p$(PKG_driver) $(dirname)$(mandir)/nvidia-settings.1.gz "$(mandir)"; +# dh_install -p$(PKG_driver) $(dirname)$(mandir)/nvidia-smi.1.gz "$(mandir)"; + + # Rename the man pages in order to use alternatives + for file in $(CURDIR)/debian/$(PKG_driver)$(mandir)/*.gz; do \ + mv $$file $(CURDIR)/debian/$(PKG_driver)$(mandir)/`basename $$file | sed 's/nvidia/alt-$(PKG_driver)/'`; \ + done + + rm -rf debian/temp + + +clean:: regen-from-templates +# for file in $(CURDIR)/debian/*.in \ +# ; do \ +# if [ `basename $$file` != "control.in" ]; then \ +# rm -f $(CURDIR)/debian/`basename $$file | sed 's/\.in\$$//'`; \ +# fi \ +# done + rm -fr $(dirname_x86) $(dirname_x86_64) + rm -fr debian/temp + + --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.links32.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.links32.in @@ -0,0 +1,14 @@ +#PKGLIBDIR32#/libGL.so.#VERSION# #PKGLIBDIR32#/libGL.so.1 +#PKGLIBDIR32#/libGL.so.1 #PKGLIBDIR32#/libGL.so +#PKGLIBDIR32#/libGLcore.so.#VERSION# #PKGLIBDIR32#/libGLcore.so.1 + +#PKGLIBDIR32#/libnvidia-cfg.so.#VERSION# #PKGLIBDIR32#/libnvidia-cfg.so.1 +#PKGLIBDIR32#/libnvidia-cfg.so.1 #PKGLIBDIR32#/libnvidia-cfg.so + +#NVIDIAEXTENSION#/libglx.so.#VERSION# #NVIDIAEXTENSION#/libglx.so + +#PKGLIBDIR32#/libXvMCNVIDIA.so.#VERSION# #PKGLIBDIR32#/libXvMCNVIDIA.so +#PKGLIBDIR32#/libXvMCNVIDIA.so.#VERSION# #PKGLIBDIR32#/libXvMCNVIDIA.so.1 +#PKGLIBDIR32#/libXvMCNVIDIA.so.#VERSION# #PKGLIBDIR32#/libXvMCNVIDIA_dynamic.so.1 + +#PKGLIBDIR32#/libnvidia-tls.so.#VERSION# #PKGLIBDIR32#/libnvidia-tls.so.1 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173-dev.preinst.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173-dev.preinst.in @@ -0,0 +1,81 @@ +#! /bin/sh +# preinst script for #DRIVERDEVNAME# +# +# see: dh_installdeb(1) +# +# Copyright (C) 2009-2010 Canonical Ltd +# Authors: Alberto Milone +# +set -e + +case "$1" in + install|upgrade) + # We need to remove diversions from previous versions of the package + + if [ -d /usr/share/nvidia-glx/diversions/ ] ; then + rm -f /usr/lib/libGL.so + rm -f /usr/lib/libGL.a + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.so /usr/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.a /usr/lib/libGL.a > /dev/null + + rmdir /usr/share/nvidia-glx/diversions/ || true + rmdir /usr/share/nvidia-glx || true + fi + + if [ ! -d /usr/lib/nvidia ]; then + mkdir -p /usr/lib/nvidia || true + fi + + # Remove old old old gl header diversions + if [ -e /usr/share/nvidia-glx/diversions/gl.h ]; then + if [ -e /usr/include/GL/gl.h ]; then + rm -f /usr/include/GL/gl.h /usr/include/GL/glx.h /usr/include/GL/glxtokens.h + fi + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxext.h /usr/include/GL/glxext.h > /dev/null + fi + + + # Make sure that no diversion is still there + set -a "nvidia-glx-dev" "nvidia-glx-new-dev" "nvidia-glx-legacy-dev" "nvidia-glx-dev-envy"\ + "nvidia-glx-new-dev-envy" "nvidia-glx-legacy-dev-envy" "nvidia-glx-180-dev" \ + "nvidia-glx-177-dev" "nvidia-glx-173-dev" "nvidia-glx-96-dev" "nvidia-glx-71-dev" \ + "nvidia-glx-185-dev" "nvidia-glx-190-dev" + + while [ $# -ge 1 ]; do + glxdevname=$1 + + if dpkg-divert --list /usr/lib/libGL.so | grep $glxdevname > /dev/null ; then + dpkg-divert --remove --rename --package $glxdevname --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null + fi + if dpkg-divert --list /usr/lib/libGL.a | grep $glxdevname > /dev/null ; then + dpkg-divert --remove --rename --package $glxdevname --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null + fi + if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep $glxdevname > /dev/null ; then + dpkg-divert --remove --rename --package $glxdevname --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null + fi + if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep $glxdevname > /dev/null ; then + dpkg-divert --remove --rename --package $glxdevname --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null + fi + + shift + done + + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173-dev.install.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173-dev.install.in @@ -0,0 +1,3 @@ +#DIRNAME#/usr/X11R6/lib/libXvMCNVIDIA.a #PKGLIBDIR# + +#DIRNAME#/usr/include/* #INCLUDEDIR#/#DRIVERNAME# --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.links.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.links.in @@ -0,0 +1,14 @@ +#PKGLIBDIR#/libGL.so.#VERSION# #PKGLIBDIR#/libGL.so.1 +#PKGLIBDIR#/libGL.so.1 #PKGLIBDIR#/libGL.so +#PKGLIBDIR#/libGLcore.so.#VERSION# #PKGLIBDIR#/libGLcore.so.1 + +#PKGLIBDIR#/libnvidia-cfg.so.#VERSION# #PKGLIBDIR#/libnvidia-cfg.so.1 +#PKGLIBDIR#/libnvidia-cfg.so.1 #PKGLIBDIR#/libnvidia-cfg.so + +#NVIDIAEXTENSION#/libglx.so.#VERSION# #NVIDIAEXTENSION#/libglx.so + +#PKGLIBDIR#/libXvMCNVIDIA.so.#VERSION# #PKGLIBDIR#/libXvMCNVIDIA.so +#PKGLIBDIR#/libXvMCNVIDIA.so.#VERSION# #PKGLIBDIR#/libXvMCNVIDIA.so.1 +#PKGLIBDIR#/libXvMCNVIDIA.so.#VERSION# #PKGLIBDIR#/libXvMCNVIDIA_dynamic.so.1 + +#PKGLIBDIR#/libnvidia-tls.so.#VERSION# #PKGLIBDIR#/libnvidia-tls.so.1 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.prerm.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.prerm.in @@ -0,0 +1,41 @@ +#!/bin/sh +# prerm script for #DRIVERNAME# +# +# Copyright (C) 2007 Mario Limonciello +# Copyright (C) 2009 Canonical Ltd +# Authors: Alberto Milone + + +PACKAGE_NAME=#DRIVERNAME# +CVERSION=`dpkg-query -W -f='${Version}' $PACKAGE_NAME | awk -F "-" '{print $1}' | cut -d\: -f2` + +remove_dkms_module() { + echo "Removing all DKMS Modules" + dkms remove -m $PACKAGE_NAME -v $CVERSION --all > /dev/null + echo "Done." +} + +case "$1" in + upgrade) + remove_dkms_module + ;; + remove) + remove_dkms_module + + update-alternatives --remove gl_conf #LDSOCONF# + + # Trigger gmenu so as to update the gnome menu + dpkg-trigger --by-package=$PACKAGE_NAME gmenucache || true + + # explicit ldconfig due to alternatives + ldconfig + + # Update the grub gfxpayload blacklist + if which update-grub-gfxpayload >/dev/null 2>&1; then + update-grub-gfxpayload + fi + ;; +esac + +#DEBHELPER# + --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.preinst +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.preinst @@ -0,0 +1,190 @@ +#! /bin/sh +# preinst script for nvidia-173 +# +# see: dh_installdeb(1) +# +# Copyright (C) 2009 Canonical Ltd +# Authors: Alberto Milone + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# +# For details see /usr/share/doc/packaging-manual/ + +if [ `dpkg --print-architecture` = "amd64" ]; then + HAS_LIB32="yes" +fi + +case "$1" in + install|upgrade) + + # We need to remove diversions from previous versions of the package + + # clean up from old diversions + if [ -d /usr/share/nvidia-glx/diversions ]; then + rm -f /usr/lib/libGL.so.1 + rm -f /usr/lib/libGL.so.1.2 + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1 /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1.2 /usr/lib/libGL.so.1.2 > /dev/null + + rm -f /usr/lib/xorg/modules/extensions/libGLcore.a + rm -f /usr/lib/xorg/modules/extensions/libglx.a + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGLcore.a /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libglx.a /usr/lib/xorg/modules/extensions/libglx.a > /dev/null + + rmdir /usr/share/nvidia-glx/diversions || true; + rmdir /usr/share/nvidia-glx || true; + fi + + if [ -d /usr/share/nvidia-glx/diversions-X11R6 ]; then + + rm -f /usr/X11R6/lib/libGL.so.1 + rm -f /usr/X11R6/lib/libGL.so.1.2 + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.so.1 /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.so.1.2 /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + rmdir /usr/share/nvidia-glx/diversions-X11R6 || true; + rmdir /usr/share/nvidia-glx || true; + fi + # remove X11R6 diversions + + if dpkg-divert --list /usr/X11R6/lib/libGL.so.1 | grep 'nvidia-glx' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + fi + + if dpkg-divert --list /usr/X11R6/lib/libGL.so.1.2 | grep 'nvidia-glx' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + fi + if dpkg-divert --list /usr/X11R6/lib/modules/extensions/libGLcore.a | grep 'nvidia-glx' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGLcore.a.xlibmesa /usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null + fi + if dpkg-divert --list /usr/X11R6/lib/modules/extensions/libglx.a | grep 'nvidia-glx' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libglx.a.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.a > /dev/null + fi + if dpkg-divert --list /usr/X11R6/lib/modules/extensions/libglx.so | grep 'nvidia-glx' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libglx.so.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.so > /dev/null + fi + + # make sure these diversions don't exist anymore + if dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-dev-envy --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true + fi + if dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-177-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-177-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true + fi + if dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-new-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-new-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-new-dev-envy --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true + fi + if dpkg-divert --list /usr/lib/libGL.a | grep 'nvidia-glx-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-dev-envy --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null || true + fi + if dpkg-divert --list /usr/lib/libGL.a | grep 'nvidia-glx-new-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-new-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-new-dev-envy --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null || true + fi + if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-dev-envy --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null || true + fi + if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-new-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-new-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-new-dev-envy --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null || true + fi + if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-dev-envy --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null || true + fi + if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-new-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-new-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-new-dev-envy --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null || true + fi + + + # Make sure that no diversion is still there + set -a "nvidia-glx" "nvidia-glx-new" "nvidia-glx-legacy" "nvidia-glx-envy"\ + "nvidia-glx-new-envy" "nvidia-glx-legacy-envy" "nvidia-glx-180" \ + "nvidia-glx-177" "nvidia-glx-173" "nvidia-glx-96" "nvidia-glx-71" \ + "nvidia-glx-185" "nvidia-glx-190" + + while [ $# -ge 1 ]; do + glxname=$1 + glxdevname="$glxname-dev" + + if [ -n "$HAS_LIB32" ]; then + #Remove diversions of /usr/lib32/libGL.so -- only for the new name schemes (nvidia-glx-VER) + if dpkg-divert --list $glxname | grep "/usr/lib32/libGL.so " > /dev/null ; then + rm -f /usr/lib32/libGL.so > /dev/null || true + dpkg-divert --remove --rename --package $glxname --divert /usr/lib32/nvidia/libGL.so.xlibmesa /usr/lib32/libGL.so > /dev/null || true + fi + + #Remove diversion of /usr/lib32/libGL.so.1 + if dpkg-divert --list $glxname | grep /usr/lib32/libGL.so.1 > /dev/null ; then + rm -f /usr/lib32/libGL.so.1 > /dev/null || true + dpkg-divert --remove --rename --package $glxname --divert /usr/lib32/nvidia/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null || true + fi + + #Remove diversion of /usr/lib32/libGL.so.1.2 + if dpkg-divert --list $glxname | grep /usr/lib32/libGL.so.1.2 > /dev/null ; then + rm -f /usr/lib32/libGL.so.1.2 > /dev/null || true + dpkg-divert --remove --rename --package $glxname --divert /usr/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null || true + fi + + fi + + + #Remove diversion of /usr/lib/xorg/modules/extensions/libGLcore.so + if dpkg-divert --list $glxname | grep /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null ; then + dpkg-divert --remove --rename --package $glxname --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null || true + fi + + #Remove diversion of /usr/lib/xorg/modules/extensions/libglx.so + if dpkg-divert --list $glxname | grep /usr/lib/xorg/modules/extensions/libglx.so > /dev/null ; then + rm -f /usr/lib/xorg/modules/extensions/libglx.so > /dev/null || true + dpkg-divert --remove --rename --package $glxname --divert /usr/lib/nvidia/libglx.so.xserver-xorg-core /usr/lib/xorg/modules/extensions/libglx.so > /dev/null || true + fi + + #Remove diversion of /usr/lib/libGL.so.1 + if dpkg-divert --list $glxname | grep "/usr/lib/libGL.so.1 " > /dev/null ; then + rm -f /usr/lib/libGL.so.1 > /dev/null || true + dpkg-divert --remove --rename --package $glxname --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null || true + fi + + #Remove diversion of /usr/lib/libGL.so.1.2 + if dpkg-divert --list $glxname | grep /usr/lib/libGL.so.1.2 > /dev/null ; then + rm -f /usr/lib/libGL.so.1.2 > /dev/null || true + dpkg-divert --remove --rename --package $glxname --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null || true + fi + + + shift + done + + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.install +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.install @@ -0,0 +1,28 @@ +debian/nvidia-173.override usr/share/lintian/overrides +#Blacklist some card ids from GRUB gfxpayload=keep +debian/nvidia-173.grub-gfxpayload /usr/share/nvidia-173 + +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/X11R6/lib/modules/drivers/nvidia_drv.so /usr/lib/nvidia-173/xorg +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/X11R6/lib/modules/extensions/libglx.so.173.14.30 /usr/lib/nvidia-173/xorg + +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/lib/libGL*.so* /usr/lib/nvidia-173 +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/lib/libnvidia*.so* /usr/lib/nvidia-173 + +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/lib/tls/*.so* /usr/lib/nvidia-173/tls + +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/X11R6/lib/libXvMCNVIDIA.so.173.14.30 /usr/lib/nvidia-173 + +debian/dkms/patches/* usr/src/nvidia-173-173.14.30/patches +debian/dkms.conf usr/src/nvidia-173-173.14.30 +debian/temp/modules/nvidia-kernel/nv/* usr/src/nvidia-173-173.14.30 + +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/bin/nvidia-bug-report.sh /usr/lib/nvidia-173/bin +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/bin/nvidia-xconfig /usr/lib/nvidia-173/bin +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/bin/nvidia-smi /usr/lib/nvidia-173/bin + +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/share/pixmaps/nvidia-173-settings.png /usr/share/pixmaps + +debian/ubuntu-nvidia-settings.desktop /usr/share/nvidia-173 + +debian/nvidia-autostart.desktop /usr/share/nvidia-173 + --- nvidia-graphics-drivers-173-173.14.30.orig/debian/ubuntu-nvidia-settings.desktop.in +++ nvidia-graphics-drivers-173-173.14.30/debian/ubuntu-nvidia-settings.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=NVIDIA X Server Settings +Comment=Configure NVIDIA X Server Settings +Exec=#BINDIR#/nvidia-settings +Icon=#DRIVERNAME#-settings +Categories=System;Settings; --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.override.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.override.in @@ -0,0 +1,86 @@ +#DRIVERNAME#: library-not-linked-against-libc ./usr/lib/libGL.so.#VERSION# + +#DRIVERNAME#: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.#VERSION# + +#DRIVERNAME#: library-not-linked-against-libc ./usr/lib/xorg/modules/extensions/libglx.so.#VERSION# + +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/libGL.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/libGLcore.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/libXvMCNVIDIA.so.#VERSION# + +#DRIVERNAME#: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.#VERSION# usr/lib/libGL.so +#DRIVERNAME#: non-dev-pkg-with-shlib-symlink usr/lib/xorg/modules/extensions/libglx.so.#VERSION# usr/lib/xorg/modules/extensions/libglx.so + + +#DRIVERNAME#: script-not-executable usr/src/#DRIVERNAME#-#VERSION#/conftest.sh +#DRIVERNAME#: maintainer-script-ignores-errors prerm +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/#DRIVERNAME#/libGL.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/#DRIVERNAME#/libGL.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/#DRIVERNAME#/libGLcore.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/#DRIVERNAME#/libGLcore.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/#DRIVERNAME#/libXvMCNVIDIA.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/#DRIVERNAME#/libXvMCNVIDIA.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/#DRIVERNAME#/libnvidia-cfg.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/#DRIVERNAME#/libnvidia-cfg.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/#DRIVERNAME#/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/#DRIVERNAME#/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/#DRIVERNAME#/libvdpau.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/#DRIVERNAME#/tls/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/#DRIVERNAME#/tls/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/#DRIVERNAME#/vdpau/libvdpau_nvidia.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/#DRIVERNAME#/vdpau/libvdpau_nvidia.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/#DRIVERNAME#/vdpau/libvdpau_trace.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/#DRIVERNAME#/xorg/libglx.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/#DRIVERNAME#/xorg/libglx.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/tls/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/tls/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib/vdpau/libvdpau_nvidia.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/vdpau/libvdpau_nvidia.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib/vdpau/libvdpau_trace.so.#VERSION# +#DRIVERNAME#: unused-shlib-entry-in-control-file libnvidia-tls 190 +#DRIVERNAME#: shlibs-declares-dependency-on-other-package libgl1-mesa | libgl1 +#DRIVERNAME#: prerm-calls-ldconfig +#DRIVERNAME#: copyright-without-copyright-notice +#DRIVERNAME#: desktop-command-not-in-package /usr/share/applications/#DRIVERNAME#/ubuntu-nvidia-settings.desktop /usr/bin/nvidia-settings +#DRIVERNAME#: shared-lib-without-dependency-information ./usr/lib/#DRIVERNAME#/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shared-lib-without-dependency-information ./usr/lib/#DRIVERNAME#/tls/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shared-lib-without-dependency-information ./usr/lib/tls/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: unknown-section restricted/misc +nvidia-185-modaliases: copyright-without-copyright-notice +nvidia-185-modaliases: extended-description-line-too-long +nvidia-glx-185-dev: copyright-without-copyright-notice +nvidia-glx-185-dev: extended-description-line-too-long +nvidia-glx-185-dev: unknown-section restricted/misc +nvidia-185-kernel-source: copyright-without-copyright-notice +nvidia-185-kernel-source: unknown-section restricted/misc +#DRIVERNAME#-dev: shlib-with-non-pic-code usr/lib/#DRIVERNAME#/libXvMCNVIDIA.so.#VERSION# +#DRIVERNAME#-dev: shlib-without-PT_GNU_STACK-section usr/lib/#DRIVERNAME#/libXvMCNVIDIA.so.#VERSION# +#DRIVERNAME#-dev: postinst-has-useless-call-to-ldconfig +#DRIVERNAME#-dev: postrm-has-useless-call-to-ldconfig +#DRIVERNAME#-dev: copyright-without-copyright-notice +#DRIVERNAME#-dev: missing-dependency-on-libc needed by ./usr/lib/#DRIVERNAME#/libXvMCNVIDIA.so.#VERSION# +#DRIVERNAME#-dev: unknown-section restricted/misc +nvidia-glx-185: copyright-without-copyright-notice +nvidia-glx-185: unknown-section restricted/misc +#DRIVERNAME#-modaliases: copyright-without-copyright-notice + +#DRIVERNAME#: script-not-executable ./usr/src/#DRIVERNAME#-#VERSION#/conftest.sh +#DRIVERNAME#: maintainer-script-ignores-errors prerm +#DRIVERNAME#: shlib-with-non-pic-code usr/lib32/#DRIVERNAME#/libGL.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib32/#DRIVERNAME#/libGLcore.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib32/#DRIVERNAME#/libXvMCNVIDIA.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib32/#DRIVERNAME#/libXvMCNVIDIA.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib32/#DRIVERNAME#/libnvidia-cfg.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib32/#DRIVERNAME#/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib32/#DRIVERNAME#/libvdpau_nvidia.so.#VERSION# +#DRIVERNAME#: shlib-with-non-pic-code usr/lib32/#DRIVERNAME#/tls/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shlib-without-PT_GNU_STACK-section usr/lib32/#DRIVERNAME#/tls/libnvidia-tls.so.#VERSION# + +#DRIVERNAME#: shared-lib-without-dependency-information ./usr/lib/#DRIVERNAME#/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shared-lib-without-dependency-information ./usr/lib/#DRIVERNAME#/tls/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shared-lib-without-dependency-information ./usr/lib/tls/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shared-lib-without-dependency-information ./usr/lib32/#DRIVERNAME#/libnvidia-tls.so.#VERSION# +#DRIVERNAME#: shared-lib-without-dependency-information ./usr/lib32/#DRIVERNAME#/tls/libnvidia-tls.so.#VERSION# + + --- nvidia-graphics-drivers-173-173.14.30.orig/debian/dkms.conf +++ nvidia-graphics-drivers-173-173.14.30/debian/dkms.conf @@ -0,0 +1,21 @@ +PACKAGE_NAME="nvidia-173" +PACKAGE_VERSION="173.14.30" +#Prevent builds with kernels newer than the ones we ship +OBSOLETE_BY=2.6.39 +CLEAN="make clean" +BUILT_MODULE_NAME[0]="nvidia" +DEST_MODULE_NAME[0]="nvidia-173" +MAKE[0]="make module KERNDIR=/lib/modules/$kernelver IGNORE_XEN_PRESENCE=1 IGNORE_CC_MISMATCH=1 SYSSRC=$kernel_source_dir" +DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm" +AUTOINSTALL="yes" +PATCH[0]="nvidia-2.6.36-ioctl.patch" +PATCH_MATCH[0]="^2.6.36" +PATCH[1]="blacklist-register-mapping.patch" +#PATCH[0]="NVIDIA_173.14.12_2.6.27.patch" +#PATCH_MATCH[0]="^2.6.2[7]" +#PATCH[1]="fall_back_on_mtrr_if_no_pat.patch" +#PATCH_MATCH[1]="2.6.31" +#PATCH[2]="nvidia-rt-compat-legacy.patch" +#PATCH_MATCH[2]="2.6.31" +#PATCH[3]="rt_preempt_31.patch" +#PATCH_MATCH[3]="2.6.31" --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.README.Debian.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.README.Debian.in @@ -0,0 +1,89 @@ +NVIDIA video drivers for Ubuntu +============================ + +Further information can be found at http://www.nvidia.com/ -- look for +the "Download Drivers" tab and follow links to the Linux drivers. + +This package is generated from the official NVIDIA driver +installer that is available from the above homepage. + +DKMS +------------------------- + Ubuntu includes support to build modules using a utility developed by + Dell, called DKMS. It will automatically build your kernel module + for you when you first boot into the kernel (or as necessary). + + Note: the OBSOLETE_BY line in dkms.conf specifies a kernel version + which obsoletes the necessity for this particular DKMS module. + For example, OBSOLETE_BY=2.6.39 will prevent DKMS from building + modules for kernels >= 2.6.39. + + See the DKMS man page for more information. + +Kernel patches +------------------------- + If you need to provide a kernel patch (say for a kernel not formally + supported yet by NVIDIA), you can add this patch in the + debian/dkms/patches directory and mention the patch in the + debian/dkms.conf.in file. + + It is usually a good idea to restrict the use of a patch to certain + kernel versions with the PATCH_MATCH[n] variable. + + See the DKMS man page for more information. + +32 bit libraries on 64 bit systems +------------------------- + 32 bit libraries are provided on 64 bit systems for compatibility + reasons. + + The following templates are merged together into the same file on + amd64: + debian/nvidia-current.links32.in + debian/nvidia-current.links.in + + $ld_so_conf_path lets the system know where it should look for 32 + bit libraries. + +Update procedure +------------------------- +When a new NVIDIA is available, do the following to update +#DRIVERNAME#: + +0. On your build system, make sure you have the prerequisites + installed: + + $ sudo apt-get build-dep #DRIVERNAME# + +1. Download the NVIDIA installers i.e. the .run files. + +2. dch -i to update the version in the debian/changelog so that it + matches the new upstream version. + + Also make sure that the changelog includes both the changes you + made (if any) to the files in debian/ changes and the changes from + upstream (i.e. NVIDIA) which you can find in the release notes of + the driver. + +3. debclean to regenerate most of the files in debian/ from their + templates. + +4. Temporarily move the debian/ directory out of the source directory + and compress it as $SOURCE_NAME _ $NEW_VERSION . orig . tar . gz + e.g. #DRIVERSRCNAME#_#VERSION#.orig.tar.gz + +5. Move the debian/ directory back to the source directory and type + debuild -S -sa to produce a new .dsc + +6. Verify the new .dsc produces valid .debs by running it through + pbuilder, sbuild, etc. as usual. + +7. Install and test the .debs, and then dput the .changes file + + +IMPORTANT NOTE: If any changes to files in debian/ are needed, make sure +to discuss your changes with the maintainer (Alberto aka tseliot) before +you upload. + + + -- Alberto Milone Mon, 21 Dec 2009 12:36:15 +0100 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173-dev.links +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173-dev.links @@ -0,0 +1 @@ +/usr/include/nvidia-173 /usr/share/doc/nvidia-173-dev/include --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.examples +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.examples @@ -0,0 +1,2 @@ +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/share/doc/XF86Config.sample + --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.dirs.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.dirs.in @@ -0,0 +1,22 @@ +#SYSCONFDIR#/modprobe.d +#PKGLIBDIR# +#AUTOSTARTDIR# +#BINDIR# +#PKGTLSDIR# +#INCLUDEDIR#/GL +#PKGBINDIR# +#PKGLIBDIR# +#PKGLIBDIR32# +/usr/lib/xorg/modules/drivers +/usr/lib/xorg/modules/extensions +#PKGDATADIR# +#PKGDESKDIR# +#MANDIR# +#DATADIR#/pixmaps +/usr/share/lintian/overrides +/usr/share/grub-gfxpayload-lists/blacklist +#PKGDRIVERSDIR# +#NVIDIAEXTENSION# +/usr/src/#DRIVERNAME#-#VERSION# +/usr/src/#DRIVERNAME#-#VERSION#/patches +#PKGLIBCONFDIR# --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.links32 +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.links32 @@ -0,0 +1,14 @@ +/usr/lib32/nvidia-173/libGL.so.173.14.30 /usr/lib32/nvidia-173/libGL.so.1 +/usr/lib32/nvidia-173/libGL.so.1 /usr/lib32/nvidia-173/libGL.so +/usr/lib32/nvidia-173/libGLcore.so.173.14.30 /usr/lib32/nvidia-173/libGLcore.so.1 + +/usr/lib32/nvidia-173/libnvidia-cfg.so.173.14.30 /usr/lib32/nvidia-173/libnvidia-cfg.so.1 +/usr/lib32/nvidia-173/libnvidia-cfg.so.1 /usr/lib32/nvidia-173/libnvidia-cfg.so + +/usr/lib/nvidia-173/xorg/libglx.so.173.14.30 /usr/lib/nvidia-173/xorg/libglx.so + +/usr/lib32/nvidia-173/libXvMCNVIDIA.so.173.14.30 /usr/lib32/nvidia-173/libXvMCNVIDIA.so +/usr/lib32/nvidia-173/libXvMCNVIDIA.so.173.14.30 /usr/lib32/nvidia-173/libXvMCNVIDIA.so.1 +/usr/lib32/nvidia-173/libXvMCNVIDIA.so.173.14.30 /usr/lib32/nvidia-173/libXvMCNVIDIA_dynamic.so.1 + +/usr/lib32/nvidia-173/libnvidia-tls.so.173.14.30 /usr/lib32/nvidia-173/libnvidia-tls.so.1 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.grub-gfxpayload +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.grub-gfxpayload @@ -0,0 +1 @@ +# Blacklist cards here --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.docs.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.docs.in @@ -0,0 +1,2 @@ +#DIRNAME#/usr/share/doc/NVIDIA_Changelog +#DIRNAME#/usr/share/doc/README.txt --- nvidia-graphics-drivers-173-173.14.30.orig/debian/changelog +++ nvidia-graphics-drivers-173-173.14.30/debian/changelog @@ -0,0 +1,1278 @@ +nvidia-graphics-drivers-173 (173.14.30-0ubuntu1.1) natty-security; urgency=low + + * SECURITY UPDATE: privilege escalation via kernel memory access + (LP: #959842) + - debian/dkms/patches/blacklist-register-mapping.patch: blacklist + certain offsets in nv.{c,h}. + - debian/dkms.conf{.in}: added new patch. + - Thanks to NVIDIA for providing the patch. + - CVE number pending + + -- Marc Deslauriers Sat, 07 Apr 2012 17:51:33 -0400 + +nvidia-graphics-drivers-173 (173.14.30-0ubuntu1) natty; urgency=low + + * New upstream release: + - Add support for X.Org xserver 1.10 (LP: #741930). + - Improve compatibility with recent Linux kernels. + + -- Alberto Milone Wed, 20 Apr 2011 13:08:15 +0200 + +nvidia-graphics-drivers-173 (173.14.28-0ubuntu6) natty; urgency=low + + [ Andrea Carpineti ] + * Fix typo in package description Geforce to GeForce + (LP: #639955) + + -- Bryce Harrington Mon, 07 Mar 2011 17:11:06 -0800 + +nvidia-graphics-drivers-173 (173.14.28-0ubuntu5) natty; urgency=low + + * debian/control{.in}: + - Depend on ${xviddriver:Depends}. + * debian/rules: + - Manually set video ABI compatibility to 8 so that the driver is not + installable in applications such as Jockey or manually. + - Correct comment about what the file is based on. + + -- Alberto Milone Mon, 28 Feb 2011 16:11:58 +0100 + +nvidia-graphics-drivers-173 (173.14.28-0ubuntu4) natty; urgency=low + + * Remove .patch files that were accidentally uploaded. + + -- Alberto Milone Fri, 07 Jan 2011 15:14:47 +0100 + +nvidia-graphics-drivers-173 (173.14.28-0ubuntu3) natty; urgency=low + + * debian/nvidia-173.prerm{.in}: + - Call dpkg-trigger with --by-package=$PACKAGE_NAME. + * Add support for blacklisting card ids from GRUB gfxpayload=keep: + - In Natty gfxpayload=keep is set by default so as to provide a framebuffer + early in the boot process. Some cards don't play nicely with it, therefore + we need to blacklist them in a file. The format is a sequence of lines of + the following form: + vVENDORdDEVICEsvSUBVENDORsdSUBDEVICEbcBASECLASSscSUBCLASS + Blacklist lines are regex-matched against a corresponding PCI ID string. + In practice this means that you can replace any part of the ID string + with .* to match anything. + + -- Alberto Milone Fri, 07 Jan 2011 13:32:17 +0100 + +nvidia-graphics-drivers-173 (173.14.28-0ubuntu2) natty; urgency=low + + * Move from separate modalias file package to using a package header: + - debian/control.in, debian/rules: Drop -modaliases package. + - debian/control.in: Add XB-Modaliases header and dh-modaliases build + dependency. + - debian/rules: Build the modalias list to + debian/nvidia-173.modaliases, where dh_modaliases picks it up, and + invoke dh_modaliases. + - debian/control.in: Add Conflicts:/Replaces: to nvidia-173-modaliases, so + that the obsolete modaliases package gets cleaned up on upgrade. + + -- Martin Pitt Sat, 18 Dec 2010 19:25:49 +0100 + +nvidia-graphics-drivers-173 (173.14.28-0ubuntu1) maverick; urgency=low + + * New upstream release: + - Add support for X.Org xserver 1.9 (LP: #626918). + * debian/rules: + - Switch to new xsfbs variables to get the server ABI + (LP: #616214). + * debian/nvidia-173.postinst{.in}: + - Call dpkg-trigger with "--by-package". + * debian/dkms/patches/nvidia-2.6.36-ioctl.patch: + - Add compatibility with kernel 2.6.36. + + -- Alberto Milone Mon, 04 Oct 2010 14:11:43 +0200 + +nvidia-graphics-drivers-173 (173.14.27-0ubuntu1) maverick; urgency=low + + * New upstream release: + - Fixed a bug in the XvMC driver that prevented it from working on + systems with AGP graphics cards. + - Added support for X.Org xserver 1.8. + - Fixed a bug that could cause X.Org xserver >= 1.7 to hang when + restarted. + + -- Alberto Milone Fri, 16 Jul 2010 12:13:01 +0200 + +nvidia-graphics-drivers-173 (173.14.22-0ubuntu11) lucid; urgency=low + + * debian/nvidia-$flavour.{dirs|postinst}.in, rules: + - Install the blacklist file in /lib/nvidia-$flavour instead + of /usr/lib/nvidia-$flavour so that the file is available + early in the boot process when /usr is on a different + partition (LP: #538071). + - Ignore errors when trying to update the initramfs + with -k $CURRENT_KERNEL which is known to fail when + using chroots (LP: #556653). + + -- Alberto Milone Fri, 09 Apr 2010 13:10:28 +0200 + +nvidia-graphics-drivers-173 (173.14.22-0ubuntu10) lucid; urgency=low + + * debian/nvidia-$flavour.{postinst|prerm}.in: + - Call gmenucache trigger so that the icon of nvidia-settings + shows up in the menu (LP: #522969). + + -- Alberto Milone Tue, 16 Mar 2010 17:39:22 +0100 + +nvidia-graphics-drivers-173 (173.14.22-0ubuntu9) lucid; urgency=low + + * debian/rules: + - Blacklist lbm-nouveau. + + -- Alberto Milone Thu, 04 Feb 2010 16:33:57 -0800 + +nvidia-graphics-drivers-173 (173.14.22-0ubuntu8) lucid; urgency=low + + * debian/rules: + - Use the real name of the kernel module in the modalias + file instead of the alias. + + -- Alberto Milone Wed, 03 Feb 2010 17:35:06 -0800 + +nvidia-graphics-drivers-173 (173.14.22-0ubuntu7) lucid; urgency=low + + * debian/nvidia-173.postinst.in: + - Update the initramfs for the current kernel and for the + newest one so that the blacklist file is included in + the initramfs and nouveau can be blacklisted early. + + -- Alberto Milone Wed, 03 Feb 2010 10:41:26 -0800 + +nvidia-graphics-drivers-173 (173.14.22-0ubuntu6) lucid; urgency=low + + * debian/rules: + - Blacklist nouveau and the other nvidia proprietary + drivers in the modprobe.conf file. + + -- Alberto Milone Thu, 21 Jan 2010 15:57:43 +0100 + +nvidia-graphics-drivers-173 (173.14.22-0ubuntu5) lucid; urgency=low + + * debian/compat: + - Bump compatibility to 5. + * debian/nvidia-173.install.in: + - Remove any reference to vdpau. + * debian/nvidia-173.postinst.in: + - Install alternative with --force so that files that + already exist (from unofficial PPAs or from the Nvidia + installer, etc.) are overwritten thus avoiding to + install a broken alternative. + * debian/rules: + - Use global replacement when generating files from + templates. + + -- Alberto Milone Tue, 19 Jan 2010 11:56:57 +0100 + +nvidia-graphics-drivers-173 (173.14.22-0ubuntu4) lucid; urgency=low + + * debian/nvidia-173.postinst.in: + - Remove gl_libraries slave link as the file in ld.so.conf.d is + enough. + + -- Alberto Milone Sun, 17 Jan 2010 17:15:41 +0100 + +nvidia-graphics-drivers-173 (173.14.22-0ubuntu3) lucid; urgency=low + + * debian/control.in: + - There's no need for the -dev package to conflict with + the mesa development packages any more. + * debian/nvidia-173.postinst.in: + - Do not set slaves for libglx and libdri. We don't need + this any more as, thanks to a change in X, xorg_extra_modules + will suffice. + - Set link to $PKG_libdir in /usr/lib/GL with alternatives. + + -- Alberto Milone Mon, 11 Jan 2010 19:11:03 +0100 + +nvidia-graphics-drivers-173 (173.14.22-0ubuntu2) lucid; urgency=low + + * Assign copyright to Canonical Ltd instead of Canonical + Services Ltd in the packaging scripts and in the copyright + file. + + -- Alberto Milone Sat, 09 Jan 2010 14:34:40 +0100 + +nvidia-graphics-drivers-173 (173.14.22-0ubuntu1) lucid; urgency=low + * Rework packaging taking Mandriva's as a model: + - Use alternatives instead of diversions. + - Reduce the number of binary packages to nvidia-173, + nvidia-173-dev and nvidia-173-modaliases. + * debian/rules: + - Switch to CDBS. + - Remove libGL.la as no static library is provided. + * debian/nvidia-current.README.Debian.in: + - Document the update process. + * nvidia-current.postinst: try to build the module for the most + recent kernel in addition to building it for the current kernel + (LP: #474917). + * New upstream release (LP: #494166): + - Add support for xserver 1.7.x. + + -- Alberto Milone Fri, 08 Jan 2010 23:30:10 +0100 + +nvidia-graphics-drivers-173 (173.14.20-0ubuntu6) karmic-proposed; urgency=low + + * debian/nvidia-$VER-kernel-source.postinst: + - Use the DKMS template /usr/lib/dkms/common.postinst. + This - together with a fix for the template - contributes to + fix LP: #474917. + + -- Alberto Milone Thu, 12 Nov 2009 12:19:33 +0100 + +nvidia-graphics-drivers-173 (173.14.20-0ubuntu5) karmic; urgency=low + + * debian.binary/patches, dkms.conf.in: + - nvidia-rt-compat-legacy.patch: Update patch to allow the driver + to work with rt kernels again (LP: #413296). + - rt_preempt_31.patch: Add patch which was already in -185. + + -- Alberto Milone Sun, 25 Oct 2009 10:45:15 +0100 + +nvidia-graphics-drivers-173 (173.14.20-0ubuntu4) karmic; urgency=low + + * debian/control.in: + - Add dependency on patch to nvidia-$VER-kernel-source (LP: #453961). + + -- Alberto Milone Sun, 18 Oct 2009 16:07:59 +0200 + +nvidia-graphics-drivers-173 (173.14.20-0ubuntu3) karmic; urgency=low + + * debian.binary/patches, dkms.conf.in: + - fall_back_on_mtrr_if_no_pat.patch: Fall back on MTRRs if the + CPU doesn't support the PAT (LP: #391461). + + -- Alberto Milone Fri, 16 Oct 2009 11:30:55 +0200 + +nvidia-graphics-drivers-173 (173.14.20-0ubuntu2) karmic; urgency=low + + [ Alberto Milone ] + * debian/control, debian/control.in: + - Change the section of the -modaliases package to "admin" as the package + is not "restricted" (LP: #429153). + + [ Kees Cook ] + * debian/control.in: + - Add build dependency on execstack. + * debian/rules: + - Drop executable stack markings from precompiled binaries (LP: #409456). + + -- Alberto Milone Fri, 25 Sep 2009 18:15:44 +0200 + +nvidia-graphics-drivers-173 (173.14.20-0ubuntu1) karmic; urgency=low + + * New upstream release. Supports new kernels (LP: #424624). + - Updated nvidia-bug-report.sh to automatically compress its log file; + running `nvidia-bug-report.sh` now produces "nvidia-bug-report.log.gz". + - Fixed a bug that resulted in AGP FW/SBA settings and overrides being + applied incorrectly when using the Linux kernel's AGP GART driver. + - Fixed a bug that could trigger kernel BUG() failures when stress testing + setup/teardown paths. + - Re-enabled support for non-SSE CPUs. + - Fixed a server crash triggered by Kopete's 'new message' popup dialog + when a composite manager is enabled. + * debian/control.in: + - Add -185 to the "Replaces" of packages. + + -- Alberto Milone Mon, 07 Sep 2009 11:41:41 +0200 + +nvidia-graphics-drivers-173 (173.14.16-0ubuntu1) jaunty; urgency=low + + * New upstream release. Supports the new X.org ABI (LP: #308410) + * Fixed a problem that caused nvidia-installer to remove Compiz's libglx.so. + * Added "nvidia-uninstall" as a shortcut for "nvidia-installer --uninstall". + * Fixed a bug that caused corrupt window decorations in Compiz (LP: #186382). + * Fixed corruption in KDE 4 when OpenOffice is launched. + * Fixed a problem that prevented X from starting on 2.6.29-rc1 with an error + like the following: + X:6500 map pfn expected mapping type write-combining for d0000000-d0500000, + got uncached-minus + * Added the ability to run distribution provided pre- and post- installation + hooks to 'nvidia-installer'; please see the 'nvidia-installer' manual page for details. + * Drop debian.binary/patches/NVIDIA_173.14.12_2.6.27.patch + * debian/nvidia-glx-173.preinst: + - Correct typo in the removal of diversions of /usr/lib/xorg/modules/extensions/libglx.so + * debian/nvidia-glx-173.postrm.in + - Do not remove libGL.so (LP: #309116) + * debian/nvidia-glx-173-dev.preinst.in: + - Add diversion on /usr/lib/libGL.so since (the postrm tries to remove it already) + * debian/nvidia-glx-173-dev.postrm: + - replace legacy-173xx with 173 + + + -- Alberto Milone (tseliot) Thu, 29 Jan 2009 13:23:57 +0100 + +nvidia-graphics-drivers-173 (173.14.12-1-0ubuntu6) jaunty; urgency=low + + * Make it conflict with driver 180 + * Make it easier to add the support for new flavours in nvidia-glx-VER.preinst + * Switch to DKMS patching system (in debian/rules) so as to have different + patches for different kernel versions + + -- Alberto Milone (tseliot) Sun, 30 Nov 2008 18:40:48 +0100 + +nvidia-graphics-drivers-173 (173.14.12-1-0ubuntu5) intrepid-proposed; urgency=low + + * Add diversions on /usr/lib/libGL.so.1, /usr/lib/libGL.so.1.2, + /usr/lib/xorg/modules/extensions/libglx.so without checking their existence in + Ubuntu 32 bit too (LP: #287470) + * Remove quotation marks from the SOURCES varialble in + nvidia-VER-kernel-source.postinst + + -- Alberto Milone (tseliot) Sun, 02 Nov 2008 13:25:26 +0100 + +nvidia-graphics-drivers-173 (173.14.12-1-0ubuntu4) intrepid; urgency=low + + * Fix (LP: #282284) Replace the nvidia-xconfig binary with a + script which depends on python-xkit and covers the basic + functionalities of nvidia-xconfig + * Add dependency on python-xkit to nvidia-glx-173 + * Test the existence of the dkms folder in + nvidia-173-kernel-source.postinst + + -- Alberto Milone (tseliot) Mon, 13 Oct 2008 17:35:55 +0200 + +nvidia-graphics-drivers-173 (173.14.12-1-0ubuntu3) intrepid; urgency=low + + * Fix (LP: #262027) Make sure to remove (in + nvidia-173-kernel-source.postinst) any directory which + was not removed because of bug 261816 + + -- Alberto Milone (tseliot) Mon, 22 Sep 2008 12:36:29 +0200 + +nvidia-graphics-drivers-173 (173.14.12-1-0ubuntu2) intrepid; urgency=low + + * Rebuild against the new xserver-xorg-dev. + + -- Bryce Harrington Thu, 11 Sep 2008 18:12:31 -0700 + +nvidia-graphics-drivers-173 (173.14.12-1-0ubuntu1) intrepid; urgency=low + + * Fix (LP: #261816) Replace "remove" with "remove|upgrade" in the + case loop in nvidia-177-kernel-source.prerm so that older versions + of the drivers are removed in case of upgrade + * Add a patch to support kernel 2.6.27. Call smp_call_function() and on_each_cpu() + with 3 arguments instead of 4 if kernel == 2.6.27. + + -- Alberto Milone (tseliot) Fri, 29 Aug 2008 08:57:20 +0200 + +nvidia-graphics-drivers-173 (173.14.12-0ubuntu5) intrepid; urgency=low + + * Fix (LP: #254969) Make nvidia-glx-173 conflict with xorg-driver-fglrx + + -- Alberto Milone (tseliot) Fri, 22 Aug 2008 11:49:08 +0200 + +nvidia-graphics-drivers-173 (173.14.12-0ubuntu4) intrepid; urgency=low + + * Fix (LP: #254444) Remove pound from link in nvidia-glx-173-dev.links.in + * Fix (LP: #259105) Add missing link to usr/lib/libXvMCNVIDIA.so.#VERSION# in + usr/lib/libXvMCNVIDIA.so + + -- Alberto Milone (tseliot) Wed, 20 Aug 2008 10:57:50 +0200 + +nvidia-graphics-drivers-173 (173.14.12-0ubuntu3) intrepid; urgency=low + + * Don't test the existence of libGL.so, libGL.so.1, libGL.so.1.2 in /usr/lib32 when + adding a diversion on them in the preinst. This will make sure that NVIDIA's + libGL.so.xx will win against the one in ia32-libs [amd64] + * Remove diversions of libGL.so in the preinst added by nvidia-glx-VER and add a new + diversion of the file to /usr/lib32/nvidia/libGL.so.xlibmesa [amd64] + * Remove diversion of libGL.so in the postrm.in [amd64] + * Remove dependency on ia32-libs [amd64] + + -- Alberto Milone (tseliot) Sat, 09 Aug 2008 11:08:35 +0200 + +nvidia-graphics-drivers-173 (173.14.12-0ubuntu2) intrepid; urgency=low + + * Make sure that the installers are executable in the debian/rules + + -- Alberto Milone (tseliot) Tue, 05 Aug 2008 09:51:36 +0200 + +nvidia-graphics-drivers-173 (173.14.12-0ubuntu1) intrepid; urgency=low + + * Add NVIDIA driver 173.14.12. + * Added support for GeForce 8600 GS. + * Fixed a problem with missing rendering in OpenGL Workstation + Overlays + * Fixed a problem with running some SDL applications and virtual + terminal switching. + * Fixed a potential crash in nvidia-settings when saving to the X + configuration file. + * Improved error recovery paths in the case of corruption of the + commands sent to the GPU. + + -- Alberto Milone (tseliot) Mon, 04 Aug 2008 15:05:58 +0200 + +nvidia-graphics-drivers-173 (173.14.09-0ubuntu6) intrepid; urgency=low + + * Fix (LP: #247984) Add dependency on ia32-libs for amd64 + * Add the name of the package to the modalias list + + -- Alberto Milone (tseliot) Sun, 13 Jul 2008 20:36:09 +0200 + +nvidia-graphics-drivers-173 (173.14.09-0ubuntu5) intrepid; urgency=low + + * Fix (LP: #247527) depend on linux-headers-generic | linux-headers rather + than on linux-headers + + -- Alberto Milone (tseliot) Fri, 11 Jul 2008 15:16:55 +0200 + +nvidia-graphics-drivers-173 (173.14.09-0ubuntu4) intrepid; urgency=low + + * Remove reference to the init file from -dev.postinst + * Don't copy kernel.o.x86_64 to nvidia-kernel-source manually + + -- Alberto Milone (tseliot) Thu, 10 Jul 2008 10:41:00 +0200 + +nvidia-graphics-drivers-173 (173.14.09-0ubuntu3) intrepid; urgency=low + + * Recommends nvidia-settings instead of Suggests nvidia-settings + * Put the icon for nvidia-settings in /usr/share/pixmaps + + -- Alberto Milone (tseliot) Tue, 08 Jul 2008 18:49:59 +0200 + +nvidia-graphics-drivers-173 (173.14.09-0ubuntu2) intrepid; urgency=low + + * Remove init file and make static links for TLS + * Add build-dep on xserver-xorg-dev and don't hardcode the Server ABI so + as to make future backports easier + * Thanks to Timo Aaltonen for the tips + * Remove devscripts and kernel-package from Recommends + * Thanks to Mario Limonciello and Martin Pitt + + -- Alberto Milone (tseliot) Tue, 08 Jul 2008 16:36:07 +0200 + +nvidia-graphics-drivers-173 (173.14.09-0ubuntu1) intrepid; urgency=low + + * New packaging for Ubuntu. + * Merge with Debian + * Thanks to Timo Aaltonen for the merge + * Add support for DKMS + * Add driver 173.14.09: + * Fixed aliased font rendering corruption on X.Org server 1.5. + * Fixed a display corruption problem driving two dual-link DFPs with + Quadro FX + 1700 GPUs. + * Fixed a regression that prevented the X driver from starting on some + GeForce + FX, 6 and 7 mobile GPUs. + * Fixed a locale-interaction issue in the nvidia-settings X server + configuration file parser. + * Added preliminary support for Linux 2.6.26. + + -- Alberto Milone (tseliot) Tue, 08 Jul 2008 12:26:04 +0200 + +nvidia-graphics-drivers (173.14.05-0ubuntu3) intrepid; urgency=low + + * Add CLEAN line in dkms.conf.in because of likely bug in DKMS + + -- Alberto Milone (tseliot) Fri, 13 Jun 2008 17:44:59 +0200 + +nvidia-graphics-drivers (173.14.05-0ubuntu2) intrepid; urgency=low + + * Add epoch to dependency of nvidia-glx-dev + * Remove double semicolon from nvidia-glx.prerm + * Remove debhelper and dpatch from the dependecies of nvidia-kernel-source + + -- Alberto Milone (tseliot) Fri, 13 Jun 2008 13:21:27 +0200 + +nvidia-graphics-drivers (173.14.05-0ubuntu1) intrepid; urgency=low + + * New packaging for Ubuntu. + * Merge with Debian, remaining changes: + * Add support for DKMS + * Add driver 173.14.05: + * Added support for the following new GPUs: + o Quadro FX 3600M + o GeForce 9800 GX2 + o GeForce 9800 GTX + o GeForce 9600 GT + o GeForce 9600 GSO + o GeForce 9500M GS + o GeForce 8400 + o GeForce 8400 GS + * Added support for Quadro FX 5600/4600 SDI and Quadro G-Sync II. + * Resolved a bug causing left and right eyes to be reversed in stereo mode on some Quadro FX GPUs. + * Fixed a problem that caused OpenGL to stop rendering to windows with origins at or beyond 4096 pixels (horizontally) on GeForce 8 and 9 GPUs. + * Fixed a bug causing some Quadro FX 4500 SDI configurations to take a long time to achieve synchronization. + * Added preliminary support for X.Org server 1.5. + * Addressed a problem causing visual corruption when using GeForce 8 GPUs to drive Chi Mei 56" displays. + * Addressed visual corruption when driving Cintiq 20WSX wide format tables with some GeForce 6 and 7 GPUs. + * Fixed OpenGL rendering corruption with textures compressed using the DXT5 compression algorithm. + * Fixed a regression that caused invalid EDIDs to be detected for the internal display device on some notebooks. + * Improved hotkey switching and power management support on some GeForce 8 notebooks. + * Fixed a regression causing some GeForce 6100/6150 systems to fail to restore the screen after DPMS cycles. + * Fixed a bug that prevented the console from being restored correctly in SLI mode on GeForce 6 and 7 GPUs. + * Fixed interlaced modes on GeForce 8 GPUs. + * Fixed a problem that caused the synchronization signal polarity to always be positive for DVI devices on GeForce 8 and 9 GPUs. + * Resolved a problem resulting in X startup to fail on some GeForce 8 and 9 systems without swap space. + * Fixed a bug resulting in X crashes when using GeForce 8 and 9 GPUs in SLI to drive X screens at depth 8. + * Fixed a problem that caused TV output on secondary TVs to be black and white on some GPUs. + * Restored compatibility with recent Linux 2.6 kernels. + + -- Alberto Milone (tseliot) Fri, 13 Jun 2008 10:55:38 +0200 + +nvidia-graphics-drivers (169.12-4) unstable; urgency=low + + * Fix permissions on kernel patches directory (closes: #483074) + + -- Randall Donald Tue, 27 May 2008 20:24:29 -0700 + +nvidia-graphics-drivers (169.12-3) unstable; urgency=low + + * Make sure wfb diversion is removed. (closes: #482995) + + -- Randall Donald Mon, 26 May 2008 09:27:40 -0700 + +nvidia-graphics-drivers (169.12-2) unstable; urgency=low + + * Add initial linux-modules-nonfree-2.6 intergration, 2.6.24 only + * create storage directories for old patches and don't include in binary + packages. + * Remove wfb diversion and don't install nvidia's copy. + * Patch for 2.6.25 support + * Patch to compile on xen enabled kernels (closes: #476504, #481485) + + -- Randall Donald Sat, 24 May 2008 19:57:18 -0700 + +nvidia-graphics-drivers (169.12-1) unstable; urgency=low + + * fix shlib dep + * New upstream. + * remove xserver-xorg-core dependency. + * add cuda files (closes: #463776) + * add bzip2 to build-depends. (closes: #466139) + * add uploaders field that went missing: (closes: #454999, #472448) + + -- Randall Donald Sat, 05 Apr 2008 17:59:56 -0700 + +nvidia-graphics-drivers (169.09-1) unstable; urgency=low + + * New upstream. (with fan fix!) + + -- Randall Donald Sat, 02 Feb 2008 15:21:28 -0800 + +nvidia-graphics-drivers (169.07-2) unstable; urgency=low + + * Fix permissions on patches.old (closes: #459848, #460173) + * fix root_cmd (closes: #459833) + + -- Randall Donald Sat, 12 Jan 2008 17:10:40 -0800 + +nvidia-graphics-drivers (169.07-1) unstable; urgency=low + + * New upstream. + * Remove ROOT_CMD from debian.binary/rules (closes: 416594) + * always include x86_64 nv-kernel.o and detect which to use at kernel-source + build time. (closes: #458295, #437128) + * move patches dir out of the way. + * rename tarball to nvidia-kernel.tar.bz2 for upcoming module packaging. + + -- Randall Donald Mon, 07 Jan 2008 12:15:15 -0800 + +nvidia-graphics-drivers (100.14.19-1) unstable; urgency=low + + * new upstream. + * Xorg 7.3 compatible (closes: #420177 ) + * divert libwfb.so and libGLcore.so (closes: #442846, #441400) + * change maintainer to packaging team. + * change x11-common depends to 1:7.3+2 + * change provides to xserver-xorg-video-2 + * remove use of update-modules (closes: #435650) + + -- Randall Donald Sat, 22 Sep 2007 17:16:06 -0700 + +nvidia-graphics-drivers (100.14.11-1) unstable; urgency=low + + * New upstream. (closes: #430841) + * add more GPUs to supported list + * Disable Xen patch until it compiles again. + + -- Randall Donald Mon, 02 Jul 2007 17:41:57 -0700 + +nvidia-graphics-drivers (100.14.09-1) unstable; urgency=low + + * The "use the released version and not the beta drivers" release. + * Remove root_cmd from module rules file. (closes: #416594) + + -- Randall Donald Tue, 19 Jun 2007 23:50:31 -0700 + +nvidia-graphics-drivers (100.14.06-1) unstable; urgency=low + + * New upstream. + + -- Randall Donald Sat, 16 Jun 2007 20:12:55 -0700 + +nvidia-graphics-drivers (1.0.9755-1) unstable; urgency=low + + * new upstream uploaded to unstable (closes: #415041) + * change description to refer only to xorg. (closes: #404599, #402223) + * fix Description regarding supported cards. (closes: #416946) + * Add Vcs header + * Add Xen support (thanks to Marco Nenciarini) (closes: #367326) + + -- Randall Donald Sun, 22 Apr 2007 20:26:57 -0700 + +nvidia-graphics-drivers (1.0.9746-2) experimental; urgency=low + + * include libnvidia-wfb.so. for 8800 peeps. + + -- Randall Donald Sat, 30 Dec 2006 17:00:50 -0800 + +nvidia-graphics-drivers (1.0.9746-1) experimental; urgency=low + + * new upstream with 8800 support. + + -- Randall Donald Tue, 26 Dec 2006 15:56:06 -0800 + +nvidia-graphics-drivers (1.0.9631-1) experimental; urgency=low + + * New Upstream. + * Uploaded to experimental while 8776 is being settled for etch. + + -- Randall Donald Thu, 7 Dec 2006 19:38:58 -0800 + +nvidia-graphics-drivers (1.0.9629-2) unstable; urgency=low + + * remove libGL.so created by init script. (closes: #400129) + + -- Randall Donald Sat, 2 Dec 2006 13:28:04 -0800 + +nvidia-graphics-drivers (1.0.9629-1) unstable; urgency=low + + * New Upstream (closes: #397505) + * Check for compiler existance (closes: #319544) + + -- Randall Donald Sat, 11 Nov 2006 13:35:39 -0800 + +nvidia-graphics-drivers (1.0.8776-1) unstable; urgency=medium + + * New upstream. + * Includes upstream hotfix for Rapid7 Advisory R7-0025 Buffer Overflow + (closes: #393573) + * urgency=medium for RC bug fix + + -- Randall Donald Thu, 19 Oct 2006 18:26:24 -0700 + +nvidia-graphics-drivers (1.0.8774-7) unstable; urgency=low + + * add diversion of libGL.so to nvidia-glx-ia32 (closes: #393056) + + -- Randall Donald Sat, 14 Oct 2006 13:36:34 -0700 + +nvidia-graphics-drivers (1.0.8774-6) unstable; urgency=low + + * make init script create libGL.so for nvidia-glx-dev as well + as providing the file will get diverted. Also remove the extra + nvidia-glx-dev removal diversions not needed anymore. (closes: #392639) + + -- Randall Donald Fri, 13 Oct 2006 10:42:25 -0700 + +nvidia-graphics-drivers (1.0.8774-5) unstable; urgency=high + + * make sure nvidia-glx-dev diversions are removed and conflict with older + versions of -dev + * urgency=high for fixing broken upgrade path. + + -- Randall Donald Wed, 11 Oct 2006 11:21:39 -0700 + +nvidia-graphics-drivers (1.0.8774-4) unstable; urgency=high + + * The problem in #208198 no longer exists but another one has arisen due + to unwanted linking against NVIDIA's libGL.so.1. Solution: Have nvidia-glx + divert libGL.so and have the init script test for the existence of the + diverted libGL.so.xlibmesa file and then create a /usr/lib/libGL.so symlink + to libGL.so.1.2.xlibmesa. Slightly evil but doesn't leave any dangling + symlinks after the init script is called. (closes: #208198) + * High-urgency upload for RC bugfix. + * run a version-change to update files in subversion, especially control + (closes: #391795) + * Clean up X11R6 diversions. (closes: #380433) + + -- Randall Donald Mon, 9 Oct 2006 16:18:26 -0700 + +nvidia-graphics-drivers (1.0.8774-3) unstable; urgency=low + + * make nvidia-glx provide xserver-xorg-video-1.0 for xorg 7.1 + (closes: #385114) + * upload xorg 7.1 version to unstable + + -- Randall Donald Thu, 21 Sep 2006 10:44:17 -0700 + +nvidia-graphics-drivers (1.0.8774-2) experimental; urgency=low + + * make nvidia-glx provide xserver-xorg-video-1.0 for xord 7.1 + (closes: #385114) + + -- Randall Donald Mon, 28 Aug 2006 20:54:34 -0700 + +nvidia-graphics-drivers (1.0.8774-1) unstable; urgency=low + + * New upstream. (closes: #384608) + * uncomment dh_installmodules in module's rules file. + * Some important bugs will be fixed with -2 + + -- Randall Donald Mon, 28 Aug 2006 20:27:45 -0700 + +nvidia-graphics-drivers (1.0.8762-2) unstable; urgency=low + + * Have nvidia-glx-dev conflict with mesa-common-dev + + -- Randall Donald Fri, 2 Jun 2006 20:44:38 -0700 + +nvidia-graphics-drivers (1.0.8762-1) unstable; urgency=low + + * New upstream. + * take out dh_strip temporarily while the current strip fails on the + nvidia libs. + + -- Randall Donald Mon, 22 May 2006 15:26:58 -0700 + +nvidia-graphics-drivers (1.0.8756-4) unstable; urgency=low + + * Include a good nvidia-kernel-source.tar.gz + + -- Randall Donald Tue, 11 Apr 2006 22:48:33 -0700 + +nvidia-graphics-drivers (1.0.8756-3) unstable; urgency=low + + * Adjust for Xorg7.0 support. Thanks to Rasmus Bog Hansen + + -- Randall Donald Tue, 11 Apr 2006 10:08:13 -0700 + +nvidia-graphics-drivers (1.0.8756-2) unstable; urgency=low + + * nvidia-glx-dev: Add the missing Provides: libgl-dev (closes: #361589) + + -- Randall Donald Sun, 9 Apr 2006 09:54:21 -0700 + +nvidia-graphics-drivers (1.0.8756-1) unstable; urgency=low + + * New upstream (closes: #361352) + * Please don't file wishlist bugs after only a few hours. + * nvdia-glx-dev: put headers under /usr/include and conflict + with other libgl-dev + * nvidia-glx-dev: stricter depends on nvidia-glx (closes: #335539) + * nvidia-glx: include libnvidia-cfg (closes: #356800) + * lower debhelper level back to sarge ver. 4 level (closes: #356775) + + -- Randall Donald Fri, 7 Apr 2006 18:55:06 -0700 + +nvidia-graphics-drivers (1.0.8178-3) unstable; urgency=low + + * upload fix for 2.6.16 (closes: #357992, #346355) + + -- Randall Donald Tue, 28 Mar 2006 19:48:59 -0800 + +nvidia-graphics-drivers (1.0.8178-2.1) unstable; urgency=low + + * add new upstream patch NVIDIA_kernel-1.0-8178-U012206.diff.txt, + closes #357992 + + -- Harald Dunkel Fri, 24 Mar 2006 06:51:49 +0100 + +nvidia-graphics-drivers (1.0.8178-2) unstable; urgency=low + + * very belated change of kernel-image to linux-image in Recommends. + + -- Randall Donald Mon, 13 Feb 2006 20:26:15 -0800 + +nvidia-graphics-drivers (1.0.8178-1) unstable; urgency=low + + * Upload to archive. + + -- Randall Donald Tue, 27 Dec 2005 13:46:44 -0800 + +nvidia-graphics-drivers (1.0.8178-0.1) unstable; urgency=low + + * patch scheme added + * applied NVidia's patch NVIDIA_kernel-1.0-8178-U122205 + + -- Harald Dunkel Tue, 27 Dec 2005 15:23:41 +0100 + +nvidia-graphics-drivers (1.0.8178-0) unstable; urgency=low + + * new upstream + + -- Harald Dunkel Sat, 24 Dec 2005 09:27:56 +0100 + +nvidia-graphics-drivers (1.0.8174-1) unstable; urgency=low + + * The "Radiohead" Release ;) + * New upstream. + * Upload to unstable. + * Thanks to Harald Dunkel for initial build. + * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR, + Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, + Quadro2Pro, DO NOT INSTALL THIS RELEASE!!! They are not supported. + * update NEWS files again. + * add Xorg 6.8 to the descriptions to cut down on confusion. + * add reference to linux- kernel packages in README.Debian + * nvidia-xconfig will be in a separate package. + + -- Randall Donald Sat, 10 Dec 2005 18:33:37 -0800 + +nvidia-graphics-drivers (1.0.8174-0) unstable; urgency=low + + * new upstream + + -- Harald Dunkel Wed, 7 Dec 2005 19:40:50 +0100 + +nvidia-graphics-drivers (1.0.7676-2) experimental; urgency=low + + * add exit 0 to module postrm (closes: #252018) + * add more documentation to /etc/default/nvidia-glx (closes: #280237) + * reorganize nvidia-glx init script + * remove xserver provides (man this was an old addition) (closes: #329320) + * fix nvidia-glx-dev missing links (closes: #336778) + * now that sarge is stable upgrade DH_COMPAT to 5 (closes: #336734) + * Supply diversion for libglx.so to work with newer xorg. + + -- Randall Donald Wed, 23 Nov 2005 01:20:12 +0000 + +nvidia-graphics-drivers (1.0.7676-1) experimental; urgency=low + + * New Upstream. (includes fix for GeForce FX 7880) + + -- Randall Donald Mon, 29 Aug 2005 15:48:27 -0700 + +nvidia-graphics-drivers (1.0.7676-0) experimental; urgency=low + + * new upstream + + -- Harald Dunkel Mon, 15 Aug 2005 21:53:07 +0200 + +nvidia-graphics-drivers (1.0.7667-3) experimental; urgency=low + + * back out libGL.so mess until it upgrades properly. + * move back to experimental while work is being done on the above. + + -- Randall Donald Mon, 18 Jul 2005 13:08:11 -0700 + +nvidia-graphics-drivers (1.0.7667-2) unstable; urgency=low + + * fix dangling libGL.so issue. nvidia-glx by itself will now + link to the diverted xlibmesa library (closes: #208198, #306533, #272438) + * Move nvidia-kernel-source to Suggests in nvidia-glx (closes: #295891) + * Modify description to make note of GPUs NOT supported + * update module README.Debian to refer to nvnews.net forum. + (closes: #299916) + * Update nvidia-kernel-source README.Debian to mention module-assistant + and remove mention of patches that are unnecessary and other old + references. + * change upstream_info to not use bashisms. (closes: #304322) + * Update to policy 3.6.2 + * Move GL headers to /usr/share/nvidia/includes/GL. (closes: #268274) + * Remove unnecessary dependancy on libglu + * Add NEWS item about using legacy packages. + * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR, + Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2Pro, + DO NOT INSTALL THIS RELEASE!!! Use the nvidia-glx-legacy and + nvidia-kernel-source-legacy packages instead. + + -- Randall Donald Wed, 13 Jul 2005 14:23:26 -0700 + +nvidia-graphics-drivers (1.0.7667-1) experimental; urgency=low + + * New upstream (closes: #315446) + * Thanks again to Harald Dunkel for patch and amd64 testing. + + -- Randall Donald Fri, 24 Jun 2005 22:51:46 -0700 + +nvidia-graphics-drivers (1.0.7664-2) experimental; urgency=low + + * downgrade the libc6 change back to the version in unstable. + (closes: #315313) + + -- Randall Donald Tue, 21 Jun 2005 14:07:42 -0700 + +nvidia-graphics-drivers (1.0.7664-1) experimental; urgency=low + + * The "Commander Cool Drew Hess" release. + * New upstream. (Thanks to Harald Dunkel for initial work) + * uploaded to experimental due to needing GLIBC_2.3.3 + and legacy support for some GPU's has been removed. + * Add news item about legacy support. + * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR, + Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2Pro, + DO NOT INSTALL THIS RELEASE!!! NVIDIA will be supporting these cards in a + special legacy driver (as yet unreleased and not included in this package). + So if you have the one of the above listed GPUs, + remain with the 1.0.7174-3 release. + + -- Randall Donald Sat, 18 Jun 2005 16:46:48 -0700 + +nvidia-graphics-drivers (1.0.7664-0) unstable; urgency=low + + * New upstream. + + -- Harald Dunkel Sat, 11 Jun 2005 22:42:26 +0200 + +nvidia-graphics-drivers (1.0.7174-3) unstable; urgency=low + + * reinclude nvidia docs + + -- Randall Donald Thu, 7 Apr 2005 02:39:50 -0700 + +nvidia-graphics-drivers (1.0.7174-2) unstable; urgency=low + + * use -pkg2 (renamed to pkg0) for lib32 files in nvidia-glx-ia32 package + (closes: #257375) + + -- Randall Donald Tue, 5 Apr 2005 15:10:03 -0700 + +nvidia-graphics-drivers (1.0.7174-1) unstable; urgency=low + + * New upstream. + * add nvidia-glx-ia32 package for amd64 (closes: #257375) + + -- Randall Donald Fri, 1 Apr 2005 14:54:17 -0800 + +nvidia-graphics-drivers (1.0.7167-1) unstable; urgency=low + + * New upstream. (closes: #299073) + * Disable patching for new version. + + -- Randall Donald Fri, 11 Mar 2005 13:46:57 -0800 + +nvidia-graphics-drivers (1.0.6629+1-2) unstable; urgency=high + + * Add patches for new (> 2.6.10-rc3-bk13) kernels from + minion.de. Thanks to Drew Hess + (closes: #280224, #281640, #287226) + * updated minion patches from 16 Feb 2005 + * urgency high to get back in to sarge asap. + + -- Randall Donald Fri, 18 Feb 2005 15:31:00 -0800 + +nvidia-graphics-drivers (1.0.6629+1-1) unstable; urgency=low + + * change version to allow for new .orig + + -- Randall Donald Fri, 12 Nov 2004 11:06:00 -0800 + +nvidia-graphics-drivers (1.0.6629-2) unstable; urgency=low + + * Add amd64 support based on work from + Markus Benning and + Harald Dunkel + Thanks guys. + + -- Randall Donald Tue, 9 Nov 2004 23:13:49 -0800 + +nvidia-graphics-drivers (1.0.6629-1) unstable; urgency=low + + * New upstream. + * Undo 2.6.9 patching. + + -- Randall Donald Sat, 6 Nov 2004 23:21:06 -0800 + +nvidia-graphics-drivers (1.0.6111-2) unstable; urgency=low + + * Provide patches for kernels 2.6.9 and 2.6.10 + + -- Randall Donald Mon, 25 Oct 2004 16:40:05 -0700 + +nvidia-graphics-drivers (1.0.6111-1) unstable; urgency=low + + * New upstream. + * add executable check for update-devfsd. + + -- Randall Donald Thu, 5 Aug 2004 11:43:28 -0700 + +nvidia-graphics-drivers (1.0.6106-4) unstable; urgency=low + + * Use init script patch by Arthur de Jong + (closes: #243308, #261165) + * Add read-only check to init script. (closes: #262176) + + -- Randall Donald Sat, 31 Jul 2004 14:40:59 -0700 + +nvidia-graphics-drivers (1.0.6106-3) unstable; urgency=low + + * Remove libglx.so.version symlink cleaning now that it is an actual file + again. + + -- Randall Donald Wed, 30 Jun 2004 22:00:09 -0700 + +nvidia-graphics-drivers (1.0.6106-2) unstable; urgency=low + + * Remove package nvidia-settings so I can use the GPL source in a separate + source package in contrib. + * Fix nvidia-glx-dev depends on nvidia-glx version. + + -- Randall Donald Wed, 30 Jun 2004 17:48:06 -0700 + +nvidia-graphics-drivers (1.0.6106-1) unstable; urgency=low + + * New upstream. + fixed GL library symbols (closes: #242525) + * new nvidia-settings package. + * remolded TLS handling for new libnvidia-tls.so + * sysfs support now builtin, both dpatches disabled. + + -- Randall Donald Wed, 30 Jun 2004 11:35:08 -0700 + +nvidia-graphics-drivers (1.0.5336-12) unstable; urgency=low + + * Include newer sysfs patch by Martin Schlemmer which + should now create udev nodes. + (closes: #248451) + + -- Randall Donald Tue, 29 Jun 2004 23:46:22 -0700 + +nvidia-graphics-drivers (1.0.5336-11) unstable; urgency=low + + * Correct nvidia-glx.shlibs. (closes: #249194) + * New init script from Arthur de Jong . + (closes: #243308, #252569) + + -- Randall Donald Tue, 8 Jun 2004 19:04:42 -0700 + +nvidia-graphics-drivers (1.0.5336-10) unstable; urgency=low + + * remove immediate exit in nvida-glx init.d so tls detection doesn't exit. + (closes: #247188) + + -- Randall Donald Sat, 8 May 2004 13:44:21 -0700 + +nvidia-graphics-drivers (1.0.5336-9) unstable; urgency=low + + * use corrected 02_pcialias patch from Juergen Kreileder + + -- Randall Donald Fri, 30 Apr 2004 19:38:57 -0700 + +nvidia-graphics-drivers (1.0.5336-8) unstable; urgency=low + + * Allow for presence of 01_sysfs fuzz in 02_pcialias. (closes: #246773) + * Document in n-k-s.README.Debian about IGNORE_PCI_CLASS_DISPLAY + (closes: #246775) + + -- Randall Donald Fri, 30 Apr 2004 18:52:47 -0700 + +nvidia-graphics-drivers (1.0.5336-7) unstable; urgency=low + + * also detect uppercase "GCC" in compiler detection. (closes: #243988) + * version dpatch at >= 2.0.0. (closes: #242465) + * patch for hotplugging. Thanks to Juergen Kreileder + (closes: #239992) + * move libtool files to nvidia-glx-dev. (closes: #229110) + * apply patch from Joachim Breitner for init script. + (closes: #243308) + * change shlibs to xlibmesa-gl | libgl1 + + -- Randall Donald Sat, 17 Apr 2004 16:40:26 -0700 + +nvidia-graphics-drivers (1.0.5336-6) unstable; urgency=low + + * Introduce a boot init script for TLS detection. With this we can get rid + of the debconf prompting. (closes: #234612, #231397, #234323) + * Provide patch for sysfs. (closes: #236714, #234150) + * depend on dpatch for above patch. + * fix typo in clean target for SYSSRC. (closes: #237793) + * modify debian.binary/rules for patching and Makefile existance. + + -- Randall Donald Fri, 19 Mar 2004 14:39:56 -0800 + +nvidia-graphics-drivers (1.0.5336-5) unstable; urgency=low + + * add SYSRC to clean target. (closes: #232313) + * Make GL depends more X 4.3 friendly. (closes: #188189) + * pass KPKG_EXTRAV_ARG in for proper 2.6 EXTRAVERSIONing + * version kernel-package at >=8.082. + * add root_cmd. (closes: #162323) + + -- Randall Donald Sat, 21 Feb 2004 15:04:42 -0800 + +nvidia-graphics-drivers (1.0.5336-4) unstable; urgency=low + + * Add glext.h to nvidia-glx-dev. (closes: #231169) + * Add Makefile to clean target in nvidia-kernel-source rules file. + + -- Randall Donald Wed, 4 Feb 2004 16:03:42 -0800 + +nvidia-graphics-drivers (1.0.5336-3) unstable; urgency=low + + * Depend on libc6-dev for KBUILD building. (closes: #230307) + + -- Randall Donald Sat, 31 Jan 2004 14:26:02 -0800 + +nvidia-graphics-drivers (1.0.5336-2) unstable; urgency=low + + * Bypass NVIDIA's select_makefile (closes: #230307) + * Remove patch from nvidia-kernel-source Depends and add sed. + * Remove dangling libglx.so.VERSION symlink. + + -- Randall Donald Fri, 30 Jan 2004 14:54:32 -0800 + +nvidia-graphics-drivers (1.0.5336-1) unstable; urgency=low + + * New upstream. + * generate nvidia-kernel changelog from nvidia-graphics-drivers at build. + * change nvidia-kernel-source arch to i386. (closes: #229060) + * remove 2.6 patch as it is now provided upstream. + * create a makefile selector and change the patchlevel detection to be based + on KERNEL_VERSION_CODE. + * switch back to Makefile.kbuild for 2.6.x. + * remove no longer needed apm patch. (closes: #228487) + * reflect 2.6 changes in nvidia-kernel-source.README.Debian. + + -- Randall Donald Tue, 27 Jan 2004 00:01:32 -0800 + +nvidia-graphics-drivers (1.0.5328-4) unstable; urgency=low + + * Provide fixed .la files. (closes: #228677) + + -- Randall Donald Mon, 19 Jan 2004 23:05:20 -0800 + +nvidia-graphics-drivers (1.0.5328-3) unstable; urgency=low + + * Remove bad/broken LibGL.la files for now. (closes: #228499) + + -- Randall Donald Mon, 19 Jan 2004 14:56:14 -0800 + +nvidia-graphics-drivers (1.0.5328-2) unstable; urgency=low + + * Fix typo in nvidia-glx.README.Debian + + -- Randall Donald Fri, 16 Jan 2004 23:53:35 -0800 + +nvidia-graphics-drivers (1.0.5328-1) unstable; urgency=low + + * New upstream. (closes #227066) + * Apply 2.6 patch in nvidia-kernel building with env override. + Manual patching no longer required!!! (closes: #193379) + * Change text of TLS question to a positive tone. (closes: #221963) + * Quote $(CC) for a multi word compiler e.g. distcc (closes: #222390) + * Change reportbug script to use (lspci --version) instead of which. + * Add tls/libGL.so to nvidia-glx (so one can switch with only one step) + * Make note about reconfiguring for TLS switching. + * fix gcc detection again for kernel compiler. (closes: #227412) + * fix typo in nvidia-kernel-source.README.Debian (closes: #226991) + + -- Randall Donald Mon, 22 Dec 2003 01:21:58 -0800 + +nvidia-graphics-drivers (1.0.4496-10) unstable; urgency=low + + * TLS problems related to installation of TLS libs on 2.4 systems. + Solution: provide a debconf note and set a default based on runtime + detection of a TLS/2.6 system. Hopefully this will solve most of the + tls bugs. + * Add note about nvidia-kernel-source in nvidia-glx description. + (closes: #220038) + + -- Randall Donald Wed, 19 Nov 2003 13:17:50 -0800 + +nvidia-graphics-drivers (1.0.4496-9) unstable; urgency=low + + * Change nvidia-kernel-source.README.Debian.in to reflect 2.6 makefile + change. (closes: #219003) + * Note the difference in KSRC for 2.6 headers (closes: #220452) + + -- Randall Donald Mon, 17 Nov 2003 20:47:20 -0800 + +nvidia-graphics-drivers (1.0.4496-8) unstable; urgency=low + + * Correctly install tls libglx. + + -- Randall Donald Sat, 1 Nov 2003 12:46:04 -0800 + +nvidia-graphics-drivers (1.0.4496-7) unstable; urgency=low + + * add tls files. (closes: #218408, #218417, #218434, #218487) + + -- Randall Donald Fri, 31 Oct 2003 21:01:18 -0800 + +nvidia-graphics-drivers (1.0.4496-6) unstable; urgency=low + + * use Makefile.nvidia instead of Makefile.kbuild so the 2.6 support + can use kernel-headers. Manual patching still required. + README.Debian changed to instruct this change. + (closes: #208535, #203369) + * remove wget build-dep from kernel module (closes: #212742) + * install kernel module to /lib/modules/KVERS/nvidia. (closes: #207290) + * re-fix GCC detection from compile.h (closes: #205871) + + -- Randall Donald Mon, 6 Oct 2003 21:41:13 -0700 + +nvidia-graphics-drivers (1.0.4496-5) unstable; urgency=low + + * Add symlink instruction to nvidia-kernel-source.README.Debian + * Fix patchlevel version detection. + + -- Randall Donald Tue, 23 Sep 2003 01:21:29 -0700 + +nvidia-graphics-drivers (1.0.4496-4) unstable; urgency=low + + * Add Provides: nvidia-kernel-src to nvidia-kernel-source (closes: #211713) + * Upload new diversions and 2.6 support to unstable packages. + * change == to = in kernel rules file. + + -- Randall Donald Mon, 22 Sep 2003 15:34:32 -0700 + +nvidia-graphics-drivers (1.0.4496-3) experimental; urgency=low + + * Fix nvidia-kernel-source.README.Debian about installing + nvidia-kernel-common first. + * Fix typo in nvidia-kernel-source.README.Debian regarding + modules/nvidia-kernel-1.0.4496 directory. (closes: #205684) + * Change diversions to stay within /usr/lib and /usr/X11R6/lib. + This allows for installs on systems of /usr split between several + partitions. (closes: #205955) + * Move nvidia-glx dependancy on nvidia-kernel-source to a recommends. + * Fix part of gcc 3.3.1 detection that I missed last time. (closes: #205871) + * Update nvidia-kernel-source.README.Debian to reflect 2.4.21-4-k7. + * Add preliminary 2.6 support. See README.Debian for details (closes: #203369, #193379) + * Include CONFIG_APM_MODULE patch file in nvidia-kernel-source. + * Upload to experimental due to diversion changes and preliminary 2.6 + support + * Incorporate the NMU by martin f. krafft + + -- Randall Donald Tue, 26 Aug 2003 14:42:57 -0700 + +nvidia-graphics-drivers (1.0.4496-2.1) unstable; urgency=low + + * debian.binary/rules used the -a flag to copy the control.template file + to debian-binary/control. If the former was a symlink, this would result + in the erasure of the template file as the destionation of the copy would + also be a symlink to the same file. Removed the -a, now it works just + fine. + Closes: Bug#206445, Bug#206449 + + -- martin f. krafft Tue, 26 Aug 2003 08:50:46 +0200 + +nvidia-graphics-drivers (1.0.4496-2) unstable; urgency=low + + * Add email from NVIDIA to copyright file. + + -- Randall Donald Thu, 31 Jul 2003 15:18:25 -0700 + +nvidia-graphics-drivers (1.0.4496-1) unstable; urgency=low + + * New upstream. + * include shlibs file. + * Re-split nvidia-glx-dev by request. + + -- Randall Donald Mon, 28 Jul 2003 14:18:45 -0700 + +nvidia-graphics-drivers (1.0.4363-1) unstable; urgency=low + + * Put nvidia drivers into one source package + * Move from contrib to non-free + * Rename nvidia-kernel-src to nvidia-kernel-source + * Include driver files in nvidia-glx and nvidia-kernel-source instead of + downloading. + * Put nvidia-glx-dev files back into nvidia-glx. + * Separate out modules and devfs files into nvidia-kernel-common. + * Drop .deb in builder-specified location. Thanks David B Harris + (closes: #192112) + * Lose the version number in modules directory. (closes: #199509) + * Use automation of versioning based on patches by Marcello Magallon + . Thanks. (closes: #192312, #192311) + + -- Randall Donald Fri, 9 May 2003 14:51:15 -0700 + --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.links +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.links @@ -0,0 +1,28 @@ +/usr/lib/nvidia-173/libGL.so.173.14.30 /usr/lib/nvidia-173/libGL.so.1 +/usr/lib/nvidia-173/libGL.so.1 /usr/lib/nvidia-173/libGL.so +/usr/lib/nvidia-173/libGLcore.so.173.14.30 /usr/lib/nvidia-173/libGLcore.so.1 + +/usr/lib/nvidia-173/libnvidia-cfg.so.173.14.30 /usr/lib/nvidia-173/libnvidia-cfg.so.1 +/usr/lib/nvidia-173/libnvidia-cfg.so.1 /usr/lib/nvidia-173/libnvidia-cfg.so + +/usr/lib/nvidia-173/xorg/libglx.so.173.14.30 /usr/lib/nvidia-173/xorg/libglx.so + +/usr/lib/nvidia-173/libXvMCNVIDIA.so.173.14.30 /usr/lib/nvidia-173/libXvMCNVIDIA.so +/usr/lib/nvidia-173/libXvMCNVIDIA.so.173.14.30 /usr/lib/nvidia-173/libXvMCNVIDIA.so.1 +/usr/lib/nvidia-173/libXvMCNVIDIA.so.173.14.30 /usr/lib/nvidia-173/libXvMCNVIDIA_dynamic.so.1 + +/usr/lib/nvidia-173/libnvidia-tls.so.173.14.30 /usr/lib/nvidia-173/libnvidia-tls.so.1 +/usr/lib32/nvidia-173/libGL.so.173.14.30 /usr/lib32/nvidia-173/libGL.so.1 +/usr/lib32/nvidia-173/libGL.so.1 /usr/lib32/nvidia-173/libGL.so +/usr/lib32/nvidia-173/libGLcore.so.173.14.30 /usr/lib32/nvidia-173/libGLcore.so.1 + +/usr/lib32/nvidia-173/libnvidia-cfg.so.173.14.30 /usr/lib32/nvidia-173/libnvidia-cfg.so.1 +/usr/lib32/nvidia-173/libnvidia-cfg.so.1 /usr/lib32/nvidia-173/libnvidia-cfg.so + +/usr/lib/nvidia-173/xorg/libglx.so.173.14.30 /usr/lib/nvidia-173/xorg/libglx.so + +/usr/lib32/nvidia-173/libXvMCNVIDIA.so.173.14.30 /usr/lib32/nvidia-173/libXvMCNVIDIA.so +/usr/lib32/nvidia-173/libXvMCNVIDIA.so.173.14.30 /usr/lib32/nvidia-173/libXvMCNVIDIA.so.1 +/usr/lib32/nvidia-173/libXvMCNVIDIA.so.173.14.30 /usr/lib32/nvidia-173/libXvMCNVIDIA_dynamic.so.1 + +/usr/lib32/nvidia-173/libnvidia-tls.so.173.14.30 /usr/lib32/nvidia-173/libnvidia-tls.so.1 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.dirs +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.dirs @@ -0,0 +1,22 @@ +/etc/modprobe.d +/usr/lib/nvidia-173 +/etc/xdg/autostart +/usr/bin +/usr/lib/nvidia-173/tls +/usr/include/GL +/usr/lib/nvidia-173/bin +/usr/lib/nvidia-173 +/usr/lib32/nvidia-173 +/usr/lib/xorg/modules/drivers +/usr/lib/xorg/modules/extensions +/usr/share/nvidia-173 +/usr/share/nvidia-173 +/usr/share/man/man1 +/usr/share/pixmaps +/usr/share/lintian/overrides +/usr/share/grub-gfxpayload-lists/blacklist +/usr/lib/nvidia-173/xorg +/usr/lib/nvidia-173/xorg +/usr/src/nvidia-173-173.14.30 +/usr/src/nvidia-173-173.14.30/patches +/lib/nvidia-173 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173-dev.install +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173-dev.install @@ -0,0 +1,3 @@ +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/X11R6/lib/libXvMCNVIDIA.a /usr/lib/nvidia-173 + +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/include/* /usr/include/nvidia-173 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.postrm.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.postrm.in @@ -0,0 +1,42 @@ +#! /bin/sh +# postrm script for #DRIVERNAME# +# +# see: dh_installdeb(1) +# +# Copyright (C) 2009-2010 Canonical Ltd +# Authors: Alberto Milone + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/share/doc/packaging-manual/ + +case "$1" in + remove|purge) + + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + ;; + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.override +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.override @@ -0,0 +1,86 @@ +nvidia-173: library-not-linked-against-libc ./usr/lib/libGL.so.173.14.30 + +nvidia-173: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.173.14.30 + +nvidia-173: library-not-linked-against-libc ./usr/lib/xorg/modules/extensions/libglx.so.173.14.30 + +nvidia-173: shlib-with-non-pic-code usr/lib/libGL.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib/libGLcore.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib/libXvMCNVIDIA.so.173.14.30 + +nvidia-173: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.173.14.30 usr/lib/libGL.so +nvidia-173: non-dev-pkg-with-shlib-symlink usr/lib/xorg/modules/extensions/libglx.so.173.14.30 usr/lib/xorg/modules/extensions/libglx.so + + +nvidia-173: script-not-executable usr/src/nvidia-173-173.14.30/conftest.sh +nvidia-173: maintainer-script-ignores-errors prerm +nvidia-173: shlib-with-non-pic-code usr/lib/nvidia-173/libGL.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/nvidia-173/libGL.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib/nvidia-173/libGLcore.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/nvidia-173/libGLcore.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib/nvidia-173/libXvMCNVIDIA.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/nvidia-173/libXvMCNVIDIA.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib/nvidia-173/libnvidia-cfg.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/nvidia-173/libnvidia-cfg.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib/nvidia-173/libnvidia-tls.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/nvidia-173/libnvidia-tls.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/nvidia-173/libvdpau.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib/nvidia-173/tls/libnvidia-tls.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/nvidia-173/tls/libnvidia-tls.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib/nvidia-173/vdpau/libvdpau_nvidia.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/nvidia-173/vdpau/libvdpau_nvidia.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/nvidia-173/vdpau/libvdpau_trace.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib/nvidia-173/xorg/libglx.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/nvidia-173/xorg/libglx.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib/tls/libnvidia-tls.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/tls/libnvidia-tls.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib/vdpau/libvdpau_nvidia.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/vdpau/libvdpau_nvidia.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib/vdpau/libvdpau_trace.so.173.14.30 +nvidia-173: unused-shlib-entry-in-control-file libnvidia-tls 190 +nvidia-173: shlibs-declares-dependency-on-other-package libgl1-mesa | libgl1 +nvidia-173: prerm-calls-ldconfig +nvidia-173: copyright-without-copyright-notice +nvidia-173: desktop-command-not-in-package /usr/share/applications/nvidia-173/ubuntu-nvidia-settings.desktop /usr/bin/nvidia-settings +nvidia-173: shared-lib-without-dependency-information ./usr/lib/nvidia-173/libnvidia-tls.so.173.14.30 +nvidia-173: shared-lib-without-dependency-information ./usr/lib/nvidia-173/tls/libnvidia-tls.so.173.14.30 +nvidia-173: shared-lib-without-dependency-information ./usr/lib/tls/libnvidia-tls.so.173.14.30 +nvidia-173: unknown-section restricted/misc +nvidia-185-modaliases: copyright-without-copyright-notice +nvidia-185-modaliases: extended-description-line-too-long +nvidia-glx-185-dev: copyright-without-copyright-notice +nvidia-glx-185-dev: extended-description-line-too-long +nvidia-glx-185-dev: unknown-section restricted/misc +nvidia-185-kernel-source: copyright-without-copyright-notice +nvidia-185-kernel-source: unknown-section restricted/misc +nvidia-173-dev: shlib-with-non-pic-code usr/lib/nvidia-173/libXvMCNVIDIA.so.173.14.30 +nvidia-173-dev: shlib-without-PT_GNU_STACK-section usr/lib/nvidia-173/libXvMCNVIDIA.so.173.14.30 +nvidia-173-dev: postinst-has-useless-call-to-ldconfig +nvidia-173-dev: postrm-has-useless-call-to-ldconfig +nvidia-173-dev: copyright-without-copyright-notice +nvidia-173-dev: missing-dependency-on-libc needed by ./usr/lib/nvidia-173/libXvMCNVIDIA.so.173.14.30 +nvidia-173-dev: unknown-section restricted/misc +nvidia-glx-185: copyright-without-copyright-notice +nvidia-glx-185: unknown-section restricted/misc +nvidia-173-modaliases: copyright-without-copyright-notice + +nvidia-173: script-not-executable ./usr/src/nvidia-173-173.14.30/conftest.sh +nvidia-173: maintainer-script-ignores-errors prerm +nvidia-173: shlib-with-non-pic-code usr/lib32/nvidia-173/libGL.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib32/nvidia-173/libGLcore.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib32/nvidia-173/libXvMCNVIDIA.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib32/nvidia-173/libXvMCNVIDIA.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib32/nvidia-173/libnvidia-cfg.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib32/nvidia-173/libnvidia-tls.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib32/nvidia-173/libvdpau_nvidia.so.173.14.30 +nvidia-173: shlib-with-non-pic-code usr/lib32/nvidia-173/tls/libnvidia-tls.so.173.14.30 +nvidia-173: shlib-without-PT_GNU_STACK-section usr/lib32/nvidia-173/tls/libnvidia-tls.so.173.14.30 + +nvidia-173: shared-lib-without-dependency-information ./usr/lib/nvidia-173/libnvidia-tls.so.173.14.30 +nvidia-173: shared-lib-without-dependency-information ./usr/lib/nvidia-173/tls/libnvidia-tls.so.173.14.30 +nvidia-173: shared-lib-without-dependency-information ./usr/lib/tls/libnvidia-tls.so.173.14.30 +nvidia-173: shared-lib-without-dependency-information ./usr/lib32/nvidia-173/libnvidia-tls.so.173.14.30 +nvidia-173: shared-lib-without-dependency-information ./usr/lib32/nvidia-173/tls/libnvidia-tls.so.173.14.30 + + --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-autostart.desktop +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-autostart.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=NVIDIA X Server Settings +Comment=Configure NVIDIA X Server Settings +Exec=sh -c '/usr/bin/nvidia-settings --load-config-only' +Terminal=false +Icon=nvidia-173-settings +Categories=System;Settings; --- nvidia-graphics-drivers-173-173.14.30.orig/debian/compat +++ nvidia-graphics-drivers-173-173.14.30/debian/compat @@ -0,0 +1 @@ +5 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.preinst.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.preinst.in @@ -0,0 +1,190 @@ +#! /bin/sh +# preinst script for #DRIVERNAME# +# +# see: dh_installdeb(1) +# +# Copyright (C) 2009 Canonical Ltd +# Authors: Alberto Milone + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# +# For details see /usr/share/doc/packaging-manual/ + +if [ `dpkg --print-architecture` = "amd64" ]; then + HAS_LIB32="yes" +fi + +case "$1" in + install|upgrade) + + # We need to remove diversions from previous versions of the package + + # clean up from old diversions + if [ -d /usr/share/nvidia-glx/diversions ]; then + rm -f /usr/lib/libGL.so.1 + rm -f /usr/lib/libGL.so.1.2 + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1 /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1.2 /usr/lib/libGL.so.1.2 > /dev/null + + rm -f /usr/lib/xorg/modules/extensions/libGLcore.a + rm -f /usr/lib/xorg/modules/extensions/libglx.a + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGLcore.a /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libglx.a /usr/lib/xorg/modules/extensions/libglx.a > /dev/null + + rmdir /usr/share/nvidia-glx/diversions || true; + rmdir /usr/share/nvidia-glx || true; + fi + + if [ -d /usr/share/nvidia-glx/diversions-X11R6 ]; then + + rm -f /usr/X11R6/lib/libGL.so.1 + rm -f /usr/X11R6/lib/libGL.so.1.2 + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.so.1 /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.so.1.2 /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + rmdir /usr/share/nvidia-glx/diversions-X11R6 || true; + rmdir /usr/share/nvidia-glx || true; + fi + # remove X11R6 diversions + + if dpkg-divert --list /usr/X11R6/lib/libGL.so.1 | grep 'nvidia-glx' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + fi + + if dpkg-divert --list /usr/X11R6/lib/libGL.so.1.2 | grep 'nvidia-glx' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + fi + if dpkg-divert --list /usr/X11R6/lib/modules/extensions/libGLcore.a | grep 'nvidia-glx' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGLcore.a.xlibmesa /usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null + fi + if dpkg-divert --list /usr/X11R6/lib/modules/extensions/libglx.a | grep 'nvidia-glx' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libglx.a.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.a > /dev/null + fi + if dpkg-divert --list /usr/X11R6/lib/modules/extensions/libglx.so | grep 'nvidia-glx' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libglx.so.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.so > /dev/null + fi + + # make sure these diversions don't exist anymore + if dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-dev-envy --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true + fi + if dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-177-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-177-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true + fi + if dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-new-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-new-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-new-dev-envy --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true + fi + if dpkg-divert --list /usr/lib/libGL.a | grep 'nvidia-glx-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-dev-envy --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null || true + fi + if dpkg-divert --list /usr/lib/libGL.a | grep 'nvidia-glx-new-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-new-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-new-dev-envy --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null || true + fi + if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-dev-envy --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null || true + fi + if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-new-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-new-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-new-dev-envy --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null || true + fi + if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-dev-envy --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null || true + fi + if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-new-dev' > /dev/null ; then + dpkg-divert --remove --rename --package nvidia-glx-new-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null || true + dpkg-divert --remove --rename --package nvidia-glx-new-dev-envy --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null || true + fi + + + # Make sure that no diversion is still there + set -a "nvidia-glx" "nvidia-glx-new" "nvidia-glx-legacy" "nvidia-glx-envy"\ + "nvidia-glx-new-envy" "nvidia-glx-legacy-envy" "nvidia-glx-180" \ + "nvidia-glx-177" "nvidia-glx-173" "nvidia-glx-96" "nvidia-glx-71" \ + "nvidia-glx-185" "nvidia-glx-190" + + while [ $# -ge 1 ]; do + glxname=$1 + glxdevname="$glxname-dev" + + if [ -n "$HAS_LIB32" ]; then + #Remove diversions of /usr/lib32/libGL.so -- only for the new name schemes (nvidia-glx-VER) + if dpkg-divert --list $glxname | grep "/usr/lib32/libGL.so " > /dev/null ; then + rm -f /usr/lib32/libGL.so > /dev/null || true + dpkg-divert --remove --rename --package $glxname --divert /usr/lib32/nvidia/libGL.so.xlibmesa /usr/lib32/libGL.so > /dev/null || true + fi + + #Remove diversion of /usr/lib32/libGL.so.1 + if dpkg-divert --list $glxname | grep /usr/lib32/libGL.so.1 > /dev/null ; then + rm -f /usr/lib32/libGL.so.1 > /dev/null || true + dpkg-divert --remove --rename --package $glxname --divert /usr/lib32/nvidia/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null || true + fi + + #Remove diversion of /usr/lib32/libGL.so.1.2 + if dpkg-divert --list $glxname | grep /usr/lib32/libGL.so.1.2 > /dev/null ; then + rm -f /usr/lib32/libGL.so.1.2 > /dev/null || true + dpkg-divert --remove --rename --package $glxname --divert /usr/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null || true + fi + + fi + + + #Remove diversion of /usr/lib/xorg/modules/extensions/libGLcore.so + if dpkg-divert --list $glxname | grep /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null ; then + dpkg-divert --remove --rename --package $glxname --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null || true + fi + + #Remove diversion of /usr/lib/xorg/modules/extensions/libglx.so + if dpkg-divert --list $glxname | grep /usr/lib/xorg/modules/extensions/libglx.so > /dev/null ; then + rm -f /usr/lib/xorg/modules/extensions/libglx.so > /dev/null || true + dpkg-divert --remove --rename --package $glxname --divert /usr/lib/nvidia/libglx.so.xserver-xorg-core /usr/lib/xorg/modules/extensions/libglx.so > /dev/null || true + fi + + #Remove diversion of /usr/lib/libGL.so.1 + if dpkg-divert --list $glxname | grep "/usr/lib/libGL.so.1 " > /dev/null ; then + rm -f /usr/lib/libGL.so.1 > /dev/null || true + dpkg-divert --remove --rename --package $glxname --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null || true + fi + + #Remove diversion of /usr/lib/libGL.so.1.2 + if dpkg-divert --list $glxname | grep /usr/lib/libGL.so.1.2 > /dev/null ; then + rm -f /usr/lib/libGL.so.1.2 > /dev/null || true + dpkg-divert --remove --rename --package $glxname --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null || true + fi + + + shift + done + + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/control.in +++ nvidia-graphics-drivers-173-173.14.30/debian/control.in @@ -0,0 +1,64 @@ +Source: #DRIVERSRCNAME# +Section: restricted/misc +Priority: optional +Maintainer: Ubuntu Developers +Build-Depends: debhelper (>> 4.0.0), sed (>> 3.0), libxext6, bzip2, + xserver-xorg-dev (>= 2:1.4), execstack, cdbs, dh-modaliases +Standards-Version: 3.8.0 + +Package: #DRIVERNAME# +Architecture: i386 amd64 lpia +Depends: x11-common (>= 1:7.0.0), make, sed (>> 3.0), dkms, linux-libc-dev, libc6-dev, + linux-headers-generic | linux-headers, patch, acpid, ${shlibs:Depends}, + ${xviddriver:Depends} +Recommends: nvidia-settings +Provides: ${xviddriver:Provides} +Conflicts: nvidia-173-modaliases +Replaces: nvidia-173-modaliases +XB-Modaliases: ${modaliases} +Description: NVIDIA binary Xorg driver, kernel module and VDPAU library + The binary driver provide optimized hardware acceleration of OpenGL + applications via a direct-rendering X Server. AGP, PCIe, SLI, TV-out + and flat panel displays are also supported. + . + This package also includes the source for building the kernel module + required by the Xorg driver. + . + GPUs ranging from GeForce series 5 to GeForce series 9 are supported. + . + See /usr/share/doc/#DRIVERNAME#/README.txt.gz for a complete list + of supported GPUs and PCIIDs + . + +Package: #DRIVERDEVNAME# +Architecture: i386 amd64 lpia +Depends: #DRIVERNAME# (>= #VERSION#) +Description: NVIDIA binary Xorg driver development files + This package contains the NVIDIA binary Xorg driver + development files. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-glx-173 +Architecture: i386 amd64 lpia +Depends: #DRIVERNAME# +Description: Transitional package for nvidia-glx-173 + This is a transitional package for nvidia-glx-173, and can be safely removed + after the installation is complete. + +Package: nvidia-glx-173-dev +Architecture: i386 amd64 lpia +Depends: #DRIVERDEVNAME# +Description: Transitional package for nvidia-glx-173-dev + This is a transitional package for nvidia-glx-173-dev, and can be safely removed + after the installation is complete. + +Package: nvidia-173-kernel-source +Architecture: i386 amd64 lpia +Depends: #DRIVERNAME# +Description: Transitional package for nvidia-glx-173-kernel-source + This is a transitional package for nvidia-glx-173-kernel-source, and can be + safely removed after the installation is complete. + + --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.prerm +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.prerm @@ -0,0 +1,41 @@ +#!/bin/sh +# prerm script for nvidia-173 +# +# Copyright (C) 2007 Mario Limonciello +# Copyright (C) 2009 Canonical Ltd +# Authors: Alberto Milone + + +PACKAGE_NAME=nvidia-173 +CVERSION=`dpkg-query -W -f='${Version}' $PACKAGE_NAME | awk -F "-" '{print $1}' | cut -d\: -f2` + +remove_dkms_module() { + echo "Removing all DKMS Modules" + dkms remove -m $PACKAGE_NAME -v $CVERSION --all > /dev/null + echo "Done." +} + +case "$1" in + upgrade) + remove_dkms_module + ;; + remove) + remove_dkms_module + + update-alternatives --remove gl_conf /usr/lib/nvidia-173/ld.so.conf + + # Trigger gmenu so as to update the gnome menu + dpkg-trigger --by-package=$PACKAGE_NAME gmenucache || true + + # explicit ldconfig due to alternatives + ldconfig + + # Update the grub gfxpayload blacklist + if which update-grub-gfxpayload >/dev/null 2>&1; then + update-grub-gfxpayload + fi + ;; +esac + +#DEBHELPER# + --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173-dev.links.in +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173-dev.links.in @@ -0,0 +1 @@ +#INCLUDEDIR#/#DRIVERNAME# /usr/share/doc/#DRIVERDEVNAME#/include --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.postinst +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.postinst @@ -0,0 +1,164 @@ +#!/bin/sh +# Copyright (C) 2007-2008 Mario Limonciello +# Copyright (C) 2009 Canonical Ltd +# Authors: Alberto Milone +set -e + +PACKAGE_NAME=nvidia-173 +CVERSION=`dpkg-query -W -f='${Version}' $PACKAGE_NAME | awk -F "-" '{print $1}' | cut -d\: -f2` + +ARCH=`dpkg --print-architecture` +case $ARCH in + amd64) + ARCH="x86_64" + ;; + lpia) + ARCH="i686" + ;; + i386) + ARCH="i686" + ;; + *) + echo "WARNING: unsupported arch: $ARCH" + ARCH="$ARCH" + ;; +esac + +# Check the existence of a kernel named as $1 +_is_kernel_name_correct() { + CORRECT="no" + KERNEL_NAME=$1 + + for kernel in /boot/config-*; do + KERNEL=${kernel#*-} + if [ "${KERNEL}" = "${KERNEL_NAME}" ]; then + CORRECT="yes" + break + fi + done + + echo $CORRECT +} + +# Get the most recent kernel on Debian based systems. This keeps +# into account both the version and the ABI. If the current kernel +# is the most recent kernel then the function will print a null string. +_get_newest_kernel_debian() { + NEWEST_KERNEL= + NEWEST_VERSION= + NEWEST_ABI= + + for kernel in /boot/config-*; do + KERNEL=${kernel#*-} + KERNEL_VERSION=${KERNEL%%-*} + ABI=${KERNEL#*-} + ABI=${ABI%%-*} + + if [ -z "$NEWEST_KERNEL" ]; then + # The 1st time get a version which is bigger than $1 + COMPARE_TO=$1 + else + # Get the biggest version + COMPARE_TO="$NEWEST_VERSION-$NEWEST_ABI" + fi + + # if $kernel is greater than $COMPARE_TO + if [ `dpkg --compare-versions "$KERNEL_VERSION-$ABI" gt "$COMPARE_TO" && echo "yes" || \ + echo "no"` = "yes" ]; then + NEWEST_KERNEL=$KERNEL + NEWEST_VERSION=$KERNEL_VERSION + NEWEST_ABI=$ABI + fi + done + + echo "$NEWEST_KERNEL" +} + + +get_newest_kernel() { + NEWEST_KERNEL= + # Try Debian first as rpm can be installed in Debian based distros + if [ -e /usr/bin/dpkg ]; then + # If DEB based + CURRENT_KERNEL=$1 + CURRENT_VERSION=${CURRENT_KERNEL%%-*} + CURRENT_ABI=${CURRENT_KERNEL#*-} + CURRENT_FLAVOUR=${CURRENT_ABI#*-} + CURRENT_ABI=${CURRENT_ABI%%-*} + NEWEST_KERNEL=$(_get_newest_kernel_debian "$CURRENT_VERSION-$CURRENT_ABI") + + elif [ `which rpm &>/dev/null` ]; then + # If RPM based + NEWEST_KERNEL=$(_get_newest_kernel_rhel) + fi + + # Make sure that kernel name that we extracted corresponds to an installed + # kernel + if [ -n "$NEWEST_KERNEL" ] && [ `_is_kernel_name_correct $NEWEST_KERNEL` = "no" ]; then + NEWEST_KERNEL= + fi + + echo $NEWEST_KERNEL +} + +case "$1" in + configure) + # Deal with alternatives + + current_glconf="$(readlink -e /etc/ld.so.conf.d/GL.conf)" + + update-alternatives --force \ + --install /etc/ld.so.conf.d/GL.conf gl_conf /usr/lib/nvidia-173/ld.so.conf 9620 \ + --slave /usr/share/man/man1/nvidia-xconfig.1.gz man_nvidiaxconfig.gz /usr/share/man/man1/alt-nvidia-173-xconfig.1.gz \ + --slave /usr/share/applications/ubuntu-nvidia-settings.desktop nvidia_desktop /usr/share/nvidia-173/ubuntu-nvidia-settings.desktop \ + --slave /usr/bin/nvidia-smi nvidia_smi /usr/lib/nvidia-173/bin/nvidia-smi \ + --slave /usr/bin/nvidia-xconfig nvidia_xconfig /usr/lib/nvidia-173/bin/nvidia-xconfig \ + --slave /usr/bin/nvidia-bug-report.sh nvidia_bug_report /usr/lib/nvidia-173/bin/nvidia-bug-report.sh \ + --slave /usr/lib/XvMCConfig xvmcconfig /usr/lib/nvidia-173/XvMCConfig \ + --slave /etc/xdg/autostart/nvidia-autostart.desktop nvidia-autostart.desktop /usr/share/nvidia-173/nvidia-autostart.desktop \ + --slave /usr/lib/xorg/modules/drivers/nvidia_drv.so nvidia_drv /usr/lib/nvidia-173/xorg/nvidia_drv.so \ + --slave /etc/modprobe.d/nvidia-graphics-drivers.conf nvidia_modconf /lib/nvidia-173/modprobe.conf \ + --slave /usr/lib/xorg/extra-modules xorg_extra_modules /usr/lib/nvidia-173/xorg \ + --slave /usr/share/grub-gfxpayload-lists/blacklist/10_$PACKAGE_NAME grub_fb_blacklist /usr/share/nvidia-173/nvidia-173.grub-gfxpayload + + # ldconfig needs to be run immediately as we're changing /etc/ld.so.conf.d/ with + # alternatives. + LDCONFIG_NOTRIGGER=y ldconfig + + # Update the grub gfxpayload blacklist + if which update-grub-gfxpayload >/dev/null 2>&1; then + update-grub-gfxpayload + fi + + # Trigger gmenu so that the icons will show up in the menu + dpkg-trigger --by-package=$PACKAGE_NAME gmenucache || true + + CURRENT_KERNEL=$(uname -r) + NEWEST_KERNEL=$(get_newest_kernel "$KERNELS") + + ALTERNATIVE=$(readlink /etc/alternatives/gl_conf) + if [ "$ALTERNATIVE" = "/usr/lib/nvidia-173/ld.so.conf" ]; then + # Update initramfs so that the blacklist ends up in the initramfs + update-initramfs -u + + if [ -n "$NEWEST_KERNEL" ] && [ ${CURRENT_KERNEL} != ${NEWEST_KERNEL} ]; then + # This can fail when dealing with a chroot see LP: #556653 + update-initramfs -u -k $CURRENT_KERNEL || true + fi + fi + + # Build the kernel module + /usr/lib/dkms/common.postinst $PACKAGE_NAME $CVERSION /usr/share/$PACKAGE_NAME $ARCH $2 + exit $? + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173.docs +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173.docs @@ -0,0 +1,2 @@ +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/share/doc/NVIDIA_Changelog +NVIDIA-Linux-x86_64-173.14.30-pkg2/usr/share/doc/README.txt --- nvidia-graphics-drivers-173-173.14.30.orig/debian/nvidia-173-dev.preinst +++ nvidia-graphics-drivers-173-173.14.30/debian/nvidia-173-dev.preinst @@ -0,0 +1,81 @@ +#! /bin/sh +# preinst script for nvidia-173-dev +# +# see: dh_installdeb(1) +# +# Copyright (C) 2009-2010 Canonical Ltd +# Authors: Alberto Milone +# +set -e + +case "$1" in + install|upgrade) + # We need to remove diversions from previous versions of the package + + if [ -d /usr/share/nvidia-glx/diversions/ ] ; then + rm -f /usr/lib/libGL.so + rm -f /usr/lib/libGL.a + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.so /usr/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.a /usr/lib/libGL.a > /dev/null + + rmdir /usr/share/nvidia-glx/diversions/ || true + rmdir /usr/share/nvidia-glx || true + fi + + if [ ! -d /usr/lib/nvidia ]; then + mkdir -p /usr/lib/nvidia || true + fi + + # Remove old old old gl header diversions + if [ -e /usr/share/nvidia-glx/diversions/gl.h ]; then + if [ -e /usr/include/GL/gl.h ]; then + rm -f /usr/include/GL/gl.h /usr/include/GL/glx.h /usr/include/GL/glxtokens.h + fi + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxext.h /usr/include/GL/glxext.h > /dev/null + fi + + + # Make sure that no diversion is still there + set -a "nvidia-glx-dev" "nvidia-glx-new-dev" "nvidia-glx-legacy-dev" "nvidia-glx-dev-envy"\ + "nvidia-glx-new-dev-envy" "nvidia-glx-legacy-dev-envy" "nvidia-glx-180-dev" \ + "nvidia-glx-177-dev" "nvidia-glx-173-dev" "nvidia-glx-96-dev" "nvidia-glx-71-dev" \ + "nvidia-glx-185-dev" "nvidia-glx-190-dev" + + while [ $# -ge 1 ]; do + glxdevname=$1 + + if dpkg-divert --list /usr/lib/libGL.so | grep $glxdevname > /dev/null ; then + dpkg-divert --remove --rename --package $glxdevname --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null + fi + if dpkg-divert --list /usr/lib/libGL.a | grep $glxdevname > /dev/null ; then + dpkg-divert --remove --rename --package $glxdevname --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null + fi + if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep $glxdevname > /dev/null ; then + dpkg-divert --remove --rename --package $glxdevname --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null + fi + if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep $glxdevname > /dev/null ; then + dpkg-divert --remove --rename --package $glxdevname --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null + fi + + shift + done + + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- nvidia-graphics-drivers-173-173.14.30.orig/debian/dkms/patches/blacklist-register-mapping.patch +++ nvidia-graphics-drivers-173-173.14.30/debian/dkms/patches/blacklist-register-mapping.patch @@ -0,0 +1,34 @@ +diff -ur a/nv.c b/nv.c +--- a/nv.c 2012-04-05 14:45:07.000000000 -0500 ++++ b/nv.c 2012-04-05 14:45:07.000000000 -0500 +@@ -2548,6 +2548,12 @@ + /* NV reg space */ + if (IS_REG_OFFSET(nv, NV_VMA_OFFSET(vma), NV_VMA_SIZE(vma))) + { ++ if (IS_BLACKLISTED_REG_OFFSET(nv, NV_VMA_OFFSET(vma), NV_VMA_SIZE(vma))) ++ { ++ status = -EINVAL; ++ goto done; ++ } ++ + if (nv_encode_caching(&vma->vm_page_prot, + NV_MEMORY_UNCACHED, + NV_MEMORY_TYPE_REGISTERS)) +diff -ur a/nv.h b/nv.h +--- a/nv.h 2012-04-05 14:45:07.000000000 -0500 ++++ b/nv.h 2012-04-05 14:45:07.000000000 -0500 +@@ -430,6 +430,14 @@ + ((offset) >= (nv)->agp.address) && \ + (((offset) + ((length)-1)) <= (nv)->agp.address + ((nv)->agp.size-1))) + ++#define IS_REG_RANGE_WITHIN_MAPPING(nv, roffset, rlength, moffset, mlength) \ ++ (((moffset) <= ((nv)->regs->address + ((roffset) + (rlength)-1))) &&\ ++ (((moffset) + (mlength)-1) >= ((nv)->regs->address + (roffset)))) ++ ++#define IS_BLACKLISTED_REG_OFFSET(nv, offset, length) \ ++ ((IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1000, 0x1000, offset, length)) ||\ ++ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length))) ++ + /* duplicated from nvos.h for external builds */ + #ifndef NVOS_AGP_CONFIG_DISABLE_AGP + # define NVOS_AGP_CONFIG_DISABLE_AGP (0x00000000) --- nvidia-graphics-drivers-173-173.14.30.orig/debian/dkms/patches/rt_preempt_31.patch +++ nvidia-graphics-drivers-173-173.14.30/debian/dkms/patches/rt_preempt_31.patch @@ -0,0 +1,12 @@ +diff -urN NVIDIA-Linux-x86-185.18.36-pkg1/usr/src/nv/nv-linux.h NVIDIA-Linux-x86-185.18.36-pkg1.new/usr/src/nv/nv-linux.h +--- nvidia-185.18.36/nv-linux.h 2009-08-15 10:58:45.000000000 +1000 ++++ nvidia-185.18.36.new/nv-linux.h 2009-09-26 21:43:35.000000000 +1000 +@@ -721,7 +721,7 @@ + #define nv_up(lock) up(&lock) + + #if defined(CONFIG_PREEMPT_RT) +-#define NV_INIT_MUTEX(mutex) init_MUTEX(mutex) ++#define NV_INIT_MUTEX(mutex) semaphore_init(mutex) + #else + #if !defined(__SEMAPHORE_INITIALIZER) && defined(__COMPAT_SEMAPHORE_INITIALIZER) + #define __SEMAPHORE_INITIALIZER __COMPAT_SEMAPHORE_INITIALIZER --- nvidia-graphics-drivers-173-173.14.30.orig/debian/dkms/patches/NVIDIA_173.14.12_2.6.27.patch +++ nvidia-graphics-drivers-173-173.14.30/debian/dkms/patches/NVIDIA_173.14.12_2.6.27.patch @@ -0,0 +1,87 @@ +diff -Nru nv/nv.c nv/nv.c +--- nv/nv.c 2008-07-18 03:42:50.000000000 +0200 ++++ nv/nv.c 2008-08-12 00:35:45.000000000 +0200 +@@ -1296,14 +1296,22 @@ + if (get_cpu() == cpu) + __nv_setup_pat_entries(NULL); + else ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++ smp_call_function(__nv_setup_pat_entries, hcpu, 1); ++ #else + smp_call_function(__nv_setup_pat_entries, hcpu, 1, 1); ++ #endif + put_cpu(); + break; + case CPU_DOWN_PREPARE: + if (get_cpu() == cpu) + __nv_restore_pat_entries(NULL); + else ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++ smp_call_function(__nv_restore_pat_entries, hcpu, 1); ++ #else + smp_call_function(__nv_restore_pat_entries, hcpu, 1, 1); ++ #endif + put_cpu(); + break; + } +diff -Nru nv/nv-linux.h nv/nv-linux.h +--- nv/nv-linux.h 2008-07-18 03:42:51.000000000 +0200 ++++ nv/nv-linux.h 2008-08-12 00:44:27.000000000 +0200 +@@ -104,7 +104,10 @@ + #endif + + #include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++#else + #include ++#endif + #include + #include + +@@ -665,13 +668,21 @@ + #if defined(preempt_disable) + preempt_disable(); + #endif ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++ ret = smp_call_function(func, info, 1); ++ #else + ret = smp_call_function(func, info, 1, 1); ++ #endif + func(info); + #if defined(preempt_enable) + preempt_enable(); + #endif + #else ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++ ret = on_each_cpu(func, info, 1); ++ #else + ret = on_each_cpu(func, info, 1, 1); ++ #endif + #endif + return ret; + } +diff -Nru nv/os-interface.c nv/os-interface.c +--- nv/os-interface.c 2008-07-18 03:42:50.000000000 +0200 ++++ nv/os-interface.c 2008-08-12 00:48:07.000000000 +0200 +@@ -48,7 +48,11 @@ + #endif + local_bh_disable(); + atomic_set(&os_smp_barrier, 1); ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++ ret = smp_call_function(ipi_handler, NULL, 0); ++ #else + ret = smp_call_function(ipi_handler, NULL, 1, 0); ++ #endif + #endif + return (ret == 0) ? RM_OK : RM_ERROR; + } +@@ -704,7 +708,9 @@ + U032 sig + ) + { ++ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26) + return kill_proc(pid, sig, 1) ? RM_ERR_OPERATING_SYSTEM : RM_OK; ++ #endif + } + + /*******************************************************************************/ --- nvidia-graphics-drivers-173-173.14.30.orig/debian/dkms/patches/fall_back_on_mtrr_if_no_pat.patch +++ nvidia-graphics-drivers-173-173.14.30/debian/dkms/patches/fall_back_on_mtrr_if_no_pat.patch @@ -0,0 +1,22 @@ +diff -ru nv/nv.c nv.4796515/nv.c +--- nv/nv.c 2009-09-23 08:26:44.000000000 -0700 ++++ nv.4796515/nv.c 2009-10-07 08:34:18.359240138 -0700 +@@ -940,9 +940,15 @@ + if (!test_bit(X86_FEATURE_PAT, + (volatile unsigned long *)&boot_cpu_data.x86_capability)) + { +- nv_printf(NV_DBG_ERRORS, +- "NVRM: CPU does not support the PAT, falling back to MTRRs.\n"); +- return NV_PAT_MODE_DISABLED; ++ if ((boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) || ++ (boot_cpu_data.cpuid_level < 1) || ++ ((cpuid_edx(1) & (1 << 16)) == 0) || ++ (boot_cpu_data.x86 != 6) || (boot_cpu_data.x86_model >= 15)) ++ { ++ nv_printf(NV_DBG_ERRORS, ++ "NVRM: CPU does not support the PAT, falling back to MTRRs.\n"); ++ return NV_PAT_MODE_DISABLED; ++ } + } + + NV_READ_PAT_ENTRIES(pat1, pat2); --- nvidia-graphics-drivers-173-173.14.30.orig/debian/dkms/patches/nvidia-rt-compat-legacy.patch +++ nvidia-graphics-drivers-173-173.14.30/debian/dkms/patches/nvidia-rt-compat-legacy.patch @@ -0,0 +1,109 @@ +diff -Nurp nv.orig/os-interface.c nv/os-interface.c +--- nv.orig/os-interface.c 2009-08-15 02:58:45.000000000 +0200 ++++ nv/os-interface.c 2009-10-25 11:38:18.366928071 +0100 +@@ -88,7 +88,7 @@ typedef struct os_sema_s + nv_stack_t *sp; + struct completion completion; + #if defined(CONFIG_PREEMPT_RT) +- raw_spinlock_t lock; ++ atomic_spinlock_t lock; + #else + spinlock_t lock; + #endif +@@ -127,7 +127,11 @@ RM_STATUS NV_API_CALL os_alloc_sema + os_sema = (os_sema_t *)*ppSema; + os_sema->sp = sp; + init_completion(&os_sema->completion); ++#if defined(CONFIG_PREEMPT_RT) ++ atomic_spin_lock_init(&os_sema->lock); ++#else + spin_lock_init(&os_sema->lock); ++#endif + os_sema->count = 1; + + return RM_OK; +@@ -171,18 +175,30 @@ RM_STATUS NV_API_CALL os_acquire_sema + os_sema_t *os_sema = (os_sema_t *)pSema; + unsigned long old_irq; + ++#if defined(CONFIG_PREEMPT_RT) ++ atomic_spin_lock_irqsave(&os_sema->lock, old_irq); ++#else + spin_lock_irqsave(&os_sema->lock, old_irq); ++#endif + if (os_sema->count <= 0) + { + os_sema->count--; ++#if defined(CONFIG_PREEMPT_RT) ++ atomic_spin_unlock_irqrestore(&os_sema->lock, old_irq); ++#else + spin_unlock_irqrestore(&os_sema->lock, old_irq); ++#endif + wait_for_completion(&os_sema->completion); + } + else + { + os_sema->count--; + rm_disable_interrupts(os_sema->sp); ++#if defined(CONFIG_PREEMPT_RT) ++ atomic_spin_unlock_irqrestore(&os_sema->lock, old_irq); ++#else + spin_unlock_irqrestore(&os_sema->lock, old_irq); ++#endif + } + + return RM_OK; +@@ -205,17 +221,29 @@ BOOL NV_API_CALL os_cond_acquire_sema + os_sema_t *os_sema = (os_sema_t *)pSema; + unsigned long old_irq; + ++#if defined(CONFIG_PREEMPT_RT) ++ atomic_spin_lock_irqsave(&os_sema->lock, old_irq); ++#else + spin_lock_irqsave(&os_sema->lock, old_irq); ++#endif + if (os_sema->count <= 0) + { ++#if defined(CONFIG_PREEMPT_RT) ++ atomic_spin_unlock_irqrestore(&os_sema->lock, old_irq); ++#else + spin_unlock_irqrestore(&os_sema->lock, old_irq); ++#endif + return FALSE; + } + else + { + os_sema->count--; + rm_disable_interrupts(os_sema->sp); ++#if defined(CONFIG_PREEMPT_RT) ++ atomic_spin_unlock_irqrestore(&os_sema->lock, old_irq); ++#else + spin_unlock_irqrestore(&os_sema->lock, old_irq); ++#endif + return TRUE; + } + +@@ -239,7 +267,11 @@ RM_STATUS NV_API_CALL os_release_sema + unsigned long old_irq; + BOOL doWakeup; + ++#if defined(CONFIG_PREEMPT_RT) ++ atomic_spin_lock_irqsave(&os_sema->lock, old_irq); ++#else + spin_lock_irqsave(&os_sema->lock, old_irq); ++#endif + if (os_sema->count < 0) + { + doWakeup = TRUE; +@@ -250,7 +282,11 @@ RM_STATUS NV_API_CALL os_release_sema + rm_enable_interrupts(os_sema->sp); + } + os_sema->count++; ++#if defined(CONFIG_PREEMPT_RT) ++ atomic_spin_unlock_irqrestore(&os_sema->lock, old_irq); ++#else + spin_unlock_irqrestore(&os_sema->lock, old_irq); ++#endif + + if (doWakeup) + complete(&os_sema->completion); --- nvidia-graphics-drivers-173-173.14.30.orig/debian/dkms/patches/nvidia-2.6.36-ioctl.patch +++ nvidia-graphics-drivers-173-173.14.30/debian/dkms/patches/nvidia-2.6.36-ioctl.patch @@ -0,0 +1,13 @@ +diff --git a/nv.c b/nv.c +index 54be61e..2390c94 100644 +--- a/nv.c ++++ b/nv.c +@@ -393,7 +393,7 @@ static struct file_operations nv_fops = { + .owner = THIS_MODULE, + .poll = nv_kern_poll, + #if defined(NV_FILE_OPERATIONS_HAS_IOCTL) +- .ioctl = nv_kern_ioctl, ++ .unlocked_ioctl = nv_kern_unlocked_ioctl, + #endif + #if defined(NV_FILE_OPERATIONS_HAS_UNLOCKED_IOCTL) + .unlocked_ioctl = nv_kern_unlocked_ioctl,