--- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.README.Debian.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.README.Debian.in @@ -0,0 +1,82 @@ +nvidia-graphics-drivers for Ubuntu +---------------------------------- + + +INTRODUCTION: +----------------------------------------------------------------------- + +Welcome to the Ubuntu NVIDIA packages. This document has notes on the +X Server and GL libraries of the NVIDIA driver offering. + + +A Note about Thread Local Storage (TLS): +---------------------------------------- +Under 2.6.x kernels a new TLS method is used and different libraries are +required. NVIDIA provides these libraries and at boot time (via +/etc/init.d/nvidia-glx) a test is performed on your system to see if +your require these extra libraries. Having the TLS libraries installed +(in /usr/lib/tls and libglx.so) running under a 2.4.x kernel will cause +problems when running GL applications. Likewise, not having these libraries +installed under 2.6.x might prevent X from starting at all. + +Simple Explanation: +To switch back and forth between the two systems simply run: + + /etc/init.d/nvidia-glx start + + This is run automatically at boot time. + +To force a certain setting (e.g. you may have a 2.4 kernel patched for +NPTL) place USE_TLS=1 in /etc/defaults/nvidia-glx for using the nvidia tls +libraries. USE_TLS=0 for not using tls libraries. This isn't normally +necessary for most users. + + +What Happens: +Symlinks are created in /usr/lib/tls from libraries installed in +/usr/lib/nvidia. Also the libglx.so.VERSION in +/usr/X11R6/lib/modules/extensions/ is symlinked to a tls-enabled one. + + + +For any news on this package check http://people.debian.org/~rdonald and +http://bugs.debian.org/nvidia-glx + + +NOTES ABOUT GLX DRIVER AND OPENGL: +----------------------------------------------------------------------- + +Using the nvidia X driver requires some user modification. + + First, modify your /etc/X11/XF86Config-4 + + Minimum requirements: + In Section "Module" + add Load "glx" + remove Load "dri" + remove Load "GLcore" + In Section "Device" + Change Driver "nv" to Driver "nvidia" + + See /usr/share/doc/nvidia-glx/README.gz and + /usr/share/doc/nvidia-glx/examples/XF86Config.sample.gz + for descriptions of all supported options. + Appendix F: CONFIGURING AGP is an important section. + + +Note about OpenGL headers: The header files are not installed to +/usr/include/GL but to /usr/share/doc/nvidia-glx-dev/include/GL. +This is similar to what NVIDIA +does in their own packaging, allowing use of and not overwriting +preinstalled headers (e.g. xlibmesa-dev). If you wish to use the NVIDIA +supplied headers (e.g. you require NVIDIA GL extensions) you must copy them to +/usr/include/GL yourself or include /usr/share/doc/nvidia-glx-dev/include in +your includes path when compiling. + + +Also note all users using GLX must be in group video. (i.e. adduser +video) + + + + -- Randall Donald , Mon, 31 Mar 2003 23:40:05 -0800 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-new-kernel-source.dirs +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-new-kernel-source.dirs @@ -0,0 +1 @@ +usr/src --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/linux-restricted-modules-common.modprobe +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/linux-restricted-modules-common.modprobe @@ -0,0 +1,5 @@ +# Make nvidia/nvidia_legacy and fglrx use /sbin/lrm-video to load +install fglrx /sbin/lrm-video fglrx $CMDLINE_OPTS +install nvidia /sbin/lrm-video nvidia $CMDLINE_OPTS +install nvidia_legacy /sbin/lrm-video nvidia_legacy $CMDLINE_OPTS +install nvidia_new /sbin/lrm-video nvidia_new $CMDLINE_OPTS --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/fglrx-kernel-source.dirs +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/fglrx-kernel-source.dirs @@ -0,0 +1 @@ +usr/src --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.links.amd64.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.links.amd64.in @@ -0,0 +1,13 @@ +usr/lib32/libGL.so.@@VERSION@@ usr/lib32/libGL.so.1 +usr/lib32/libGLcore.so.@@VERSION@@ usr/lib32/libGLcore.so.1 +usr/lib32/libnvidia-cfg.so.@@VERSION@@ usr/lib32/libnvidia-cfg.so.1 +usr/lib32/libnvidia-tls.so.@@VERSION@@ usr/lib32/libnvidia-tls.so.1 +usr/lib32/tls/libnvidia-tls.so.@@VERSION@@ usr/lib32/tls/libnvidia-tls.so.1 +usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so.1 +usr/lib/libGLcore.so.@@VERSION@@ usr/lib/libGLcore.so.1 +usr/lib/libnvidia-cfg.so.@@VERSION@@ usr/lib/libnvidia-cfg.so.1 +usr/lib/libnvidia-tls.so.@@VERSION@@ usr/lib/libnvidia-tls.so.1 +usr/lib/tls/libnvidia-tls.so.@@VERSION@@ usr/lib/tls/libnvidia-tls.so.1 +usr/lib/xorg/modules/extensions/libglx.so.@@VERSION@@ usr/lib/xorg/modules/extensions/libglx.so +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA.so.1 +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA_dynamic.so.1 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.postrm.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.postrm.in @@ -0,0 +1,105 @@ +#! /bin/sh +# postrm script for nvidia-glx +# +# see: dh_installdeb(1) + +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) + # perform sanity checks on the file to ensure they are currently diverted to this package. + if [ "$(dpkg-divert --list /usr/lib/libGL.so.1 | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + fi + + if [ "$(dpkg-divert --list /usr/X11R6/lib32/libGL.so.1 | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib32/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + fi + + if [ "$(dpkg-divert --list /usr/lib32/libGL.so.1 | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib32/nvidia/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null + fi + + if [ "$(dpkg-divert --list /usr/X11R6/lib/libGL.so.1 | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --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/libGLcore.a | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --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 | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libglx.a.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.a > /dev/null + fi + + if [ "$(dpkg-divert --list /usr/lib/xorg/modules/libGLcore.so | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/libGLcore.so > /dev/null + fi + + # old, wrong path + if [ "$(dpkg-divert --list /usr/lib/xorg/modules/libglx.so | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/libglx.so > /dev/null + fi + + if [ "$(dpkg-divert --list /usr/lib/xorg/modules/extensions/libglx.so | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libglx.so.xserver-xorg-core /usr/lib/xorg/modules/extensions/libglx.so > /dev/null + fi + + if [ "$(dpkg-divert --list /usr/lib/xorg/modules/libwfb.so | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.so > /dev/null + fi + + rm -f /usr/X11R6/lib/modules/extensions/libglx.so.@@VERSION@@ 2> /dev/null || true + + if [ -d /usr/lib/nvidia ]; then + rmdir /usr/lib/nvidia || true; + fi + if [ -d /usr/X11R6/lib/nvidia ]; then + rmdir /usr/X11R6/lib/nvidia || true; + fi + if [ -d /usr/X11R6/lib32/nvidia ]; then + rmdir /usr/X11R6/lib32/nvidia || true; + fi + if [ -d /usr/lib32/nvidia ]; then + rmdir /usr/lib32/nvidia || true; + fi + ldconfig + + ;; + + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + + +#rm -f /usr/X11R6/lib/modules/extensions/libglx.so.@@VERSION@@ 2> /dev/null || true + + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/control +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/control @@ -0,0 +1,515 @@ +# THIS FILE IS AUTO-GENERATED FROM control.stub.in +Source: linux-restricted-modules-2.6.24 +Section: restricted/misc +Priority: optional +Maintainer: Ubuntu Kernel Team +Uploaders: Adam Conrad , Ben Collins +Standards-Version: 3.6.1 +Build-Depends: cpio, debhelper (>= 4.0.0), libc6-i386 [amd64], + kernel-wedge (>= 2.05ubuntu2), module-init-tools, rpm, sed (>> 3.0), + sharutils, bzip2, libgtk2.0-dev [i386 amd64], + linux-headers-2.6.24-24-386 [i386], + linux-headers-2.6.24-24-server [amd64 i386], + linux-headers-2.6.24-24-generic [amd64 i386], + linux-headers-2.6.24-24-lpia [lpia], + linux-headers-2.6.24-24-lpiacompat [lpia], + linux-headers-2.6.24-24-openvz [i386 amd64], + linux-headers-2.6.24-24-rt [i386 amd64], + linux-headers-2.6.24-24-xen [amd64 i386], + linux-headers-2.6.24-24-powerpc [powerpc], + linux-headers-2.6.24-24-powerpc-smp [powerpc], + linux-headers-2.6.24-24-powerpc64-smp [powerpc], + linux-headers-2.6.24-24-mckinley [ia64], + linux-headers-2.6.24-24-itanium [ia64], + linux-headers-2.6.24-24-hppa32 [hppa], + linux-headers-2.6.24-24-hppa64 [hppa], + linux-headers-2.6.24-24-sparc64-smp [sparc], + linux-headers-2.6.24-24-sparc64 [sparc] +Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-hardy-lrm.git + +Package: linux-restricted-modules-common +Architecture: all +Priority: optional +Depends: binutils-static +Description: Non-free Linux 2.6.24 modules helper script + This package provides only a set of helper scripts to handle + linux-restricted-modules. + +Package: linux-restricted-modules-2.6.24-24-386 +Architecture: i386 +Priority: optional +Provides: nvidia-kernel-96.43.05, nvidia-kernel-71.86.04, nvidia-kernel-169.12 +Depends: linux-image-2.6.24-24-386, linux-restricted-modules-common (>= 2.6.24), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-2.6.24-24 +Description: Non-free Linux 2.6.24 modules on 386 + This package provides restricted modules for Linux version 2.6.24 on + 386. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl, fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcdslusba, + fcpci, fcusb, fwlanusb, fxusb (AVM ISDN) + - ltmodem (Winmodem) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: nvidia-glx +Architecture: i386 amd64 +Depends: linux-restricted-modules-common, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-kernel-source (>= ${nvidia:Version}), nvidia-settings +Conflicts: nvidia-glx-src, nvidia-xconfig, nvidia-glx-legacy, nvidia-glx-new +Replaces: nvidia-glx-src +Provides: xserver-xorg-video-2 +Description: NVIDIA binary XFree86 4.x/X.Org driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and support the newer + GeForce, nForce and Quadro families of NVIDIA chipsets. AGP, TV-out and + flat panel displays are also supported. + . + If you have a TNT, TNT2, or older GeForce, you may need the nvidia-glx-legacy + package instead of this one. + +Package: nvidia-glx-dev +Architecture: i386 amd64 +Depends: nvidia-glx (>= ${nvidia:Version}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Conflicts: nvidia-glx-legacy-dev, nvidia-glx-new-dev +Description: NVIDIA binary XFree86 4.x/X.Org driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org driver + development files. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx (>= ${nvidia:Version}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src +Replaces: nvidia-kernel-src +Description: NVIDIA binary kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + +Package: nvidia-glx-new +Architecture: i386 amd64 +Depends: linux-restricted-modules-common, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-new-kernel-source (>= ${nvidia:NewVersion}), nvidia-settings +Conflicts: nvidia-glx-src, nvidia-xconfig, nvidia-glx, nvidia-glx-legacy +Replaces: nvidia-glx-src +Provides: nvidia-glx, xserver-xorg-video-2 +Description: NVIDIA binary XFree86 4.x/X.Org 'new' driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and supports the newer + GeForce, nForce and Quadro families of NVIDIA chipsets. AGP, TV-out and + flat panel displays are also supported. + . + If you have a TNT, TNT2, or older GeForce, you may need the nvidia-glx-legacy + package instead of this one. If you have a GeForce4, you may need the nvidia-glx + package. + +Package: nvidia-glx-new-dev +Architecture: i386 amd64 +Depends: nvidia-glx-new (>= ${nvidia:NewVersion}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Conflicts: nvidia-glx-dev, nvidia-glx-legacy-dev +Description: NVIDIA binary XFree86 4.x/X.Org 'new' driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org 'new' driver + development files. + . + This is the 'new' driver for newer chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-new description, please use the + nvidia-glx driver, which is more compatible. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-new-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx-new (>= ${nvidia:NewVersion}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src, nvidia-kernel-source, nvidia-legacy-kernel-source +Replaces: nvidia-kernel-src, nvidia-kernel-source +Provides: nvidia-kernel-source +Description: NVIDIA binary 'new' kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + . + This is the 'new' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-new description, please use the + nvidia-glx driver, which is more compatible. + +Package: nvidia-glx-legacy +Architecture: i386 amd64 +Depends: linux-restricted-modules-common, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-legacy-kernel-source (>= ${nvidia:LegacyVersion}), nvidia-settings +Conflicts: nvidia-glx-src, nvidia-glx +Replaces: nvidia-glx-src +Provides: nvidia-glx, xserver-xorg-video-2 +Description: NVIDIA binary XFree86 4.x/X.Org 'legacy' driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and supports the TNT, + TNT2, TNT Ultra, GeForce, and GeForce2 chipsets. AGP, TV-out and flat panel + displays are also supported. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the above paragraph, please use the nvidia-glx driver, + which is much more up to date. + +Package: nvidia-glx-legacy-dev +Architecture: i386 amd64 +Depends: nvidia-glx-legacy (>= ${nvidia:LegacyVersion}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Conflicts: nvidia-glx-dev +Description: NVIDIA binary XFree86 4.x/X.Org 'legacy' driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org 'legacy' driver + development files. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-legacy description, please use the + nvidia-glx driver, which is much more up to date. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-legacy-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx-legacy (>= ${nvidia:LegacyVersion}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src, nvidia-kernel-source +Replaces: nvidia-kernel-src, nvidia-kernel-source +Provides: nvidia-kernel-source +Description: NVIDIA binary 'legacy' kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-legacy description, please use the + nvidia-glx driver, which is much more up to date. + +Package: fglrx-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: xorg-driver-fglrx (>= ${ati:XOrgVersion}), kernel-package (>= 8.082), devscripts +Description: ATI binary kernel module source + This package builds the ATI XFree86 4.x/X.Org binary kernel module needed + by xorg-driver-fglrx. This package is not needed on an + Ubuntu system because a pre-compiled kernel module is supplied by the + linux-restricted-modules packages. + +Package: xorg-driver-fglrx +Architecture: i386 amd64 +Depends: linux-restricted-modules-common, xserver-xorg-core (>= 1:0.99.0-1), ${shlibs:Depends} +Conflicts: fglrx-driver, xfree86-driver-fglrx, nvidia-glx, nvidia-glx-legacy +Replaces: fglrx-driver, xfree86-driver-fglrx +Provides: fglrx-driver, xserver-xorg-video-2 +Description: Video driver for ATI graphics accelerators + Video driver for the ATI Radeon and FireGL graphics accelerators. + . + This version of the ATI driver officially supports: + . + * FireGL: V8650, V8600, V7600, V7350, V7300, V7200, V7100, + V5600, V5200, V5100, V5000, HD3870, HD3850, V3600, V3400, + V3300, V3200, V3100, X3-256, X3, X2-256, Z1-128, T2-128, + X1-128, X1-256p + * FireMV: 2200 (Single card PCI-e configuration) + * Mobility FireGL: V5000, T2 + * Mobility Radeon: X1800, X1600, X1400, X1300, X800, X700, X600, X300, + X200, 9800, 9600, 9550, 9500 + * Radeon Xpress: 1200 series, 1100 series, 200 series + * Radeon: HD2900, HD2600, HD2400, X1900, X1800, X1600, X1300, X850, + X800, X700, X600, X550, X300, 9800, 9700, 9600, 9550, 9500 + . + ATI All-in-Wonder variants of the above cards/chips are also supported, + but video capture is not. + . + This package provides 2D display drivers and hardware accelerated OpenGL. + +Package: xorg-driver-fglrx-dev +Architecture: i386 amd64 +Depends: xorg-driver-fglrx (= ${ati:XOrgFullVersion}) +Conflicts: fglrx-driver-dev, xfree86-driver-fglrx-dev +Replaces: fglrx-driver-dev, xfree86-driver-fglrx-dev +Provides: fglrx-driver-dev +Description: Video driver for ATI graphics accelerators (devel files) + Video driver for the ATI Radeon and FireGL graphics accelerators. + . + This package provides definitions for the GL and GLX extensions + and the FGLRXGAMMA extension interface library. + +Package: fglrx-control +Architecture: i386 amd64 +Depends: xorg-driver-fglrx, ${shlibs:Depends} +Conflicts: xorg-driver-fglrx (< 1:7.1.0-7-11+2.6.24.5-4.12) +Replaces: xorg-driver-fglrx (< 1:7.1.0-7-11+2.6.24.5-4.12) +Description: Control panel for the ATI graphics accelerators + Control panel for the ATI Radeon and FireGL graphics accelerators. + . + This package provides the control panel compiled for Qt3. + +Package: fglrx-amdcccle +Architecture: i386 amd64 +Depends: fglrx-control +Description: Dummy package for easy transition + This is a dummy package for easy transition with ATI's packages. + +Package: avm-fritz-kernel-source +Architecture: amd64 i386 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: kernel-package (>= 8.082), devscripts +Description: AVM Fritz! binary kernel module source + This package builds the binary kernel modules needed for the AVM FRITZ! + ISDN hardware. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + +Package: avm-fritz-firmware-2.6.24-24 +Architecture: amd64 i386 +Depends: capiutils (>= 1:3.6.2005-01-03-3ubuntu1) +Recommends: drdsl +Description: Firmware for AVM Fritz! ISDN hardware + This package contains firmware binaries needed for various Fritz! ISDN cards + made by AVM. The firmware is installed in a kernel specific directory to + match driver and firmware version, if more than one kernel installed. + +Package: linux-restricted-modules-2.6.24-24-generic +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-96.43.05, nvidia-kernel-71.86.04, nvidia-kernel-169.12 +Depends: linux-image-2.6.24-24-generic, linux-restricted-modules-common (>= 2.6.24), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-2.6.24-24 +Description: Non-free Linux 2.6.24 modules on x86/x86_64 + This package provides restricted modules for Linux version 2.6.24 on + x86/x86_64. + . + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcpci (AVM ISDN) + - fcdsl, fcdslusba, fcusb, fwlanusb, fxusb (AVM ISDN x86 only) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-rt +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-96.43.05, nvidia-kernel-71.86.04, nvidia-kernel-169.12 +Depends: linux-image-2.6.24-24-rt, linux-restricted-modules-common (>= 2.6.24), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-2.6.24-24 +Description: Non-free Linux 2.6.24 modules on x86/x86_64 + This package provides restricted modules for Linux version 2.6.24 on + x86/x86_64. + . + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcpci (AVM ISDN) + - fcdsl, fcdslusba, fcusb, fwlanusb, fxusb (AVM ISDN x86 only) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-server +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-96.43.05, nvidia-kernel-71.86.04, nvidia-kernel-169.12 +Depends: linux-image-2.6.24-24-server, linux-restricted-modules-common (>= 2.6.24), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-2.6.24-24 +Description: Non-free Linux 2.6.24 modules on x86/x86_64 + This package provides restricted modules for Linux version 2.6.24 on + x86/x86_64. + . + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcpci (AVM ISDN) + - fcdsl, fcdslusba, fcusb, fwlanusb, fxusb (AVM ISDN x86 only) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-powerpc +Architecture: powerpc +Priority: optional +Depends: linux-image-2.6.24-24-powerpc, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on PowerPC + This package provides restricted modules for Linux version 2.6.24 on + PowerPC. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-powerpc-smp +Architecture: powerpc +Priority: optional +Depends: linux-image-2.6.24-24-powerpc-smp, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on PowerPC SMP + This package provides restricted modules for Linux version 2.6.24 on + PowerPC SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-powerpc64-smp +Architecture: powerpc +Priority: optional +Depends: linux-image-2.6.24-24-powerpc64-smp, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on PowerPC 64-bit SMP + This package provides restricted modules for Linux version 2.6.24 on + PowerPC 64-bit SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-itanium +Architecture: ia64 +Priority: optional +Depends: linux-image-2.6.24-24-itanium, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on Itanium + This package provides restricted modules for Linux version 2.6.24 on + Itanium. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-mckinley +Architecture: ia64 +Priority: optional +Depends: linux-image-2.6.24-24-mckinley, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on Itanium 2 + This package provides restricted modules for Linux version 2.6.24 on + Itanium 2. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-hppa32 +Architecture: hppa +Priority: optional +Depends: linux-image-2.6.24-24-hppa32, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on 32-bit HPPA + This package provides restricted modules for Linux version 2.6.24 on + 32-bit HPPA. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-hppa64 +Architecture: hppa +Priority: optional +Depends: linux-image-2.6.24-24-hppa64, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on 64-bit HPPA + This package provides restricted modules for Linux version 2.6.24 on + 64-bit HPPA. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-lpia +Architecture: lpia +Priority: optional +Depends: linux-image-2.6.24-24-lpia, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on LPIA + This package provides restricted modules for Linux version 2.6.24 on + 32-bit LPIA + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-lpiacompat +Architecture: lpia +Priority: optional +Depends: linux-image-2.6.24-24-lpiacompat, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on LPIAcompat + This package provides restricted modules for Linux version 2.6.24 on + 32-bit LPIAcompat + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-sparc64 +Architecture: sparc +Priority: optional +Depends: linux-image-2.6.24-24-sparc64, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on 64-bit Sparc + This package provides restricted modules for Linux version 2.6.24 on + 64-bit Sparc. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-sparc64-smp +Architecture: sparc +Priority: optional +Depends: linux-image-2.6.24-24-sparc64-smp, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on 64-bit Sparc SMP + This package provides restricted modules for Linux version 2.6.24 on + 64-bit Sparc SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-xen +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-96.43.05, nvidia-kernel-71.86.04, nvidia-kernel-169.12 +Depends: linux-image-2.6.24-24-xen, linux-restricted-modules-common (>= 2.6.24), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-2.6.24-24 +Description: Non-free Linux 2.6.24 modules on Xen + This package provides restricted modules for Linux version 2.6.24 on + Xen dom0 and domU. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-openvz +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-96.43.05, nvidia-kernel-71.86.04, nvidia-kernel-169.12 +Depends: linux-image-2.6.24-24-openvz, linux-restricted-modules-common (>= 2.6.24), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-2.6.24-24 +Description: Non-free Linux 2.6.24 modules on OpenVZ Virtualization enabled kernel + This package provides restricted modules for Linux version 2.6.24 on + OpenVZ Virtualization enabled kernel. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + . + These modules are "restricted" because they are not available under a + completely Free licence. --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/split-module +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/split-module @@ -0,0 +1,61 @@ +#!/bin/bash + +set -e + +get_var() { + variable="$1" + dir="$2" + + tmp=$(tempfile) + cat < $tmp +split_module_print_value: + @echo \$($variable) + +include Makefile +EOF + make -f $tmp -C $dir --no-print-directory split_module_print_value CC="$CC" GCC="$GCC" + rm -f $tmp +} + +module="$1" +build_dir="$2" +install_dir="$3" + +case "$module" in + fcdsl|fcdsl2|fcdslsl|fcdslslusb|fcdslusb|fcdslusb2|fcdslusba|fcpci|fcpcmcia|fcusb|fwlanusb|fxusb) + export KERNELRELEASE=foo + extra_objs=../lib/$module-lib.o + objs_var="$module-objs" + ;; + fcpcmcia) + export KERNELRELEASE=foo + objs_var="fcpcmcia-objs" + ;; + fcpcmcia_cs) + export KERNELRELEASE=foo + objs_var= + extra_objs="fcpcmcia_cs.o" + ;; + *) + objs_var="$module-objs" + ;; +esac + +modpost=$module.mod.o + +if [ -n "$objs_var" ]; then + objs=$(get_var $objs_var $build_dir) + + if [ -z "$objs" ]; then + echo "split-module: failed to find objects for $module" >&2 + exit 1 + fi +fi + +install -d $install_dir/$module +for file in $objs $extra_objs $modpost; do + cp -v $build_dir/$file $install_dir/$module +done + +exit 0 + --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/xorg-driver-fglrx.postrm +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/xorg-driver-fglrx.postrm @@ -0,0 +1,65 @@ +#! /bin/sh +# postrm script for xorg-driver-fglrx +# +# see: dh_installdeb(1) + +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) + if [ "$(dpkg-divert --list /usr/lib/libGL.so.1 | awk '{ print $7 }')" = "xorg-driver-fglrx" ]; then + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/lib/fglrx/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/lib/fglrx/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + fi + if [ "$(dpkg-divert --list /usr/X11R6/lib32/libGL.so.1 | awk '{ print $7 }')" = "xorg-driver-fglrx" ]; then + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib32/fglrx/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + fi + if [ "$(dpkg-divert --list /usr/lib32/libGL.so.1 | awk '{ print $7 }')" = "xorg-driver-fglrx" ]; then + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/lib32/fglrx/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null + fi + if [ "$(dpkg-divert --list /usr/X11R6/lib/libGL.so.1 | awk '{ print $7 }')" = "xorg-driver-fglrx" ]; then + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib/fglrx/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib/fglrx/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + fi + + if [ -d /usr/lib/fglrx ]; then + rmdir /usr/lib/fglrx || true; + fi + if [ -d /usr/X11R6/lib/fglrx ]; then + rmdir /usr/X11R6/lib/fglrx || true; + fi + if [ -d /usr/X11R6/lib32/fglrx ]; then + rmdir /usr/X11R6/lib32/fglrx || true; + fi + if [ -d /usr/lib32/fglrx ]; then + rmdir /usr/lib32/fglrx || true; + fi + ldconfig + ;; + + 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# --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/copyright +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/copyright @@ -0,0 +1,517 @@ +This is the Debian GNU/Linux prepackaged version of restricted Linux modules. + +This package was put together by Herbert Xu +and Fabio M. Di Nitto in August 2004. + +This package has been created from the following source: + +madwifi: http://sourceforge.net/projects/madwifi/ +nvidia: ftp://download.nvidia.com/XFree86/Linux-x86/1.0-6111/NVIDIA-Linux-x86-1.0-6111-pkg0.run + based on Randall Donald Debian packages. +avm: ftp://ftp.avm.de/cardware + + +Copyright and Licenses: + +MADWIFI +------- + +Main Driver: + +All files contained in this distribution are covered by the following +copyright unless explicitly identified otherwise. + +/*- + * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any + * redistribution must be conditioned upon including a substantially + * similar Disclaimer requirement for further binary redistribution. + * 3. Neither the names of the above-listed copyright holders nor the names + * of any contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER + * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGES. + * + * $Id: COPYRIGHT,v 1.4 2004/01/13 18:05:41 samleffler Exp $ + */ + +HAL: + + +All files contained in this distribution are covered by the following +copyright unless explicitly identified otherwise. Note that this +copyright does _NOT_ contain a "or GPL" clause and does _NOT_ permit +redistribution with changes. + +/*- + * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros + * Communications, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that the following conditions are met: + * 1. The materials contained herein are unmodified and are used + * unmodified. + * 2. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following NO + * ''WARRANTY'' disclaimer below (''Disclaimer''), without + * modification. + * 3. Redistributions in binary form must reproduce at minimum a + * disclaimer similar to the Disclaimer below and any redistribution + * must be conditioned upon including a substantially similar + * Disclaimer requirement for further binary redistribution. + * 4. Neither the names of the above-listed copyright holders nor the + * names of any contributors may be used to endorse or promote + * product derived from this software without specific prior written + * permission. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, + * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE + * FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGES. + * + * $Id: COPYRIGHT,v 1.2 2004/05/15 22:26:24 samleffler Exp $ + */ + +NVIDIA: + +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. + +ATI FGLRX +--------- + +Packaging scripts: + Copyright (C) 2002-2004 Flavio Stanchina + Licensed under the GNU GPL + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The rest: + +ATI Software End User License Agreement + +PLEASE READ THIS LICENSE CAREFULLY BEFORE USING THE SOFTWARE. BY DOWNLOADING, INSTALLING, COPYING OR USING THE SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS LICENSE. IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, SIGNIFY YOUR AGREEMENT BY CLICKING THE “AGREE/ACCEPT” BUTTON. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENSE, PROMPTLY RETURN THE SOFTWARE TO THE PLACE WHERE YOU OBTAINED IT AND (IF APPLICABLE) YOUR MONEY WILL BE REFUNDED OR IF THE SOFTWARE WAS ACCESSED ELECTRONICALLY CLICK “DISAGREE/DECLINE”. + +1. License. ATI Technologies Inc., on behalf of itself, its subsidiaries and licensors (referred collectively as “ATI”) grants to you the following non-exclusive, right to use the software accompanying this License (hereinafter "Software") subject to the following terms and limitations: + +(a) Regardless of the media upon which it is distributed, the Software is licensed to you for use solely in conjunction with ATI hardware products to which the Software relates ("ATI Hardware"). + +(b) You own the medium on which the Software is recorded, but ATI and, if applicable, its licensors retain title to the Software and related documentation. + +(c) You may: + + i) use the Software solely in connection with the ATI Hardware on a single computer; + + ii) make one copy of the Software in machine-readable form for backup purposes only. You must reproduce on such copy ATI's copyright notice and any other proprietary legends that were on the original copy of the Software; + + iii) transfer all your license rights in the Software provided you must also transfer a copy of this License, the backup copy of the Software, the ATI Hardware and the related documentation and provided the other party reads and agrees to accept the terms and conditions of this License. Upon such transfer your license rights are then terminated. + +(d) In addition to the license terms above, with respect to portions of the Software in source code form designed exclusively for use with the Linux operating system (“ATI Linux Code”), you may use, display, modify, copy, distribute, allow others to re-distribute, package and re-package such ATI Linux Code for commercial and non-commercial purposes, provided that: + +i) all binary components of the ATI Linux Code are not modified in any way; + +ii)the ATI Linux Code is only used as part of the Software and in connection with ATI Hardware; + +iii)all copyright notices of ATI are reproduced and you refer to these license terms; + +iv) you may not offer or impose any terms on the use of ATI Linux Code that alter or restrict this License; and + +v) if you have modified the ATI Linux Code, such modifications will be made publicly available and are licensed under the same terms provided herein to ATI or any other third party without further restriction, royalty or any other license requirement; + +vi) to the extent there is any ATI sample or control panel source code included in the ATI Linux Code, no rights are granted to modify such code except for portions thereof that may be subject to third party license terms that grant such rights; and + +vii) ATI is not obligated to provide any maintenance or technical support for any code resulting from ATI Linux Code. + +2. Restrictions. The Software contains copyrighted and patented material, trade secrets and other proprietary material. In order to protect them, and except as permitted by this license or applicable legislation, you may not: + + a) decompile, reverse engineer, disassemble or otherwise reduce the Software to a human-perceivable form; + + b) modify, network, rent, lend, loan, distribute or create derivative works based upon the Software in whole or in part; or + + c) electronically transmit the Software from one computer to another or over a network or otherwise transfer the Software except as permitted by this License. + +3. Termination. This License is effective until terminated. You may terminate this License at any time by destroying the Software, related documentation and all copies thereof. This License will terminate immediately without notice from ATI if you fail to comply with any provision of this License. Upon termination you must destroy the Software, related documentation and all copies thereof. + +4. Government End Users. If you are acquiring the Software on behalf of any unit or agency of the United States Government, the following provisions apply. The Government agrees the Software and documentation were developed at private expense and are provided with "RESTRICTED RIGHTS". Use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 227.7202-1(a) and 227.7202-3(a) (1995), DFARS 252.227-7013(c)(1)(ii) (Oct 1988), FAR 12.212(a)(1995), FAR 52.227-19, (June 1987) or FAR 52.227-14(ALT III) (June 1987),as amended from time to time. In the event that this License, or any part thereof, is deemed inconsistent with the minimum rights identified in the Restricted Rights provisions, the minimum rights shall prevail. + +5. No Other License. No rights or licenses are granted by ATI under this License, expressly or by implication, with respect to any proprietary information or patent, copyright, trade secret or other intellectual property right owned or controlled by ATI, except as expressly provided in this License. + +6. Additional Licenses. DISTRIBUTION OR USE OF THE SOFTWARE WITH AN OPERATING SYSTEM MAY REQUIRE ADDITIONAL LICENSES FROM THE OPERATING SYSTEM VENDOR. + +7. Disclaimer of Warranty on Software. You expressly acknowledge and agree that use of the Software is at your sole risk. The Software and related documentation are provided "AS IS" and without warranty of any kind and ATI EXPRESSLY DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FORA PARTICULAR PURPOSE, OF QUALITY, OF QUIET ENJOYMENT AND OF NON-INFRINGEMENT OF THIRD PARTY RIGHTS. ATI DOES NOT WARRANT THAT THE FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT DEFECTS IN THE SOFTWARE WILL BE CORRECTED. THE ENTIRE RISK AS TO THE RESULTS AND PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. FURTHERMORE, ATI DOES NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE ORTHE RESULTS OF THE USE OF THE SOFTWARE OR RELATED DOCUMENTATION IN TERMS OF THEIR CORRECTNESS, ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE. NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY ATI OR ATI'S AUTHORIZED REPRESENTATIVE SHALL CREATE A WARRANTY OR IN ANY WAY INCREASE THE SCOPE OF THIS WARRANTY. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU (AND NOT ATI OR ATI'S AUTHORIZED REPRESENTATIVE) ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. THE SOFTWARE IS NOT INTENDED FOR USE IN MEDICAL, LIFE SAVING OR LIFE SUSTAINING APPLICATIONS. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO THE ABOVE EXCLUSION MAY NOT APPLY TO YOU. + +8. Limitation of Liability. TO THE MAXIMUM EXTENT PERMITTED BY LAW, UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL ATI, OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS, BE LIABLE TO YOU FOR ANY INCIDENTAL, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESSINFORMATION, AND THE LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE OR RELATED DOCUMENTATION, BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL PROPERTY RIGHT, BY ATI, EVEN IF ATI OR ATI'S AUTHORIZED REPRESENTATIVE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY TO YOU. ATI will not be liable for 1) loss of, or damage to, your records or data or 2) any damages claimed by you based on any third party claim. In no event shall ATI's total liability to you for all damages, losses, and causes of action (whether in contract, tort (including negligence) or otherwise) exceed the amount paid by you for the Software. The foregoing limitations will apply even if the above stated limitation fails of its essential purpose. + +9. Controlling Law and Severability. This License shall be governed by and construed under the laws of the Province of Ontario, Canada without reference to its conflict of law principles. Any dispute related hereto will be brought only in the courts in Toronto, Ontario, Canada and such courts are agreed to be the convenient forum. In the event of any conflicts between foreign law, rules, and regulations, and Canadian law, rules, and regulations, Canadian law, rules and regulations shall prevail and govern. The United Nations Convention on Contracts for the International Sale of Goods shall not apply to this License. If for any reason a court of competent jurisdiction finds any provision of this License or portion thereof, to be unenforceable, that provision of the License shall be enforced to the maximum extent permissible so as to effect the intent of the parties, and the remainder of this License shall continue in full force and effect. + +10. Complete Agreement. This License constitutes the entire agreement between the parties with respect to the use of the Software and the related documentation, and supersedes all prior or contemporaneous understandings or agreements, written or oral, regarding such subject matter. No amendment to or modification of this License will be binding unless in writing and signed by a duly authorized representative of ATI. + + +AVM FRITZ +--------- + +Upstream Author: AVM (http://www.avm.de/) + +License: + +The available AVM driver package consists of two portions, namely an Open +Source Software portion and a Proprietary Source Software portion. The +Proprietary Source Software portion is delivered in binary format only +and includes the firmware (.frm and .bin files) and object code (i.e. the +lib.o files and the drdsl executable). The object code, again, includes +libraries as well as specific portions of the driver. The Open Source +Software portion is licensed under the terms and conditions of the GNU +Lesser GPL (LGPL). Please be aware of the requirements of the LGPL. +You may easily download the terms of the LGPL as follows: +http://www.gnu.org/copyleft/lesser.html. + +On Debian GNU/Linux systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + +In general, you may distribute both portions of the available AVM driver +package, i.e. on a distribution CD delivered in conjunction with your +products. In addition to the terms of the LGPL and under all AVM +intellectual property and proprietary rights, AVM grants you the worldwide, +non-exclusive and royalty-free rights + + (1) to use and copy + + (2) to make (and have made), use, import, sell, offer for sale or + otherwise distribute any of your (legal) products or services + containing (portions of) the AVM driver package. + +The Proprietary Source Software, which is delivered in object code format +only, such as the firmware, the ".o files" and the "drdsl" binary, shall +in no event be disassembled, reverse engineered, decompiled or otherwise +"be opened" and the results realised insofar shall not be copied or +distributed without the prior written approval of AVM except to the extent +as may be expressly authorized under mandatory law and the terms of the LGPL. + +It is understood that you will be responsible/liable for the software which +you offer/distribute/make available in conjunction with or which you +combine with (portions of) the AVM driver package. For instance, we refer +to the implications mentioned in the LGPL in case of a breach (your rights +granted under LGPL would terminate automatically, see Art. 4 LGPL). You +should state clearly that you offer any necessary support on your own. + + + +LTMODEM +------- + +Agere Systems WinModem End User SOFTWARE LICENSE AGREEMENT + + +YOU SHOULD READ THE TERMS AND CONDITIONS OF THIS AGREEMENT BEFORE YOU DOWNLOAD AND USE THE AGERE SYSTEMS WINMODEM LICENSED SOFTWARE. ONCE YOU HAVE READ THIS LICENSE AGREEMENT AND AGREE TO ITS TERMS, YOU MAY DOWNLOAD AND USE THE AGERE SYSTEMS WINMODEM LICENSED SOFTWARE. DOWNLOADING OR USING THE AGERE SYSTEMS WINMODEM LICENSED SOFTWARE SHOWS YOUR ACCEPTANCE OF THE TERMS OF THIS LICENSE AGREEMENT. + +The terms and conditions of this Agreement will apply to the Agere Systems WinModem Software (hereafter "Software") supplied under this Agreement and any derivatives obtained therefrom, including any copy. The term Software includes programs and related documentation supplied herewith. + +The following file is made available under the standard Linux license, a copy of which may be found at . +serial.c +serial24.c + +These additional files are not derived from any Linux open source content, and are subject to the following restrictions. +ltmodem.c +linuxif.h +ltmdmobj.o +Makefile +ltinst +ltuninst +readme.txt + +1.0 TITLE AND LICENSE GRANT + + 1.1 The Software is copyrighted and/or contains proprietary information protected by law. All Software and all copies thereof are and will remain the sole property of Agere Systems or its suppliers. Agere Systems hereby grants you a non-exclusive right to use the Software, in whatever form recorded, which is furnished to you under or in contemplation of this Agreement, in an Agere Systems winmodem. Any other use of the Software or removal of the Software from a country in which use is licensed shall automatically terminate this license. + + 1.2 You agree to use your best efforts to see that any user of the Software licensed hereunder complies with the terms and conditions of this Agreement. + + +2.0 SOFTWARE USE + + 2.1 You are permitted to make copies of the Software provided that any such copy shall contain the same copyright notice and proprietary marking included on the original Software. + + 2.2 You agree not to merge or combine any portion of the Software with any other software, other than the Linux operating system, unless expressly permitted by the laws of the jurisdiction where you are located. Any portion of the Software merged or combined with the other software will continue to be the subject of the terms and conditions of this Agreement and you agree to reproduce on the merged or combined portion of the Software the copyright and other proprietary rights notices included in the original Software. + +2.3 Redistribution and Usage + Agere permits use and limited redistribution of this Licensed Software in source and binary forms, with or without modification, subject to the following terms and conditions, in addition to the terms mentioned in this agreement. +2.3.1 Agere Systems reserves the right not to allow a third party to reuse or redistribute the software, at its sole discretion. +2.3.2 User hereby agrees not to remove or alter any copyright, trademark, credits and other proprietary notices contained within or associated with the Licensed Software, and shall include all such unaltered copyright, trademark, credits and other proprietary notices on or in every copy of the Software. +2.3.3 Notwithstanding any other provisions in this Agreement to the contrary, any modifications or alterations made to the Licensed Software shall cause any warranties and intellectual property indemnifications to become null and void and of no further effect. + +3.0 DISCLAIMER OF WARRANTY + + 3.1 You understand and acknowledge that the Software may contain errors, bugs or other defects. The Software is provided on AS-IS basis, without warranty of any kind. + + 3.2 Agere Systems has used reasonable efforts to minimize defects or errors in the Software. HOWEVER, YOU ASSUME THE RISK OF ANY AND ALL DAMAGE OR LOSS FROM USE OR INABILITY TO USE THE SOFTWARE. Specifically, but not in limitation of the foregoing disclaimers, Agere Systems does not warrant that the functions of the Software will meet your requirements or that the Software operation will be error-free or uninterrupted. + + 3.3 Agere Systems bears no responsibility for supplying assistance for fixing or for communicating known errors to you pertaining to the Software supplied hereunder. + + 3.4 YOU UNDERSTAND THAT AGERE SYSTEMS, ITS AFFILIATES, CONTRACTORS, SUPPLIERS, AND AGENTS MAKE NO WARRANTIES, EXPRESS OR IMPLIED, AND SPECIFICALLY DISCLAIM ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + +4.0 EXCLUSIVE REMEDIES AND LIMITATION OF LIABILITIES + + 4.1 Regardless of any other provisions of this Agreement, neither Agere Systems nor its affiliates, contractors, suppliers, or agents shall be liable for any indirect, incidental, or consequential damages (including lost profits) sustained or incurred in connection with the use, operation, or inability to use the Software or for damages due to causes beyond the reasonable control of Agere Systems, its affiliates, contractors, suppliers, and agents attributable to any service, products, or action of any other person. + + 4.2 This Agreement shall be construed in accordance with and governed by the laws of the State of New York. + +YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT AND UNDERSTAND IT, AND THAT BY DOWNLOADING OR USING THE SOFTWARE, YOU AGREE TO BE BOUND BY ITS TERMS AND CONDITIONS. YOU FURTHER AGREE THAT THIS AGREEMENT IS THE COMPLETE AND EXCLUSIVE STATEMENT OF THE RIGHTS AND LIABILITIES OF THE PARTIES. THIS AGREEMENT SUPERCEDES ALL PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, AND ANY OTHER COMMUNICATIONS BETWEEN US RELATING TO THE SUBJECT MATTER OF THIS AGREEMENT. + + +IPW3945d +-------- + +Copyright (c) 2006, Intel Corporation. +All rights reserved. + +Redistribution. Redistribution and use in binary form, without +modification, are permitted provided that the following conditions are +met: + +* Redistributions must reproduce the above copyright notice and the + following disclaimer in the documentation and/or other materials + provided with the distribution. +* Neither the name of Intel Corporation nor the names of its suppliers + may be used to endorse or promote products derived from this software + without specific prior written permission. +* No reverse engineering, decompilation, or disassembly of this software + is permitted. + +Limited patent license. Intel Corporation grants a world-wide, +royalty-free, non-exclusive license under patents it now or hereafter +owns or controls to make, have made, use, import, offer to sell and +sell ("Utilize") this software, but solely to the extent that any +such patent is necessary to Utilize the software alone, or in +combination with an operating system licensed under an approved Open +Source license as listed by the Open Source Initiative at +http://opensource.org/licenses. The patent license shall not apply to +any other combinations which include this software. No hardware per +se is licensed hereunder. + +DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx-dev.links.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx-dev.links.in @@ -0,0 +1 @@ +usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx-dev.postrm.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx-dev.postrm.in @@ -0,0 +1,48 @@ +#! /bin/sh +# postrm script for nvidia-glx +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + remove) + if [ "$(dpkg-divert --list /usr/lib/nvidia/libGL.so.xlibmesa | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null + fi + if [ "$(dpkg-divert --list /usr/X11R6/lib/nvidia/libGL.so.xlibmesa | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null + fi + if [ "$(dpkg-divert --list /usr/lib/nvidia/libGL.a.xlibmesa | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null + fi + if [ "$(dpkg-divert --list /usr/X11R6/lib/nvidia/libGL.a.xlibmesa | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null + fi + + if [ -d /usr/lib/nvidia ]; then + rmdir /usr/lib/nvidia || true; + + fi + if [ -d /usr/X11R6/lib/nvidia ]; then + rmdir /usr/X11R6/lib/nvidia || true; + + fi + + ;; + + 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# --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/linux-restricted-modules-generic.postinst +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/linux-restricted-modules-generic.postinst @@ -0,0 +1,7 @@ +#!/bin/sh + +case "$1" in + configure) + lrm-manager --kver=generic + ;; +esac --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/rules +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/rules @@ -0,0 +1,1245 @@ +#!/usr/bin/make -f +# +# Copyright (c) 2004 Herbert Xu +# Copyright (c) 2004-2005 Canonical Ltd. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# dpkg-buildpackage passes options that are incomptatible +# with the kernel build. +unexport CFLAGS +unexport LDFLAGS + +SHELL := sh -e + +# Common variables for all architectures +include debian/rules.d/0-common-vars.mk + +# Maintainer targets +include debian/rules.d/1-maintainer.mk + +prefix := $(CURDIR)/debian/linux-restricted-modules +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +udeb_prefix := $(CURDIR)/debian/d-i-$(DEB_HOST_ARCH) + +export CC=gcc +export GCC=gcc + +# nvidia +nv_base_version=1.0 +nv_release := 96.43.05 +nv_upstreamversion := ${nv_release} +nv_version := ${nv_release} +nv_new_release := 169.12 +nv_new_upstreamversion := ${nv_new_release} +nv_new_version := ${nv_new_release} +nv_legacy_release := 71.86.04 +nv_legacy_upstreamversion := ${nv_legacy_release} +nv_legacy_version := ${nv_legacy_release} + +# fglrx +ati_xorg_base_version = 7.1.0 +ati_revision = 8-3 +ati_upstreamversion = ${ati_revision} +ati_xorg_version = ${ati_xorg_base_version}-${ati_revision} +ati_shar = ati-driver-installer-${ati_revision}-x86.x86_64.run + +# fritz avm +avm_base_version = 3.11 +#avm_version = ${avm_base_version}-${avm_revision} +avm_version = ${avm_base_version} +pkg_avmfw := $(shell awk '/Package: avm-fritz-firmware/ {print $$2}' debian/control.stub) +avmfw_dir = $(subst avm-fritz-firmware-,,$(pkg_avmfw)) + +# ltmodem +ltm_base_version = 8.31+2.6-alk-9 +ltm_url = http://linmodems.technion.ac.il/packages/ltmodem/kernel-2.6/ + +# madwifi +madwifi_version = 0.9.4 + +# broadcom wireless +bcmwl_dir = bcmwl + +# vmware-player +vmplay_dir = $(CURDIR)/debian/vmware-player-kernel-modules-$(kernel_abi_version) +vmserv_dir = $(CURDIR)/debian/vmware-server-kernel-modules-$(kernel_abi_version) +vmtool_dir = $(CURDIR)/debian/vmware-tools-kernel-modules-$(kernel_abi_version) + +FGLRX := 1 +NVIDIA := 1 +MADWIFI := 1 +BCMWL := 1 +FRITZ := 1 +LTMODEM := 1 +VMWARE := 0 +VMDESCHED := 1 + +ifeq "$(DEB_HOST_ARCH)" "i386" +export karch=i386 +mw_target := TARGET=i386-elf + +nv_filename := NVIDIA-Linux-x86-${nv_upstreamversion}-pkg1.run +nv_dirname := nvidia/NVIDIA-Linux-x86-${nv_upstreamversion}-pkg1 +nv_url := http://download.nvidia.com/XFree86/Linux-x86/${nv_upstreamversion}/${nv_filename} + +nv_new_filename := NVIDIA-Linux-x86-${nv_new_upstreamversion}-pkg1.run +nv_new_dirname := nvidia/NVIDIA-Linux-x86-${nv_new_upstreamversion}-pkg1 +nv_new_url := http://download.nvidia.com/XFree86/Linux-x86/${nv_new_upstreamversion}/${nv_new_filename} + +nv_legacy_filename := NVIDIA-Linux-x86-${nv_legacy_upstreamversion}-pkg1.run +nv_legacy_dirname := nvidia/NVIDIA-Linux-x86-${nv_legacy_upstreamversion}-pkg1 +nv_legacy_url := http://download.nvidia.com/XFree86/Linux-x86/${nv_legacy_upstreamversion}/${nv_legacy_filename} + +ati_package = fglrx +ati_url = http://www2.ati.com/drivers/linux/fglrx_${ati_revision}.zip +ati_archdir = x86 +ati_nativelibdir = lib +ati_xorg_dir = x710 +fritz_dir := fritz +split_fritz_modules += \ + fcdsl/src/fcdsl \ + fcdsl2/src/fcdsl2 \ + fcdslsl/src/fcdslsl \ + fcdslslusb/src/fcdslslusb \ + fcdslusb/1/fritz/src/fcdslusb \ + fcdslusb/2/fritz/src/fcdslusb2 \ + fcdslusba/src/fcdslusba \ + fcpci/src/fcpci \ + fcusb/src/fcusb \ + fwlanusb/src/fwlanusb \ + fxusb/src/fxusb +flavours := $(addprefix $(kernel_abi_version)-,generic 386 openvz rt server xen) +ati_flavours := $(addprefix $(kernel_abi_version)-,generic 386 openvz rt server xen) +nv_flavours := $(addprefix $(kernel_abi_version)-,generic 386 openvz rt server) +vmware_server_extra_flavours := $(addprefix $(kernel_abi_version)-,server) +vmware_tools_extra_flavours := $(addprefix $(kernel_abi_version)-,server) +endif + +ifeq "$(DEB_HOST_ARCH)" "amd64" +export karch=x86_64 +mw_target := TARGET=x86_64-elf + +nv_filename := NVIDIA-Linux-x86_64-${nv_upstreamversion}-pkg2.run +nv_dirname := nvidia/NVIDIA-Linux-x86_64-${nv_upstreamversion}-pkg2 +nv_url := http://download.nvidia.com/XFree86/Linux-x86_64/${nv_upstreamversion}/${nv_filename} + +nv_new_filename := NVIDIA-Linux-x86_64-${nv_new_upstreamversion}-pkg2.run +nv_new_dirname := nvidia/NVIDIA-Linux-x86_64-${nv_new_upstreamversion}-pkg2 +nv_new_url := http://download.nvidia.com/XFree86/Linux-x86_64/${nv_new_upstreamversion}/${nv_new_filename} + +nv_legacy_filename := NVIDIA-Linux-x86_64-${nv_legacy_upstreamversion}-pkg2.run +nv_legacy_dirname := nvidia/NVIDIA-Linux-x86_64-${nv_legacy_upstreamversion}-pkg2 +nv_legacy_url := http://download.nvidia.com/XFree86/Linux-x86_64/${nv_legacy_upstreamversion}/${nv_legacy_filename} + +ati_package := fglrx64 +ati_url = http://www2.ati.com/drivers/linux/fglrx64_${ati_revision}.zip +ati_archdir = x86_64 +ati_nativelibdir = lib64 +ati_xorg_dir = x710_64a +fritz_dir := fritz64 +split_fritz_modules += \ + fcdsl2/src/fcdsl2 \ + fcdslsl/src/fcdslsl \ + fcdslslusb/src/fcdslslusb \ + fcdslusb/1/fritz/src/fcdslusb \ + fcdslusb/2/fritz/src/fcdslusb2 \ + fcpci/src/fcpci +flavours := $(addprefix $(kernel_abi_version)-,generic openvz rt server xen) +ati_flavours := $(addprefix $(kernel_abi_version)-,generic openvz rt server xen) +nv_flavours := $(addprefix $(kernel_abi_version)-,generic openvz rt server) +LTMODEM := 0 # no Winmodem support +VMDESCHED := 0 +vmware_server_extra_flavours := $(addprefix $(kernel_abi_version)-,server) +vmware_tools_extra_flavours := $(addprefix $(kernel_abi_version)-,server) +endif + +ifeq "$(DEB_HOST_ARCH)" "ia64" +export karch=ia64 +mw_target := TARGET=ia64-elf +flavours := $(addprefix $(kernel_abi_version)-,itanium mckinley) + +NVIDIA := 0 # no real upstream nvidia support +FGLRX := 0 # no fireGL support yet +MADWIFI := 0 # no madwifi support yet +BCMWL := 0 # no Broadcom wireless support yet +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +VMWARE := 0 # no vmware player support +endif + +ifeq "$(DEB_HOST_ARCH)" "powerpc" +export karch=powerpc +mw_target := TARGET=powerpc-be-elf +flavours := $(addprefix $(kernel_abi_version)-,powerpc powerpc-smp powerpc64-smp) + +NVIDIA := 0 # no nVidia support yet +FGLRX := 0 # no FireGL support yet +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +VMWARE := 0 # no vmware player supportt +BCMWL := 0 # no Broadcom wireless support yet +endif + +ifeq "$(DEB_HOST_ARCH)" "hppa" +export karch=hppa +mw_target := TARGET=hppa-be-elf +flavours := $(addprefix $(kernel_abi_version)-,hppa32 hppa64) + +NVIDIA := 0 # no nVidia support yet +FGLRX := 0 # no FireGL support yet +MADWIFI := 0 # no madwifi support yet +BCMWL := 0 # no Broadcom wireless support yet +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +VMWARE := 0 # no vmware player supportt +endif + +ifeq "$(DEB_HOST_ARCH)" "lpia" +export karch=i386 +mw_target := TARGET=i386-elf +flavours := $(addprefix $(kernel_abi_version)-,lpia lpiacompat) + +NVIDIA := 0 # no nVidia support yet +FGLRX := 0 # no FireGL support yet +MADWIFI := 1 +BCMWL := 1 +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +VMWARE := 0 # no vmware player supportt +endif + + +ifeq "$(DEB_HOST_ARCH)" "sparc" +export karch=sparc +mw_target := TARGET=sparc-be-elf +flavours := $(addprefix $(kernel_abi_version)-,sparc64 sparc64-smp) + +NVIDIA := 0 # no nVidia support yet +FGLRX := 0 # no FireGL support yet +MADWIFI := 0 # no madwifi support yet +BCMWL := 0 # no Broadcom wireless support yet +FRITZ := 0 # no AVM Fritz support +LTMODEM := 0 # no Winmodem support +VMWARE := 0 # no vmware player supportt +endif + +flavours_udeb := $(shell grep ^$(DEB_HOST_ARCH) debian/d-i/kernel-versions | awk '{print $$4}') + +split_modules := +ifeq "$(FGLRX)" "1" +split_modules += ati/build_mod/2.6.x/fglrx +endif +ifeq "$(MADWIFI)" "1" +split_modules += madwifi/ath_hal/ath_hal +endif +ifeq "$(FRITZ)" "1" +split_modules += $(split_fritz_modules) +endif +ifeq "$(LTMODEM)" "1" +split_modules += ltmodem/ltmodem ltmodem/ltserial +endif +ifeq "$(BCMWL)" "1" +split_modules += $(bcmwl_dir)/wl +endif + +builddir := $(CURDIR)/debian/build +rbuilddir := debian/build + +download-avm: + rm -rf fritz fritz64 + python debian/getavmcardware.py + : # cleanup files we don't want in the archive + -find fritz fritz64 -name '*.ko' -o -name '*.rpm' | xargs rm -f + +unpack: unpack-stamp unpack-avm-stamp +unpack-stamp: + dh_testdir + + if [ -e debian/build ]; then \ + mv debian/build debian/build.old; \ + fi + mkdir debian/build + + for i in $(flavours) $(vmware_server_extra_flavours) $(vmware_tools_extra_flavours); do \ + mkdir -p debian/build/$$i; \ + done + +ifeq "$(FGLRX)" "1" + mkdir $(builddir)/ati-xorg + cd $(builddir)/ati-xorg; \ + $(SHELL) $(CURDIR)/ati/${ati_shar} --extract .; \ + chmod u+rw . -R; \ + if [ -d $(CURDIR)/ati/patches/ ]; then \ + for i in $(CURDIR)/ati/patches/*; do \ + patch -p0 -d $(builddir)/ati-xorg/ < $$i; \ + done; \ + fi; + + for i in $(ati_flavours); do \ + cp -al $(builddir)/ati-xorg/common/lib/modules/fglrx \ + $(builddir)/$$i/ati; \ + cp -a $(builddir)/ati-xorg/arch/$(ati_archdir)/lib/modules/fglrx/build_mod/* $(builddir)/$$i/ati/build_mod; \ + done +endif + + +ifeq "$(MADWIFI)" "1" + cd $(builddir)/; \ + tar zxf $(CURDIR)/madwifi/madwifi-$(madwifi_version).tar.gz; \ + if [ -d $(CURDIR)/madwifi/patches/ ]; then \ + for i in $(CURDIR)/madwifi/patches/*; do \ + patch -p0 -d $(builddir)/madwifi-$(madwifi_version) < $$i; \ + done; \ + fi + + for i in $(flavours); do \ + if [ "$$i" = "$(kernel_abi_version)-powerpc64-smp" ]; then \ + echo "Not building madwifi drivers for $(kernel_abi_version)-powerpc64-smp"; \ + else \ + cp -al $(builddir)/madwifi-$(madwifi_version) $(builddir)/$$i/madwifi; \ + fi; \ + done +endif + +ifeq "$(BCMWL)" "1" + for i in $(flavours); do \ + mkdir -p $(builddir)/$$i/$(bcmwl_dir); \ + cp -a $(CURDIR)/broadcom/* $(builddir)/$$i/$(bcmwl_dir); \ + if [ -d $(CURDIR)/broadcom/patches/ ]; then \ + for p in $(CURDIR)/broadcom/patches/*; do \ + patch -p2 -d $(builddir)/$$i/$(bcmwl_dir) < $$p; \ + done; \ + fi \ + done +endif + +ifeq "$(LTMODEM)" "1" + for i in $(flavours); do \ + cp -a ltmodem debian/build/$$i; \ + if [ -d $(CURDIR)/ltmodem/patches/ ]; then \ + for j in $(CURDIR)/ltmodem/patches/*; do \ + patch -p0 -d debian/build/$$i/ltmodem/ < $$j; \ + done; \ + fi; \ + done +endif + +ifeq "$(NVIDIA)" "1" + cd nvidia && sh ./$(nv_filename) --extract-only + cd nvidia && sh ./$(nv_new_filename) --extract-only + cd nvidia && sh ./$(nv_legacy_filename) --extract-only + + if [ -d $(CURDIR)/nvidia/patches/ ]; then \ + for i in $(CURDIR)/nvidia/patches/*; do \ + patch -p0 -d ${nv_dirname} < $$i; \ + done; \ + fi + + if [ -d $(CURDIR)/nvidia/patches-new/ ]; then \ + for i in $(CURDIR)/nvidia/patches-new/*; do \ + patch -p0 -d ${nv_new_dirname} < $$i; \ + done; \ + fi + + if [ -d $(CURDIR)/nvidia/patches-legacy/ ]; then \ + for i in $(CURDIR)/nvidia/patches-legacy/*; do \ + patch -p0 -d ${nv_legacy_dirname} < $$i; \ + done; \ + fi + + cd ${nv_dirname}/usr/src/nv && ln -sf Makefile.kbuild Makefile + cd ${nv_new_dirname}/usr/src/nv && ln -sf Makefile.kbuild Makefile + cd ${nv_legacy_dirname}/usr/src/nv && ln -sf Makefile.kbuild Makefile + + for i in $(nv_flavours); do \ + cp -a ${nv_dirname}/usr/src/nv debian/build/$$i/nv; \ + cp -a ${nv_new_dirname}/usr/src/nv debian/build/$$i/nv-new; \ + cp -a ${nv_legacy_dirname}/usr/src/nv debian/build/$$i/nv-legacy; \ + done + + for i in -dev.dirs -dev.links -dev.postinst -dev.postrm \ + -dev.preinst .dirs .docs .examples .links.amd64 \ + .links .override .postinst .postrm .preinst \ + .prerm .README.Debian .reportbug .shlibs; \ + do sed -e "s/@@VERSION@@/$(nv_new_version)/g" -e "s/@@NV_LEGACY@@/-new/g" \ + -e "s:@dirname@:$(nv_new_dirname):" -e "s/@@NV_ALT@@/new/g" \ + < debian/nvidia-glx$$i.in > debian/nvidia-glx-new$$i; \ + done + + for i in -dev.dirs -dev.links -dev.postinst -dev.postrm \ + -dev.preinst .dirs .docs .examples .links.amd64 \ + .links .override .postinst .postrm .preinst \ + .prerm .README.Debian .reportbug .shlibs; \ + do sed -e "s/@@VERSION@@/$(nv_version)/g" -e "s/@@NV_LEGACY@@//g" \ + -e "s:@dirname@:$(nv_dirname):" -e "s/@@NV_ALT@@//g" \ + < debian/nvidia-glx$$i.in > debian/nvidia-glx$$i; \ + done + + for i in -dev.dirs -dev.links -dev.postinst -dev.postrm \ + -dev.preinst .dirs .docs .examples .links.amd64 \ + .links .override .postinst .postrm .preinst \ + .prerm .README.Debian .reportbug .shlibs; \ + do sed -e "s/@@VERSION@@/$(nv_legacy_version)/g" -e "s/@@NV_LEGACY@@/-legacy/g" \ + -e "s:@dirname@:$(nv_legacy_dirname):" -e "s/@@NV_ALT@@/legacy/g" \ + < debian/nvidia-glx$$i.in > debian/nvidia-glx-legacy$$i; \ + done +endif + for i in $(flavours); do \ + sed -e "s/@@KVERSION@@/$$i/g;" debian/linux-restricted-modules.postinst \ + > debian/linux-restricted-modules-$$i.postinst; \ + sed -e "s/@@KVERSION@@/$$i/g;" debian/linux-restricted-modules.postrm \ + > debian/linux-restricted-modules-$$i.postrm; \ + done + +ifeq "$(VMWARE)" "1" + mkdir $(builddir)/vmware-player + cd $(builddir)/vmware-player; \ + tar xf $(CURDIR)/vmware-player/vmmon.tar; \ + tar xf $(CURDIR)/vmware-player/vmnet.tar; \ + if [ -d $(CURDIR)/vmware-player/patches/ ]; then \ + for i in $(CURDIR)/vmware-player/patches/*; do \ + patch -p0 -d $(builddir)/vmware-player < $$i; \ + done; \ + fi + + mkdir $(builddir)/vmware-server + cd $(builddir)/vmware-server; \ + tar xf $(CURDIR)/vmware-server/vmmon.tar; \ + tar xf $(CURDIR)/vmware-server/vmnet.tar; \ + if [ -d $(CURDIR)/vmware-server/patches/ ]; then \ + for i in $(CURDIR)/vmware-server/patches/*; do \ + patch -p0 -d $(builddir)/vmware-server < $$i; \ + done; \ + fi + + mkdir $(builddir)/vmware-tools + cd $(builddir)/vmware-tools; \ + tar xf $(CURDIR)/vmware-tools/vmdesched.tar; \ + tar xf $(CURDIR)/vmware-tools/vmmemctl.tar; \ + tar xf $(CURDIR)/vmware-tools/vmxnet.tar; \ + if [ -d $(CURDIR)/vmware-tools/patches/ ]; then \ + for i in $(CURDIR)/vmware-tools/patches/*; do \ + patch -p0 -d $(builddir)/vmware-tools < $$i; \ + done; \ + fi + + for i in $(flavours); do \ + cp -a $(builddir)/vmware-player $(builddir)/$$i/; \ + done + + for i in $(flavours) $(vmware_tools_extra_flavours); do \ + cp -a $(builddir)/vmware-tools $(builddir)/$$i/; \ + done + + for i in $(flavours) $(vmware_server_extra_flavours); do \ + cp -a $(builddir)/vmware-server $(builddir)/$$i/; \ + done + + for i in player server tools; do \ + sed -e "s/@@KVERSION@@/$$i/g;" debian/vmware-kernel-modules.postinst > \ + debian/vmware-$$i-kernel-modules-$(kernel_abi_version).postinst; \ + sed -e "s/@@KVERSION@@/$$i/g;" debian/vmware-kernel-modules.postrm > \ + debian/vmware-$$i-kernel-modules-$(kernel_abi_version).postrm; \ + done +endif + + touch unpack-stamp + +unpack-avm-stamp: +ifeq "$(FRITZ)" "1" +ifeq "$(DEB_HOST_ARCH)" "i386" + cd fritz/fwlanusb/lib && uudecode fwlanusb-lib.o.uu +endif + for i in $(flavours); do \ + mkdir -p debian/build/$$i; \ + for f in $(fritz_dir)/*; do \ + cp -a $$f debian/build/$$i; \ + done; \ + if [ -d $(fritz_dir)/patches ] ; then \ + for p in $(fritz_dir)/patches/* ; do \ + patch -d debian/build/$$i -p0 < $$p; \ + done; \ + fi; \ + done +endif + touch unpack-avm-stamp + +build-kernel: build-kernel-stamp +build-kernel-stamp: unpack-stamp + dh_testdir + dh_testroot + + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel/debian + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-kernel/nv + cp -r $(CURDIR)/nvidia/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-kernel/debian + set +e && for f in `ls $(CURDIR)/nvidia/debian.binary` ; do \ + perl -p \ + -e 's{#BASE_VERSION#}{$(nv_base_version)}g;' \ + -e 's{#RELEASE#}{$(nv_release)}g;' \ + -e 's{#VERSION#}{$(nv_version)}g;' \ + -e 's{#UPSTREAMVERSION#}{$(nv_upstreamversion)}g;' \ + -e 's{#URL#}{$(nv_url)}g' \ + < $(CURDIR)/nvidia/debian.binary/$$f \ + > $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/$$f ; \ + chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/$$f ; \ + done + #chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/patches + cp -a $(nv_dirname)/usr/src/nv $(CURDIR)/debian/temp/modules/nvidia-kernel || true + rm -f $(CURDIR)/debian/temp/modules/nvidia-kernel/nv/Makefile + chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/rules + chown -R root:src $(CURDIR)/debian/temp/modules + rm -rf $(CURDIR)/debian/temp/modules/nvidia-kernel/nv/precompiled + tar -zcvf $(CURDIR)/nvidia-kernel-source.tar.gz -C $(CURDIR)/debian/temp modules + rm -rf debian/temp + + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/nv + cp -r $(CURDIR)/nvidia/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian + set +e && for f in `ls $(CURDIR)/nvidia/debian.binary` ; do \ + perl -p \ + -e 's{#BASE_VERSION#}{$(nv_base_version)}g;' \ + -e 's{#RELEASE#}{$(nv_legacy_release)}g;' \ + -e 's{#VERSION#}{$(nv_legacy_version)}g;' \ + -e 's{#UPSTREAMVERSION#}{$(nv_legacy_upstreamversion)}g;' \ + -e 's{#URL#}{$(nv_legacy_url)}g' \ + < $(CURDIR)/nvidia/debian.binary/$$f \ + > $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian/$$f ; \ + chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian/$$f ; \ + done + #chmod 755 $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian/patches + cp -a $(nv_legacy_dirname)/usr/src/nv $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel || true + rm -f $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/nv/Makefile + chmod 755 $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/debian/rules + chown -R root:src $(CURDIR)/debian/temp/modules + rm -rf $(CURDIR)/debian/temp/modules/nvidia-legacy-kernel/nv/precompiled + tar -zcvf $(CURDIR)/nvidia-legacy-kernel-source.tar.gz -C $(CURDIR)/debian/temp modules + rm -rf debian/temp + + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-new-kernel/debian + mkdir -p $(CURDIR)/debian/temp/modules/nvidia-new-kernel/nv + cp -r $(CURDIR)/nvidia/debian.binary/* $(CURDIR)/debian/temp/modules/nvidia-new-kernel/debian + set +e && for f in `ls $(CURDIR)/nvidia/debian.binary` ; do \ + perl -p \ + -e 's{#BASE_VERSION#}{$(nv_base_version)}g;' \ + -e 's{#RELEASE#}{$(nv_new_release)}g;' \ + -e 's{#VERSION#}{$(nv_new_version)}g;' \ + -e 's{#UPSTREAMVERSION#}{$(nv_new_upstreamversion)}g;' \ + -e 's{#URL#}{$(nv_new_url)}g' \ + < $(CURDIR)/nvidia/debian.binary/$$f \ + > $(CURDIR)/debian/temp/modules/nvidia-new-kernel/debian/$$f ; \ + chmod 0644 $(CURDIR)/debian/temp/modules/nvidia-new-kernel/debian/$$f ; \ + done + #chmod 755 $(CURDIR)/debian/temp/modules/nvidia-new-kernel/debian/patches + cp -a $(nv_new_dirname)/usr/src/nv $(CURDIR)/debian/temp/modules/nvidia-new-kernel || true + rm -f $(CURDIR)/debian/temp/modules/nvidia-new-kernel/nv/Makefile + chmod 755 $(CURDIR)/debian/temp/modules/nvidia-new-kernel/debian/rules + chown -R root:src $(CURDIR)/debian/temp/modules + rm -rf $(CURDIR)/debian/temp/modules/nvidia-new-kernel/nv/precompiled + tar -zcvf $(CURDIR)/nvidia-new-kernel-source.tar.gz -C $(CURDIR)/debian/temp modules + rm -rf debian/temp + + mkdir -p $(CURDIR)/debian/temp/modules/fglrx-kernel/debian + mkdir -p $(CURDIR)/debian/temp/modules/fglrx-kernel/fglrx + cp -r $(CURDIR)/ati/debian.binary/* $(CURDIR)/debian/temp/modules/fglrx-kernel/debian + set +e && for f in `ls $(CURDIR)/ati/debian.binary` ; do \ + perl -p \ + -e 's{#BASE_VERSION#}{$(ati_xorg_base_version)}g;' \ + -e 's{#REVISION#}{$(ati_revision)}g;' \ + -e 's{#VERSION#}{$(ati_xorg_version)}g;' \ + -e 's{#UPSTREAMVERSION#}{$(ati_upstreamversion)}g;' \ + -e 's{#URL#}{$(ati_url)}g' \ + < $(CURDIR)/ati/debian.binary/$$f \ + > $(CURDIR)/debian/temp/modules/fglrx-kernel/debian/$$f ; \ + chmod 0644 $(CURDIR)/debian/temp/modules/fglrx-kernel/debian/$$f ; \ + done + cp -a debian/build/ati-xorg/common/lib/modules/fglrx $(CURDIR)/debian/temp/modules/fglrx-kernel || true + chmod 755 $(CURDIR)/debian/temp/modules/fglrx-kernel/debian/rules + chown -R root:src $(CURDIR)/debian/temp/modules + tar -zcvf $(CURDIR)/fglrx-kernel-source.tar.gz -C debian/temp modules + rm -rf debian/temp + + touch build-kernel-stamp + +build: build-stamp build-avm-stamp modalias-patterns-stamp debian/control +build-stamp: unpack-stamp + dh_testdir + +ifeq "$(BCMWL)" "1" + for i in $(flavours); do \ + make karch=$(karch) -C /usr/src/linux-headers-$$i M=$(shell pwd)/debian/build/$$i/$(bcmwl_dir); \ + done +endif + +ifeq "$(MADWIFI)" "1" + for i in $(flavours); do \ + if [ "$$i" = "$(kernel_abi_version)-powerpc64-smp" ]; then \ + echo "Not building madwifi drivers for $(kernel_abi_version)-powerpc64-smp"; \ + else \ + make karch=$(karch) -C debian/build/$$i/madwifi \ + KERNELPATH=/usr/src/linux-headers-$$i $(mw_target); \ + fi; \ + done +endif + +ifeq "$(VMWARE)" "1" + for i in $(flavours); do \ + $(MAKE) -C $(builddir)/$$i/vmware-player/vmmon-only VM_UNAME=$$i; \ + $(MAKE) -C $(builddir)/$$i/vmware-player/vmnet-only VM_UNAME=$$i; \ + done + + for i in $(flavours) $(vmware_server_extra_flavours); do \ + $(MAKE) -C $(builddir)/$$i/vmware-server/vmmon-only VM_UNAME=$$i; \ + $(MAKE) -C $(builddir)/$$i/vmware-server/vmnet-only VM_UNAME=$$i; \ + done + + for i in $(flavours) $(vmware_tools_extra_flavours); do \ + $(MAKE) -C $(builddir)/$$i/vmware-tools/vmmemctl-only VM_UNAME=$$i; \ + $(MAKE) -C $(builddir)/$$i/vmware-tools/vmxnet-only VM_UNAME=$$i; \ + if [ "$(VMDESCHED)" = "1" ]; then \ + $(MAKE) -C $(builddir)/$$i/vmware-tools/vmdesched-only VM_UNAME=$$i; \ + fi; \ + done +endif + +ifeq "$(LTMODEM)" "1" + for i in $(flavours); do \ + $(MAKE) -C $(builddir)/$$i/ltmodem \ + KERNEL_DIR=/usr/src/linux-headers-$$i module; \ + done +endif + +ifeq "$(FGLRX)" "1" + for i in $(ati_flavours); do \ + $(MAKE) -C $(builddir)/$$i/ati/build_mod/2.6.x \ + KDIR=/usr/src/linux-headers-$$i; \ + done +endif + +ifeq "$(NVIDIA)" "1" + for i in $(nv_flavours); do \ + cd debian/build/$$i; \ + export IGNORE_XEN_PRESENCE=1; \ + $(ROOT_CMD) make -C $(builddir)/$$i/nv-new -f Makefile SYSSRC=/usr/src/linux-headers-$$i KBUILD_PARAMS="-C /usr/src/linux-headers-$$i SUBDIRS=$(builddir)/$$i/nv-new" module; \ + if [ "$$i" != "$(kernel_abi_version)-xen" ]; then \ + $(ROOT_CMD) make -C $(builddir)/$$i/nv -f Makefile SYSSRC=/usr/src/linux-headers-$$i KBUILD_PARAMS="-C /usr/src/linux-headers-$$i SUBDIRS=$(builddir)/$$i/nv" module; \ + $(ROOT_CMD) make -C $(builddir)/$$i/nv-legacy -f Makefile SYSSRC=/usr/src/linux-headers-$$i KBUILD_PARAMS="-C /usr/src/linux-headers-$$i SUBDIRS=$(builddir)/$$i/nv-legacy" module; \ + fi; \ + cd - > /dev/null; \ + done +endif + + touch build-stamp + +build-avm-stamp: unpack-avm-stamp + dh_testdir +ifeq "$(FRITZ)" "1" + for i in $(flavours); do \ + for d in debian/build/$$i/f*; do \ + m=$$(basename $$d); \ + echo building for flavour $$i, module $$m; \ + if [ -d $$d/src.drv ]; then \ + make -C $$d/src.drv \ + `cat $$d/make.card` \ + KRNLINCL=/usr/src/linux-headers-$$i \ + || true; \ + else \ + if [ -f $$d/ID ]; then \ + mkdir -p $$d/tmp; \ + echo make -C $$d/src `cat $$d/ID` KDIR=/usr/src/linux-headers-$$i; \ + make -C $$d/src \ + `cat $$d/ID` \ + KDIR=/usr/src/linux-headers-$$i \ + LIBDIR=$(CURDIR)/$$d/tmp; \ + rm -rf $$d/tmp; \ + else \ + for d2 in $$d/?/fritz; do \ + mkdir -p $$d2/tmp; \ + echo make -C $$d2/src `cat $$d2/ID` KDIR=/usr/src/linux-headers-$$i; \ + make -C $$d2/src \ + `cat $$d2/ID` \ + KDIR=/usr/src/linux-headers-$$i \ + LIBDIR=$(CURDIR)/$$d2/tmp; \ + rm -rf $$d2/tmp; \ + done; \ + fi; \ + fi; \ + done; \ + done +endif + touch build-avm-stamp + +modalias-patterns-stamp: build-stamp + dh_testdir + +ifeq "$(FGLRX)" "1" + for i in $(ati_flavours); do \ + $(SHELL) ati/fglrx_supported \ + $(rbuilddir)/ati-xorg/$(ati_xorg_dir)/usr/X11R6/$(ati_nativelibdir)/modules/drivers/fglrx_drv.so \ + > $(rbuilddir)/$$i/ati/modules.alias.override; \ + done +endif + +ifeq "$(MADWIFI)" "1" + for i in $(flavours); do \ + if [ "$$i" = "$(kernel_abi_version)-powerpc64-smp" ]; then \ + echo "Not building madwifi drivers for $(kernel_abi_version)-powerpc64-smp"; \ + else \ + $(SHELL) madwifi/ath_hal_supported \ + $(rbuilddir)/$$i/madwifi/ath/ath_pci.ko \ + > $(rbuilddir)/$$i/madwifi/modules.alias.override; \ + fi; \ + done +endif + +ifeq "$(BCMWL)" "1" + for i in $(flavours); do \ + $(SHELL) broadcom/wl_supported $(rbuilddir)/$$i/$(bcmwl_dir)/wl.ko > \ + $(rbuilddir)/$$i/$(bcmwl_dir)/modules.alias.override; \ + done +endif + +ifeq "$(NVIDIA)" "1" + for i in $(nv_flavours); do \ + if [ "$$i" != "$(kernel_abi_version)-xen" ]; then \ + $(SHELL) nvidia/nvidia_supported \ + $(rbuilddir)/$$i/nv-new/nv-kernel.o nvidia_new \ + $(rbuilddir)/$$i/nv/nv-kernel.o nvidia \ + $(rbuilddir)/$$i/nv-legacy/nv-kernel.o nvidia_legacy \ + > $(rbuilddir)/$$i/nv/modules.alias.override; \ + else \ + $(SHELL) nvidia/nvidia_supported \ + $(rbuilddir)/$$i/nv-new/nv-kernel.o nvidia_new \ + > $(rbuilddir)/$$i/nv/modules.alias.override; \ + fi; \ + done +endif + + touch modalias-patterns-stamp + +debian/control: + echo '# THIS FILE IS AUTO-GENERATED FROM control.stub.in' > debian/control.stub + sed -e 's/@@NV_VERSION@@/$(nv_version)/g' \ + -e 's/@@NV_NEW_VERSION@@/$(nv_new_version)/g' \ + -e 's/@@NV_LEGACY_VERSION@@/$(nv_legacy_version)/g' \ + -e 's/@@KVERSION@@/$(kernel_version)/g' \ + -e 's/@@ABIVER@@/$(kernel_abi_version)/g' \ + debian/control.stub.in >> debian/control.stub + echo '# THIS FILE IS AUTO-GENERATED FROM kernel-versions.in' > debian/d-i/kernel-versions + sed -e 's/@@ABIVER@@/$(kernel_abi_version)/g' \ + debian/d-i/kernel-versions.in >> debian/d-i/kernel-versions + rm -rf $(udeb_prefix) + mkdir -p $(udeb_prefix)/modules $(udeb_prefix)/firmware + -cp -a debian/d-i/modules/$(DEB_HOST_ARCH) $(udeb_prefix)/modules/ + -cp -a debian/d-i/firmware/$(DEB_HOST_ARCH) $(udeb_prefix)/firmware/ + cp -a debian/d-i/package-list debian/d-i/kernel-versions $(udeb_prefix)/ + ln -s .. $(udeb_prefix)/debian + (cd $(udeb_prefix) && kernel-wedge gen-control) > debian/control + rm -rf $(udeb_prefix) + +clean: debian/control + dh_testdir + dh_testroot + rm -f unpack-stamp build-stamp build-kernel-stamp \ + modalias-patterns-stamp + rm -rf debian/build* debian/temp/ + rm -f debian/vmware-*-kernel-modules-*.postinst + rm -f debian/vmware-*-kernel-modules-*.postrm + rm -f debian/linux-restricted-modules-[0-9]*.postinst + rm -f debian/linux-restricted-modules-*.postrm + rm -f debian/linux-restricted-modules-*.preinst + rm -f debian/linux-restricted-modules-*.prerm + rm -f debian/nic-restricted-modules-*.postinst + for i in -dev.dirs -dev.links -dev.postinst -dev.postrm \ + -dev.preinst .dirs .docs .examples .links.amd64 \ + .links .override .postinst .postrm .preinst \ + .prerm .README.Debian .reportbug .shlibs; \ + do rm -f debian/nvidia-glx$$i debian/nvidia-glx-legacy$$i debian/nvidia-glx-new$$i; \ + done + rm -rf $(nv_dirname) $(nv_legacy_dirname) $(nv_new_dirname) + rm -f nvidia-kernel-source.tar.gz nvidia-legacy-kernel-source.tar.gz \ + nvidia-new-kernel-source.tar.gz + rm -f fglrx-kernel-source.tar.gz + dh_clean `find debian/d-i/modules debian/d-i/firmware -type l 2>/dev/null` + rm -rf $(udeb_prefix) + rm -rf avm-download build-avm-stamp unpack-avm-stamp + rm -f fritz/fwlanusb/lib/fwlanusb-lib.o + rm -rf debian/nic-restricted-modules-*-di \ + debian/nic-restricted-firmware-*-di + rm -f correct-lib-path + cp -f debian/control.stub debian/control + +install: build build-kernel + dh_testdir + dh_clean -k + dh_installdirs + + # Split modules for install + chmod u+rx debian/split-module + for flavour in $(flavours); do \ + export KERNELPATH=/usr/src/linux-headers-$$flavour; \ + export $(mw_target); \ + for module in $(split_modules); do \ + if [ ! -d "debian/build/$$flavour/$$(dirname $$module)" ]; then \ + echo "No $$module driver for $$flavour"; \ + elif [ "$$module" = "ltmodem/ltmodem" ] \ + || [ "$$module" = "ltmodem/ltserial" ] \ + && [ "$$flavour" != "$(kernel_abi_version)-386" ]; then \ + echo "No $$module driver for $$flavour"; \ + elif [ "$$module" = "madwifi/ath_hal/ath_hal" ] \ + && [ "$$flavour" = "$(kernel_abi_version)-powerpc64-smp" ]; then \ + echo "No $$module driver for $$flavour"; \ + else \ + echo "KERNELPATH=/usr/src/linux-headers-$$flavour $(mw_target) CC=$(CC) GCC=$(GCC) debian/split-module $$(basename $$module) debian/build/$$flavour/$$(dirname $$module) $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour"; \ + debian/split-module $$(basename $$module) \ + debian/build/$$flavour/$$(dirname $$module) \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour; \ + fi; \ + done; \ + done + +ifeq "$(NVIDIA)" "1" + for flavour in $(nv_flavours); do \ + export KERNELPATH=/usr/src/linux-headers-$$flavour; \ + if [ "$$flavour" != "$(kernel_abi_version)-xen" ]; then \ + debian/split-module nvidia \ + debian/build/$$flavour/nv-legacy \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-legacy; \ + mv $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-legacy/nvidia \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nvidia_legacy; \ + rm -rf $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-legacy; \ + debian/split-module nvidia \ + debian/build/$$flavour/nv \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv; \ + mv $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv/nvidia \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nvidia; \ + rm -rf $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv; \ + fi; \ + debian/split-module nvidia \ + debian/build/$$flavour/nv-new \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-new; \ + mv $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-new/nvidia \ + $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nvidia_new; \ + rm -rf $(prefix)-$$flavour/lib/linux-restricted-modules/$$flavour/nv-new; \ + install -D -m0644 \ + $(rbuilddir)/$$flavour/nv/modules.alias.override \ + $(prefix)-$$flavour/usr/share/linux-restricted-modules/$$flavour/modules.alias.override/nvidia; \ + done +endif + # +ifeq "$(MADWIFI)" "1" + for flavour in $(flavours); do \ + if [ "$$flavour" = "$(kernel_abi_version)-powerpc64-smp" ]; then \ + echo "Not building madwifi drivers for $(kernel_abi_version)-powerpc64-smp"; \ + else \ + install -d $(prefix)-$$flavour/lib/modules/$$flavour/madwifi; \ + find debian/build/$$flavour/madwifi -name '*.ko' ! -name 'ath_hal.ko' | \ + xargs cp --target=$(prefix)-$$flavour/lib/modules/$$flavour/madwifi; \ + install -D -m0644 \ + $(rbuilddir)/$$flavour/madwifi/modules.alias.override \ + $(prefix)-$$flavour/usr/share/linux-restricted-modules/$$flavour/modules.alias.override/ath_hal; \ + fi; \ + done +endif + +ifeq "$(BCMWL)" "1" + for flavour in $(flavours); do \ + install -D -m0644 \ + $(rbuilddir)/$$flavour/$(bcmwl_dir)/modules.alias.override \ + $(prefix)-$$flavour/usr/share/linux-restricted-modules/$$flavour/modules.alias.override/wl; \ + done +endif + +ifeq "$(VMWARE)" "1" + for flavour in $(flavours); do \ + install -d $(vmplay_dir)/lib/modules/$$flavour/vmware-player; \ + find debian/build/$$flavour/vmware-player -name '*.ko' | \ + xargs cp --target=$(vmplay_dir)/lib/modules/$$flavour/vmware-player; \ + done + + for flavour in $(flavours) $(vmware_server_extra_flavours); do \ + install -d $(vmserv_dir)/lib/modules/$$flavour/vmware-server; \ + find debian/build/$$flavour/vmware-server -name '*.ko' | \ + xargs cp --target=$(vmserv_dir)/lib/modules/$$flavour/vmware-server; \ + done + + for flavour in $(flavours) $(vmware_tools_extra_flavours); do \ + install -d $(vmtool_dir)/lib/modules/$$flavour/vmware-tools; \ + find debian/build/$$flavour/vmware-tools -name '*.ko' | \ + xargs cp --target=$(vmtool_dir)/lib/modules/$$flavour/vmware-tools; \ + done +endif + + # fglrx +ifeq "$(FGLRX)" "1" + $(CC) debian/correct-lib-path.c -o correct-lib-path + + dh_installdirs -pfglrx-control \ + usr/bin \ + usr/share/applnk \ + usr/share/applications \ + usr/share/icons \ + usr/share/pixmaps + dh_install -pfglrx-control \ + $(rbuilddir)/ati-xorg/common/usr/share/gnome/* \ + usr/share/applications + dh_install -pfglrx-control \ + $(rbuilddir)/ati-xorg/common/usr/share/applnk/* \ + usr/share/applnk + dh_install -pfglrx-control \ + $(rbuilddir)/ati-xorg/common/usr/share/ati \ + usr/share + dh_install -pfglrx-control \ + $(rbuilddir)/ati-xorg/common/usr/share/icons/* \ + usr/share/icons + dh_install -pfglrx-control \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/X11R6/bin/amdcccle \ + usr/bin + + dh_installdirs -p xorg-driver-fglrx \ + etc/ati \ + usr/bin \ + usr/lib/xorg/modules \ + usr/sbin \ + usr/share/man/man8 + dh_installdirs -p xorg-driver-fglrx-dev \ + usr/include \ + usr/lib + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/common/usr/share/man/man8/* \ + usr/share/man/man8 + dh_install -pxorg-driver-fglrx-dev \ + $(rbuilddir)/ati-xorg/common/usr/X11R6/include/* \ + $(rbuilddir)/ati-xorg/common/usr/include/* \ + usr/include + dh_install -pxorg-driver-fglrx -Xamdcccle \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/X11R6/bin/* \ + usr/bin + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/common/usr/sbin/* \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/sbin/* \ + usr/sbin + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/X11R6/$(ati_nativelibdir)/*.so* \ + usr/lib + ./correct-lib-path debian/xorg-driver-fglrx/usr/lib/libGL.so.1.2 \ + /usr/X11R6/$(ati_nativelibdir)/modules/dri \ + /usr/lib/dri + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/X11R6/$(ati_nativelibdir)/modules/* \ + usr/lib/xorg/modules + mv debian/xorg-driver-fglrx/usr/lib/xorg/modules/dri \ + debian/xorg-driver-fglrx/usr/lib/ + dh_install -pxorg-driver-fglrx-dev \ + $(rbuilddir)/ati-xorg/arch/$(ati_archdir)/usr/X11R6/$(ati_nativelibdir)/*.a \ + usr/lib + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/$(ati_xorg_dir)/usr/X11R6/$(ati_nativelibdir)/modules/* \ + usr/lib/xorg/modules + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/common/etc/ati/* \ + etc/ati + dh_installinit -pxorg-driver-fglrx --name="atieventsd" + +ifeq "$(ati_archdir)" "x86_64" + # 32-bit stuff + dh_installdirs -p usr/lib32 + + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/arch/x86/usr/X11R6/lib/*.so* \ + usr/lib32 + ./correct-lib-path debian/xorg-driver-fglrx/usr/lib32/libGL.so.1.2 \ + /usr/X11R6/lib/modules/dri \ + /usr/lib32/dri + + dh_install -pxorg-driver-fglrx \ + $(rbuilddir)/ati-xorg/arch/x86/usr/X11R6/lib/modules/* \ + usr/lib32/ + dh_install -pxorg-driver-fglrx-dev \ + $(rbuilddir)/ati-xorg/arch/x86/usr/X11R6/lib/*.a \ + usr/lib32 +endif + + install -m 644 $(CURDIR)/fglrx-kernel-source.tar.gz $(CURDIR)/debian/fglrx-kernel-source/usr/src + + for flavour in $(ati_flavours); do \ + install -D -m0644 \ + $(rbuilddir)/$$flavour/ati/modules.alias.override \ + $(prefix)-$$flavour/usr/share/linux-restricted-modules/$$flavour/modules.alias.override/fglrx; \ + done +endif + + # madwifi + +ifeq "$(NVIDIA)" "1" + # Huge pile of crud so we don't have to dupe for nvidia-{legacy,new} + for nv_flav in "" -new -legacy; do \ + install -m 644 $(CURDIR)/nvidia$${nv_flav}-kernel-source.tar.gz \ + $(CURDIR)/debian/nvidia$${nv_flav}-kernel-source/usr/src; \ + case $$nv_flav in \ + -new) this_dir=$(nv_new_dirname); this_ver=$(nv_new_version) ;; \ + -legacy) this_dir=$(nv_legacy_dirname); this_ver=$(nv_legacy_version) ;;\ + *) this_dir=$(nv_dirname); this_ver=$(nv_version) ;; \ + esac; \ + install -m 0644 $$this_dir/usr/X11R6/lib/modules/drivers/nvidia_drv.so \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/xorg/modules/drivers/; \ + install $$this_dir/usr/X11R6/lib/libXvMCNVIDIA.a \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/lib/libXvMCNVIDIA.a; \ + install $$this_dir/usr/X11R6/lib/libXvMCNVIDIA.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/libXvMCNVIDIA.so.$$this_ver; \ + install -m 0644 $$this_dir/usr/include/GL/gl.h \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/share/doc/nvidia-glx$${nv_flav}-dev/include/GL; \ + install -m 0644 $$this_dir/usr/include/GL/glext.h \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/share/doc/nvidia-glx$${nv_flav}-dev/include/GL; \ + install -m 0644 $$this_dir/usr/include/GL/glx.h \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/share/doc/nvidia-glx$${nv_flav}-dev/include/GL; \ + if [ -e $$this_dir/usr/include/GL/glxext.h ]; then \ + install -m 0644 $$this_dir/usr/include/GL/glxext.h \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/share/doc/nvidia-glx$${nv_flav}-dev/include/GL; \ + fi; \ + install -m 0644 $$this_dir/usr/lib/libGL.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib; \ + install -m 0644 $$this_dir/usr/lib/libGLcore.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib; \ + if [ -e $$this_dir/usr/lib/libnvidia-cfg.so.$$this_ver ]; then \ + install -m 0644 $$this_dir/usr/lib/libnvidia-cfg.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib; \ + fi; \ + sed "s/__GENERATED_BY__/Ubuntu nvidia-$${nv_flav}graphics-drivers/" \ + $$this_dir/usr/lib/libGL.la | sed "s/__LIBGL_PATH__/\/usr\/lib/" > \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/lib/libGL.la; \ + if [ "$(DEB_HOST_ARCH)" = "amd64" ]; then \ + install -d $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32 \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/lib32; \ + install -m 0644 $$this_dir/usr/lib32/libGL.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32; \ + install -m 0644 $$this_dir/usr/lib32/libGLcore.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32; \ + if [ -e $$this_dir/usr/lib32/libnvidia-cfg.so.$$this_ver ]; then \ + install -m 0644 $$this_dir/usr/lib32/libnvidia-cfg.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32; \ + fi; \ + sed "s/__GENERATED_BY__/Ubuntu nvidia-$${nv_flav}graphics-drivers/" \ + $$this_dir/usr/lib32/libGL.la | \ + sed "s/__LIBGL_PATH__/\/usr\/lib32/" > \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}-dev/usr/lib32/libGL.la; \ + fi; \ + install $$this_dir/usr/lib/tls/libnvidia-tls.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/; \ + ln -sf ../libnvidia-tls.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/tls/libnvidia-tls.so.$$this_ver; \ + if [ "$(DEB_HOST_ARCH)" = "amd64" ]; then \ + install $$this_dir/usr/lib32/libnvidia-tls.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32/; \ + install -d $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32/tls; \ + install $$this_dir/usr/lib32/tls/libnvidia-tls.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib32/tls/; \ + fi; \ + install $$this_dir/usr/X11R6/lib/modules/extensions/libglx.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/xorg/modules/extensions/;\ + if [ -e $$this_dir/usr/X11R6/lib/modules/libnvidia-wfb.so.$$this_ver ]; then \ + install $$this_dir/usr/X11R6/lib/modules/libnvidia-wfb.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/xorg/modules/; \ + ln -s libnvidia-wfb.so.$$this_ver \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/xorg/modules/libnvidia-wfb.so.1;\ + fi; \ + install $$this_dir/usr/bin/tls_test \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/nvidia; \ + install $$this_dir/usr/bin/tls_test_dso.so \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/lib/nvidia; \ + install -d $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/share/lintian/overrides; \ + install -m 0644 debian/nvidia-glx$${nv_flav}.override \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/share/lintian/overrides/nvidia-glx$${nv_flav}; \ + install -m 755 $$this_dir/usr/bin/nvidia-bug-report.sh \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/bin/; \ + install -m 644 $$this_dir/usr/share/pixmaps/nvidia-settings.png \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/share/pixmaps/; \ + if [ -e $$this_dir/usr/share/man/man1/nvidia-xconfig.1.gz ]; then \ + install -m 755 $$this_dir/usr/bin/nvidia-xconfig \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/bin/; \ + install -m 644 $$this_dir/usr/share/man/man1/nvidia-xconfig.1.gz \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/share/man/man1/; \ + fi; \ + install $(CURDIR)/debian/nvidia-glx$${nv_flav}.reportbug \ + $(CURDIR)/debian/nvidia-glx$${nv_flav}/usr/share/bug/nvidia-glx$${nv_flav}/script; \ + done +endif + +# XXX We change the default here to avoid recreating the tarball. Fix up +# next time .orig.tar.gz is regenerated. +# acx100/acx111 and dvb firmware + for i in $(flavours); do \ + mkdir -p $(prefix)-$$i/lib/firmware/$$i; \ + cp -a acx $(prefix)-$$i/lib/firmware/$$i/; \ + rm -f $(prefix)-$$i/lib/firmware/$$i/acx/default/tiacx111c16; \ + rm -f $(prefix)-$$i/lib/firmware/$$i/acx/default/tiacx111c17; \ + ln -s ../1.2.1.34/tiacx111c16 $(prefix)-$$i/lib/firmware/$$i/acx/default/; \ + ln -s ../1.2.1.34/tiacx111c17 $(prefix)-$$i/lib/firmware/$$i/acx/default/; \ + cp -a dvb/* $(prefix)-$$i/lib/firmware/$$i/; \ + done + +# avm fritz + +ifeq "$(FRITZ)" "1" + dh_installdirs -p$(pkg_avmfw) usr/share/isdn/$(avmfw_dir) + for d in $(fritz_dir)/*; do \ + for f in $$d/*.bin $$d/*.frm $$d/?/fritz/*.bin $$d/?/fritz/*.frm; do \ + [ -f $$f ] || continue; \ + cp -p $$f debian/$(pkg_avmfw)/usr/share/isdn/$(avmfw_dir)/; \ + done; \ + done + for i in $(flavours); do \ + install -d $(prefix)-$$i/usr/share/isdn; \ + ln -s $(avmfw_dir) $(prefix)-$$i/usr/share/isdn/$$i; \ + done; \ + + dh_installdirs -pavm-fritz-kernel-source usr/src + tar cfz debian/avm-fritz-kernel-source/usr/src/avm-fritz.tgz \ + $(fritz_dir)/*/license.txt \ + $(fritz_dir)/*/Makefile \ + $(fritz_dir)/*/ID \ + $(fritz_dir)/*/lib \ + $(fritz_dir)/*/src \ + $(fritz_dir)/*/?/fritz/license.txt \ + $(fritz_dir)/*/?/fritz/Makefile \ + $(fritz_dir)/*/?/fritz/ID \ + $(fritz_dir)/*/?/fritz/lib \ + $(fritz_dir)/*/?/fritz/src + dh_installdocs -p avm-fritz-kernel-source $(fritz_dir)/fcdsl2/*.html $(fritz_dir)/fcdsl2/*.txt +endif + +# Copy modules to a temporary tree for use in udebs. +build-udebs: install + dh_testdir + dh_testroot + + for i in $(flavours_udeb); do \ + mkdir -p debian/nic-restricted-firmware-$$i-di/lib/firmware/$$i; \ + cp -a $(prefix)-$$i/lib/firmware/$$i/* \ + debian/nic-restricted-firmware-$$i-di/lib/firmware/$$i/; \ + cp debian/lrm-manager debian/nic-restricted-modules-$$i-di.postinst; \ + done + +ifeq "$(MADWIFI)" "1" + for i in $(flavours_udeb); do \ + if [ "$$i" = "$(kernel_abi_version)-powerpc64-smp" ]; then \ + echo "Not building madwifi drivers for $(kernel_abi_version)-powerpc64-smp"; \ + else \ + mkdir -p debian/nic-restricted-modules-$$i-di/lib/linux-restricted-modules/$$i/ \ + debian/nic-restricted-modules-$$i-di/lib/modules/$$i/; \ + cp -a $(prefix)-$$i/lib/linux-restricted-modules/$$i/ath_hal \ + debian/nic-restricted-modules-$$i-di/lib/linux-restricted-modules/$$i/; \ + cp -a $(prefix)-$$i/lib/modules/$$i/madwifi \ + debian/nic-restricted-modules-$$i-di/lib/modules/$$i/; \ + fi; \ + done +endif + +# Build architecture-independent files here. +binary-indep: + dh_testdir + + install -d debian/linux-restricted-modules-common/sbin + install -m 755 debian/lrm-manager debian/linux-restricted-modules-common/sbin/lrm-manager + install -m 755 debian/lrm-video debian/linux-restricted-modules-common/sbin/lrm-video + install -d debian/linux-restricted-modules-common/etc/default + install -m 644 debian/linux-restricted-modules-common.default \ + debian/linux-restricted-modules-common/etc/default/linux-restricted-modules-common + install -d debian/linux-restricted-modules-common/etc/modprobe.d + install -m 644 debian/linux-restricted-modules-common.modprobe \ + debian/linux-restricted-modules-common/etc/modprobe.d/lrm-video + + dh_installchangelogs -i + dh_installinit -p linux-restricted-modules-common --no-start -- start 7 S . start 1 0 6 . + dh_fixperms -i + dh_compress -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: binary-debs build-udebs +# Build architecture-dependent files here. +binary-debs: install + dh_testdir + + dh_installchangelogs -s + dh_installdocs -s + dh_installexamples -s + dh_installman -s + dh_installinit -s + dh_link -s + # FIXME: Remove this when -legacy supports this library: + rm -f debian/nvidia-glx-legacy/usr/lib/libnvidia-cfg.so.1 + rm -f debian/nvidia-glx-legacy/usr/lib32/libnvidia-cfg.so.1 + dh_strip -s -X$(nv_new_release) -X$(nv_release) -X$(nv_legacy_release) -Xtls_test + dh_compress -X.h -s + dh_fixperms -s + dh_installdeb -s + dh_shlibdeps -X'*tls*' -X'*lib32*' -X'*lib64*' -s \ + -l$(CURDIR)/debian/nvidia-glx/usr/lib:$(CURDIR)/debian/xorg-driver-fglrx/usr/lib +ifeq "$(NVIDIA)" "1" + # this is a dirty hack, but we don't want -glx-legacy to depend on -glx + sed -i -e 's/, nvidia-glx//' debian/nvidia-glx-legacy.substvars +endif + + # Exclude packages we handle special + dh_gencontrol -s -Nxorg-driver-fglrx -Nxorg-driver-fglrx-dev \ + -Nfglrx-kernel-source -Nfglrx-control -Nnvidia-glx \ + -Nnvidia-glx-dev -Nnvidia-kernel-source -Nnvidia-glx-new \ + -Nnvidia-glx-new-dev -Nnvidia-new-kernel-source \ + -Nnvidia-glx-legacy -Nnvidia-glx-legacy-dev \ + -Nnvidia-legacy-kernel-source -Navm-fritz-kernel-source \ + -N$(pkg_avmfw) + + # fglrx, nVidia and ACM build with different version numbers +ifeq "$(FGLRX)" "1" + dh_gencontrol -v -pxorg-driver-fglrx -- -v1:${ati_xorg_version}+${lrm_version} + dh_gencontrol -v -pxorg-driver-fglrx-dev -- -v1:${ati_xorg_version}+${lrm_version} -Vati:XOrgFullVersion=1:${ati_xorg_version}+${lrm_version} + dh_gencontrol -v -pfglrx-kernel-source -- -v1:${ati_revision}+${lrm_version} -Vati:XOrgVersion=1:${ati_xorg_version} + dh_gencontrol -v -pfglrx-control -- -v1:${ati_revision}+${lrm_version} +endif +ifeq "$(NVIDIA)" "1" + dh_gencontrol -v -pnvidia-glx -- -v1:${nv_version}+${lrm_version} -Vnvidia:Version=${nv_version} + dh_gencontrol -v -pnvidia-glx-dev -- -v1:${nv_version}+${lrm_version} -Vnvidia:Version=${nv_version} + dh_gencontrol -v -pnvidia-kernel-source -- -v1:${nv_version}+${lrm_version} -Vnvidia:Version=${nv_version} + + dh_gencontrol -v -pnvidia-glx-new -- -v${nv_new_version}+${lrm_version} -Vnvidia:NewVersion=${nv_new_version} + dh_gencontrol -v -pnvidia-glx-new-dev -- -v${nv_new_version}+${lrm_version} -Vnvidia:NewVersion=${nv_new_version} + dh_gencontrol -v -pnvidia-new-kernel-source -- -v${nv_new_version}+${lrm_version} -Vnvidia:NewVersion=${nv_new_version} + + dh_gencontrol -v -pnvidia-glx-legacy -- -v${nv_legacy_version}+${lrm_version} -Vnvidia:LegacyVersion=${nv_legacy_version} + dh_gencontrol -v -pnvidia-glx-legacy-dev -- -v${nv_legacy_version}+${lrm_version} -Vnvidia:LegacyVersion=${nv_legacy_version} + dh_gencontrol -v -pnvidia-legacy-kernel-source -- -v${nv_legacy_version}+${lrm_version} -Vnvidia:LegacyVersion=${nv_legacy_version} +endif +ifeq "$(FRITZ)" "1" + dh_gencontrol -v -pavm-fritz-kernel-source -- -v${avm_version}+${lrm_version} -Vavm:Version=${avm_version} + dh_gencontrol -v -p$(pkg_avmfw) -- -v${avm_version}+${lrm_version} -Vavm:Version=${avm_version} +endif + dh_md5sums -s + dh_builddeb -s + +printenv: printenv-e + @echo "DEB_HOST_ARCH = $(DEB_HOST_ARCH)" + @echo "flavours = $(flavours)" + +build-orig-source: + @LRM="linux-restricted-modules"; \ + ORIGVER=$$(echo $(lrm_version)|cut -d- -f1); \ + TARDIR="$$LRM-$(kernel_version)-$$ORIGVER"; \ + TARNAME="$$LRM-$(kernel_version)_$$ORIGVER.orig.tar.gz"; \ + if [ -f "../$$TARNAME" ]; then \ + echo "$$TARNAME already exists!" >&2; \ + exit 1; \ + fi; \ + test -L ../$$TARDIR && rm ../$$TARDIR; \ + CWD=$$(basename $$(pwd)); \ + (cd .. && ln -s $$CWD $$TARDIR); \ + tar -czvf "../$$TARNAME" -C .. "$$TARDIR/." --exclude="*/debian" \ + --exclude="*/debian/*" --exclude=".git" || rm ../$$TARNAME; \ + test -L ../$$TARDIR && rm ../$$TARDIR + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install unpack build-kernel +.PHONY: debian/control build-udebs build-orig-source --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.shlibs.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.shlibs.in @@ -0,0 +1,4 @@ +libGL 1 libgl1-mesa | libgl1 +libGLcore 1 libgl1-mesa | libgl1 +libXvMCNVIDIA_dynamic 1 nvidia-glx +libnvidia-tls 1 nvidia-glx --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-legacy-kernel-source.dirs +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-legacy-kernel-source.dirs @@ -0,0 +1 @@ +usr/src --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/xorg-driver-fglrx.atieventsd.init +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/xorg-driver-fglrx.atieventsd.init @@ -0,0 +1,49 @@ +#!/bin/sh + +# +# init.d-style example script for controlling the ATI External Events Daemon +# +# Distro maintainers may modify this reference script as necessary to conform +# to their distribution policies, or they may simply substitute their own script +# instead. This reference script is provided merely as a simple example. +# +# Copyright (c) 2006, ATI Technologies Inc. All rights reserved. +# + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +DAEMONPATH=/usr/sbin/atieventsd +DAEMONNAME=atieventsd +DAEMONOPTS="" + +[ -f $DAEMONPATH ] || exit 0 + +. /lib/lsb/init-functions + +case "$1" in + start) + log_daemon_msg "Starting $DAEMONNAME" + start-stop-daemon --start --quiet --oknodo --exec $DAEMONPATH -- $DAEMONOPTS + log_end_msg $? + ;; + + stop) + log_daemon_msg "Stopping $DAEMONNAME" + start-stop-daemon --stop --quiet --exec $DAEMONPATH --oknodo + log_end_msg $? + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "$0 {start|stop|restart}" + exit 1 + ;; +esac + +exit 0 + --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.docs.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.docs.in @@ -0,0 +1,3 @@ +@dirname@/usr/share/doc/NVIDIA_Changelog +@dirname@/usr/share/doc/README* +@dirname@/usr/share/doc/nvidia-settings-user-guide.txt --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.override.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.override.in @@ -0,0 +1,13 @@ +nvidia-glx@@NV_LEGACY@@: library-not-linked-against-libc ./usr/lib/libGL.so.@@VERSION@@ + +nvidia-glx@@NV_LEGACY@@: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.@@VERSION@@ + +nvidia-glx@@NV_LEGACY@@: library-not-linked-against-libc ./usr/lib/xorg/modules/extensions/libglx.so.@@VERSION@@ + +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/lib/libGL.so.@@VERSION@@ +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/lib/libGLcore.so.@@VERSION@@ +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.so.@@VERSION@@ +nvidia-glx@@NV_LEGACY@@: shlib-with-non-pic-code usr/lib/libXvMCNVIDIA.so.@@VERSION@@ + +nvidia-glx@@NV_LEGACY@@: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so +nvidia-glx@@NV_LEGACY@@: non-dev-pkg-with-shlib-symlink usr/lib/xorg/modules/extensions/libglx.so.@@VERSION@@ usr/lib/xorg/modules/extensions/libglx.so --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/xorg-driver-fglrx.links +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/xorg-driver-fglrx.links @@ -0,0 +1,5 @@ +usr/lib/libGL.so.1.2 usr/lib/libGL.so.1 +usr/lib/libfglrx_gamma.so.1.0 usr/lib/libfglrx_gamma.so.1 +usr/lib/libfglrx_pp.so.1.0 usr/lib/libfglrx_pp.so.1 +usr/lib/libfglrx_dm.so.1.0 usr/lib/libfglrx_dm.so.1 +usr/lib/libfglrx_tvout.so.1.0 usr/lib/libfglrx_tvout.so.1 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/control.stub +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/control.stub @@ -0,0 +1,515 @@ +# THIS FILE IS AUTO-GENERATED FROM control.stub.in +Source: linux-restricted-modules-2.6.24 +Section: restricted/misc +Priority: optional +Maintainer: Ubuntu Kernel Team +Uploaders: Adam Conrad , Ben Collins +Standards-Version: 3.6.1 +Build-Depends: cpio, debhelper (>= 4.0.0), libc6-i386 [amd64], + kernel-wedge (>= 2.05ubuntu2), module-init-tools, rpm, sed (>> 3.0), + sharutils, bzip2, libgtk2.0-dev [i386 amd64], + linux-headers-2.6.24-24-386 [i386], + linux-headers-2.6.24-24-server [amd64 i386], + linux-headers-2.6.24-24-generic [amd64 i386], + linux-headers-2.6.24-24-lpia [lpia], + linux-headers-2.6.24-24-lpiacompat [lpia], + linux-headers-2.6.24-24-openvz [i386 amd64], + linux-headers-2.6.24-24-rt [i386 amd64], + linux-headers-2.6.24-24-xen [amd64 i386], + linux-headers-2.6.24-24-powerpc [powerpc], + linux-headers-2.6.24-24-powerpc-smp [powerpc], + linux-headers-2.6.24-24-powerpc64-smp [powerpc], + linux-headers-2.6.24-24-mckinley [ia64], + linux-headers-2.6.24-24-itanium [ia64], + linux-headers-2.6.24-24-hppa32 [hppa], + linux-headers-2.6.24-24-hppa64 [hppa], + linux-headers-2.6.24-24-sparc64-smp [sparc], + linux-headers-2.6.24-24-sparc64 [sparc] +Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-hardy-lrm.git + +Package: linux-restricted-modules-common +Architecture: all +Priority: optional +Depends: binutils-static +Description: Non-free Linux 2.6.24 modules helper script + This package provides only a set of helper scripts to handle + linux-restricted-modules. + +Package: linux-restricted-modules-2.6.24-24-386 +Architecture: i386 +Priority: optional +Provides: nvidia-kernel-96.43.05, nvidia-kernel-71.86.04, nvidia-kernel-169.12 +Depends: linux-image-2.6.24-24-386, linux-restricted-modules-common (>= 2.6.24), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-2.6.24-24 +Description: Non-free Linux 2.6.24 modules on 386 + This package provides restricted modules for Linux version 2.6.24 on + 386. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl, fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcdslusba, + fcpci, fcusb, fwlanusb, fxusb (AVM ISDN) + - ltmodem (Winmodem) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: nvidia-glx +Architecture: i386 amd64 +Depends: linux-restricted-modules-common, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-kernel-source (>= ${nvidia:Version}), nvidia-settings +Conflicts: nvidia-glx-src, nvidia-xconfig, nvidia-glx-legacy, nvidia-glx-new +Replaces: nvidia-glx-src +Provides: xserver-xorg-video-2 +Description: NVIDIA binary XFree86 4.x/X.Org driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and support the newer + GeForce, nForce and Quadro families of NVIDIA chipsets. AGP, TV-out and + flat panel displays are also supported. + . + If you have a TNT, TNT2, or older GeForce, you may need the nvidia-glx-legacy + package instead of this one. + +Package: nvidia-glx-dev +Architecture: i386 amd64 +Depends: nvidia-glx (>= ${nvidia:Version}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Conflicts: nvidia-glx-legacy-dev, nvidia-glx-new-dev +Description: NVIDIA binary XFree86 4.x/X.Org driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org driver + development files. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx (>= ${nvidia:Version}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src +Replaces: nvidia-kernel-src +Description: NVIDIA binary kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + +Package: nvidia-glx-new +Architecture: i386 amd64 +Depends: linux-restricted-modules-common, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-new-kernel-source (>= ${nvidia:NewVersion}), nvidia-settings +Conflicts: nvidia-glx-src, nvidia-xconfig, nvidia-glx, nvidia-glx-legacy +Replaces: nvidia-glx-src +Provides: nvidia-glx, xserver-xorg-video-2 +Description: NVIDIA binary XFree86 4.x/X.Org 'new' driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and supports the newer + GeForce, nForce and Quadro families of NVIDIA chipsets. AGP, TV-out and + flat panel displays are also supported. + . + If you have a TNT, TNT2, or older GeForce, you may need the nvidia-glx-legacy + package instead of this one. If you have a GeForce4, you may need the nvidia-glx + package. + +Package: nvidia-glx-new-dev +Architecture: i386 amd64 +Depends: nvidia-glx-new (>= ${nvidia:NewVersion}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Conflicts: nvidia-glx-dev, nvidia-glx-legacy-dev +Description: NVIDIA binary XFree86 4.x/X.Org 'new' driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org 'new' driver + development files. + . + This is the 'new' driver for newer chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-new description, please use the + nvidia-glx driver, which is more compatible. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-new-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx-new (>= ${nvidia:NewVersion}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src, nvidia-kernel-source, nvidia-legacy-kernel-source +Replaces: nvidia-kernel-src, nvidia-kernel-source +Provides: nvidia-kernel-source +Description: NVIDIA binary 'new' kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + . + This is the 'new' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-new description, please use the + nvidia-glx driver, which is more compatible. + +Package: nvidia-glx-legacy +Architecture: i386 amd64 +Depends: linux-restricted-modules-common, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-legacy-kernel-source (>= ${nvidia:LegacyVersion}), nvidia-settings +Conflicts: nvidia-glx-src, nvidia-glx +Replaces: nvidia-glx-src +Provides: nvidia-glx, xserver-xorg-video-2 +Description: NVIDIA binary XFree86 4.x/X.Org 'legacy' driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and supports the TNT, + TNT2, TNT Ultra, GeForce, and GeForce2 chipsets. AGP, TV-out and flat panel + displays are also supported. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the above paragraph, please use the nvidia-glx driver, + which is much more up to date. + +Package: nvidia-glx-legacy-dev +Architecture: i386 amd64 +Depends: nvidia-glx-legacy (>= ${nvidia:LegacyVersion}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Conflicts: nvidia-glx-dev +Description: NVIDIA binary XFree86 4.x/X.Org 'legacy' driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org 'legacy' driver + development files. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-legacy description, please use the + nvidia-glx driver, which is much more up to date. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-legacy-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx-legacy (>= ${nvidia:LegacyVersion}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src, nvidia-kernel-source +Replaces: nvidia-kernel-src, nvidia-kernel-source +Provides: nvidia-kernel-source +Description: NVIDIA binary 'legacy' kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-legacy description, please use the + nvidia-glx driver, which is much more up to date. + +Package: fglrx-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: xorg-driver-fglrx (>= ${ati:XOrgVersion}), kernel-package (>= 8.082), devscripts +Description: ATI binary kernel module source + This package builds the ATI XFree86 4.x/X.Org binary kernel module needed + by xorg-driver-fglrx. This package is not needed on an + Ubuntu system because a pre-compiled kernel module is supplied by the + linux-restricted-modules packages. + +Package: xorg-driver-fglrx +Architecture: i386 amd64 +Depends: linux-restricted-modules-common, xserver-xorg-core (>= 1:0.99.0-1), ${shlibs:Depends} +Conflicts: fglrx-driver, xfree86-driver-fglrx, nvidia-glx, nvidia-glx-legacy +Replaces: fglrx-driver, xfree86-driver-fglrx +Provides: fglrx-driver, xserver-xorg-video-2 +Description: Video driver for ATI graphics accelerators + Video driver for the ATI Radeon and FireGL graphics accelerators. + . + This version of the ATI driver officially supports: + . + * FireGL: V8650, V8600, V7600, V7350, V7300, V7200, V7100, + V5600, V5200, V5100, V5000, HD3870, HD3850, V3600, V3400, + V3300, V3200, V3100, X3-256, X3, X2-256, Z1-128, T2-128, + X1-128, X1-256p + * FireMV: 2200 (Single card PCI-e configuration) + * Mobility FireGL: V5000, T2 + * Mobility Radeon: X1800, X1600, X1400, X1300, X800, X700, X600, X300, + X200, 9800, 9600, 9550, 9500 + * Radeon Xpress: 1200 series, 1100 series, 200 series + * Radeon: HD2900, HD2600, HD2400, X1900, X1800, X1600, X1300, X850, + X800, X700, X600, X550, X300, 9800, 9700, 9600, 9550, 9500 + . + ATI All-in-Wonder variants of the above cards/chips are also supported, + but video capture is not. + . + This package provides 2D display drivers and hardware accelerated OpenGL. + +Package: xorg-driver-fglrx-dev +Architecture: i386 amd64 +Depends: xorg-driver-fglrx (= ${ati:XOrgFullVersion}) +Conflicts: fglrx-driver-dev, xfree86-driver-fglrx-dev +Replaces: fglrx-driver-dev, xfree86-driver-fglrx-dev +Provides: fglrx-driver-dev +Description: Video driver for ATI graphics accelerators (devel files) + Video driver for the ATI Radeon and FireGL graphics accelerators. + . + This package provides definitions for the GL and GLX extensions + and the FGLRXGAMMA extension interface library. + +Package: fglrx-control +Architecture: i386 amd64 +Depends: xorg-driver-fglrx, ${shlibs:Depends} +Conflicts: xorg-driver-fglrx (< 1:7.1.0-7-11+2.6.24.5-4.12) +Replaces: xorg-driver-fglrx (< 1:7.1.0-7-11+2.6.24.5-4.12) +Description: Control panel for the ATI graphics accelerators + Control panel for the ATI Radeon and FireGL graphics accelerators. + . + This package provides the control panel compiled for Qt3. + +Package: fglrx-amdcccle +Architecture: i386 amd64 +Depends: fglrx-control +Description: Dummy package for easy transition + This is a dummy package for easy transition with ATI's packages. + +Package: avm-fritz-kernel-source +Architecture: amd64 i386 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: kernel-package (>= 8.082), devscripts +Description: AVM Fritz! binary kernel module source + This package builds the binary kernel modules needed for the AVM FRITZ! + ISDN hardware. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + +Package: avm-fritz-firmware-2.6.24-24 +Architecture: amd64 i386 +Depends: capiutils (>= 1:3.6.2005-01-03-3ubuntu1) +Recommends: drdsl +Description: Firmware for AVM Fritz! ISDN hardware + This package contains firmware binaries needed for various Fritz! ISDN cards + made by AVM. The firmware is installed in a kernel specific directory to + match driver and firmware version, if more than one kernel installed. + +Package: linux-restricted-modules-2.6.24-24-generic +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-96.43.05, nvidia-kernel-71.86.04, nvidia-kernel-169.12 +Depends: linux-image-2.6.24-24-generic, linux-restricted-modules-common (>= 2.6.24), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-2.6.24-24 +Description: Non-free Linux 2.6.24 modules on x86/x86_64 + This package provides restricted modules for Linux version 2.6.24 on + x86/x86_64. + . + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcpci (AVM ISDN) + - fcdsl, fcdslusba, fcusb, fwlanusb, fxusb (AVM ISDN x86 only) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-rt +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-96.43.05, nvidia-kernel-71.86.04, nvidia-kernel-169.12 +Depends: linux-image-2.6.24-24-rt, linux-restricted-modules-common (>= 2.6.24), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-2.6.24-24 +Description: Non-free Linux 2.6.24 modules on x86/x86_64 + This package provides restricted modules for Linux version 2.6.24 on + x86/x86_64. + . + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcpci (AVM ISDN) + - fcdsl, fcdslusba, fcusb, fwlanusb, fxusb (AVM ISDN x86 only) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-server +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-96.43.05, nvidia-kernel-71.86.04, nvidia-kernel-169.12 +Depends: linux-image-2.6.24-24-server, linux-restricted-modules-common (>= 2.6.24), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-2.6.24-24 +Description: Non-free Linux 2.6.24 modules on x86/x86_64 + This package provides restricted modules for Linux version 2.6.24 on + x86/x86_64. + . + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcpci (AVM ISDN) + - fcdsl, fcdslusba, fcusb, fwlanusb, fxusb (AVM ISDN x86 only) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-powerpc +Architecture: powerpc +Priority: optional +Depends: linux-image-2.6.24-24-powerpc, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on PowerPC + This package provides restricted modules for Linux version 2.6.24 on + PowerPC. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-powerpc-smp +Architecture: powerpc +Priority: optional +Depends: linux-image-2.6.24-24-powerpc-smp, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on PowerPC SMP + This package provides restricted modules for Linux version 2.6.24 on + PowerPC SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-powerpc64-smp +Architecture: powerpc +Priority: optional +Depends: linux-image-2.6.24-24-powerpc64-smp, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on PowerPC 64-bit SMP + This package provides restricted modules for Linux version 2.6.24 on + PowerPC 64-bit SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-itanium +Architecture: ia64 +Priority: optional +Depends: linux-image-2.6.24-24-itanium, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on Itanium + This package provides restricted modules for Linux version 2.6.24 on + Itanium. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-mckinley +Architecture: ia64 +Priority: optional +Depends: linux-image-2.6.24-24-mckinley, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on Itanium 2 + This package provides restricted modules for Linux version 2.6.24 on + Itanium 2. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-hppa32 +Architecture: hppa +Priority: optional +Depends: linux-image-2.6.24-24-hppa32, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on 32-bit HPPA + This package provides restricted modules for Linux version 2.6.24 on + 32-bit HPPA. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-hppa64 +Architecture: hppa +Priority: optional +Depends: linux-image-2.6.24-24-hppa64, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on 64-bit HPPA + This package provides restricted modules for Linux version 2.6.24 on + 64-bit HPPA. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-lpia +Architecture: lpia +Priority: optional +Depends: linux-image-2.6.24-24-lpia, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on LPIA + This package provides restricted modules for Linux version 2.6.24 on + 32-bit LPIA + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-lpiacompat +Architecture: lpia +Priority: optional +Depends: linux-image-2.6.24-24-lpiacompat, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on LPIAcompat + This package provides restricted modules for Linux version 2.6.24 on + 32-bit LPIAcompat + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-sparc64 +Architecture: sparc +Priority: optional +Depends: linux-image-2.6.24-24-sparc64, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on 64-bit Sparc + This package provides restricted modules for Linux version 2.6.24 on + 64-bit Sparc. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-sparc64-smp +Architecture: sparc +Priority: optional +Depends: linux-image-2.6.24-24-sparc64-smp, linux-restricted-modules-common (>= 2.6.24), module-init-tools +Description: Non-free Linux 2.6.24 modules on 64-bit Sparc SMP + This package provides restricted modules for Linux version 2.6.24 on + 64-bit Sparc SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-xen +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-96.43.05, nvidia-kernel-71.86.04, nvidia-kernel-169.12 +Depends: linux-image-2.6.24-24-xen, linux-restricted-modules-common (>= 2.6.24), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-2.6.24-24 +Description: Non-free Linux 2.6.24 modules on Xen + This package provides restricted modules for Linux version 2.6.24 on + Xen dom0 and domU. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-2.6.24-24-openvz +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-96.43.05, nvidia-kernel-71.86.04, nvidia-kernel-169.12 +Depends: linux-image-2.6.24-24-openvz, linux-restricted-modules-common (>= 2.6.24), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-2.6.24-24 +Description: Non-free Linux 2.6.24 modules on OpenVZ Virtualization enabled kernel + This package provides restricted modules for Linux version 2.6.24 on + OpenVZ Virtualization enabled kernel. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + . + These modules are "restricted" because they are not available under a + completely Free licence. --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/xorg-driver-fglrx.preinst +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/xorg-driver-fglrx.preinst @@ -0,0 +1,68 @@ +#! /bin/sh +# preinst script for xorg-driver-fglrx +# +# see: dh_installdeb(1) + +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-installation-architecture` = "amd64" ]; then + HAS_LIB32="yes" +fi + +case "$1" in + install|upgrade) + # create new diversion directories + if [ ! -d /usr/lib/fglrx ]; then + mkdir -p /usr/lib/fglrx || true + fi + if [ -d /usr/X11R6 ] && [ ! -d /usr/X11R6/lib/fglrx ]; then + mkdir -p /usr/X11R6/lib/fglrx || true + fi + if [ -n "$HAS_LIB32" ] && [ ! -d /usr/lib32/fglrx ]; then + mkdir -p /usr/lib32/fglrx || true + fi + if [ -n "$HAS_LIB32" ] && [ -d /usr/X11R6 ] && [ ! -d /usr/X11R6/lib32/fglrx ]; then + mkdir -p /usr/X11R6/lib32/fglrx || true + fi + + # make new diversions + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/lib/fglrx/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/lib/fglrx/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib/fglrx/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib/fglrx/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + + if [ -n "$HAS_LIB32" ]; then + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib32/fglrx/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/X11R6/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/lib32/fglrx/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package xorg-driver-fglrx --divert /usr/lib32/fglrx/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null + fi + ;; + + 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 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/objtable.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/objtable.in @@ -0,0 +1,25 @@ +ath_hal_objs="madwifi/ath_hal/ah_osdep.o madwifi/ath_hal/hal.o" +ath_rate_sample_objs="madwifi/ath_rate/sample/sample.o" +wlan_objs="madwifi/net80211/if_media.o madwifi/net80211/rc4.o madwifi/net80211/ieee80211.o madwifi/net80211/ieee80211_crypto.o madwifi/net80211/ieee80211_input.o madwifi/net80211/ieee80211_node.o madwifi/net80211/ieee80211_output.o madwifi/net80211/ieee80211_proto.o madwifi/net80211/ieee80211_wireless.o madwifi/net80211/ieee80211_linux.o madwifi/net80211/ieee80211_crypto_none.o" +wlan_wep_objs="madwifi/net80211/ieee80211_crypto_wep.o" +wlan_tkip_objs="madwifi/net80211/ieee80211_crypto_tkip.o" +wlan_ccmp_objs="madwifi/net80211/ieee80211_crypto_ccmp.o" +wlan_acl_objs="madwifi/net80211/ieee80211_acl.o" +wlan_xauth_objs="madwifi/net80211/ieee80211_xauth.o" +ath_pci_objs="madwifi/ath/if_ath.o madwifi/ath/if_ath_pci.o madwifi/ath/radar.o" +fglrx_objs="ati/build_mod/2.6.x/agp3.o ati/build_mod/2.6.x/nvidia-agp.o ati/build_mod/2.6.x/agpgart_be.o ati/build_mod/2.6.x/i7505-agp.o ati/build_mod/2.6.x/firegl_public.o ati/build_mod/libfglrx_ip.a.GCC3" +nvidia_objs="nv/nv-kernel.o nv/nv.o nv/nv-vm.o nv/os-agp.o nv/os-interface.o nv/os-registry.o" +fcdsl_objs="fcdsl/lib/fcdsl-lib.o fcdsl/src/main.o fcdsl/src/driver.o fcdsl/src/tools.o fcdsl/src/dbgif.o fcdsl/src/tables.o fcdsl/src/queue.o fcdsl/src/lib.o" +fcdsl2_objs="fcdsl2/lib/fcdsl2-lib.o fcdsl2/src/main.o fcdsl2/src/driver.o fcdsl2/src/tools.o fcdsl2/src/devif.o fcdsl2/src/tables.o fcdsl2/src/queue.o fcdsl2/src/lib.o" +fcdslsl_objs="fcdslsl/lib/fcdslsl-lib.o fcdslsl/src/main.o fcdslsl/src/driver.o fcdslsl/src/tools.o fcdslsl/src/devif.o fcdslsl/src/tables.o fcdslsl/src/queue.o fcdslsl/src/lib.o" +fcdslslusb_objs="fcdslslusb/lib/fcdslslusb-lib.o fcdslslusb/src/main.o fcdslslusb/src/driver.o fcdslslusb/src/tools.o fcdslslusb/src/devif.o fcdslslusb/src/tables.o fcdslslusb/src/queue.o fcdslslusb/src/lib.o fcdslslusb/src/buffers.o" +fcdslusb_objs="fcdslusb/lib/fcdslusb-lib.o fcdslusb/src/main.o fcdslusb/src/driver.o fcdslusb/src/tools.o fcdslusb/src/tables.o fcdslusb/src/queue.o fcdslusb/src/lib.o" +fcdslusba_objs="fcdslusba/lib/fcdslusba-lib.o fcdslusba/src/main.o fcdslusba/src/driver.o fcdslusba/src/tools.o fcdslusba/src/devif.o fcdslusba/src/tables.o fcdslusba/src/queue.o fcdslusba/src/lib.o fcdslusba/src/buffers.o" +fcpci_objs="fcpci/lib/fcpci-lib.o fcpci/src/main.o fcpci/src/driver.o fcpci/src/tools.o fcpci/src/tables.o fcpci/src/queue.o fcpci/src/lib.o" +fcpcmcia_objs="fcpcmcia/lib/fcpcmcia-lib.o fcpcmcia/src/main.o fcpcmcia/src/driver.o fcpcmcia/src/tools.o fcpcmcia/src/tables.o fcpcmcia/src/queue.o fcpcmcia/src/lib.o" +fcpcmcia_cs_objs="fcpcmcia/src/fcpcmcia_cs.o" +fcusb_objs="fcusb/lib/fcusb-lib.o fcusb/src/main.o fcusb/src/driver.o fcusb/src/tools.o fcusb/src/tables.o fcusb/src/queue.o fcusb/src/lib.o" +fxusb_objs="fxusb/lib/fxusb-lib.o fxusb/src/main.o fxusb/src/driver.o fxusb/src/tools.o fxusb/src/tables.o fxusb/src/queue.o fxusb/src/lib.o" + +MODULES="ath_hal ath_rate_sample wlan wlan_wep wlan_tkip wlan_ccmp wlan_acl wlan_xauth ath_pci fglrx nvidia fcdsl fcdsl2 fcdslsl fcdslslusb fcdslusb fcdslusba fcpci fcusb fxusb" + --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/lrm-manager +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/lrm-manager @@ -0,0 +1,91 @@ +#!/bin/sh + +# Note that this script is not only /sbin/lrm-manager, but it also +# ends up being the postinst for nic-restricted-modules. Take care +# when adding features to make sure they'll work in d-i's busybox + +# If you wish to disable the link-on-boot feature for certain modules, +# please see /etc/default/linux-restricted-modules-common for details. + +set -e + +KVER="$(uname -r)" +DEPMOD=yes + +while [ $# -gt 0 ]; do + case "$1" in + --kver=*) KVER="${1#--kver=}"; shift ;; + --quick) DEPMOD=no; shift ;; + --list) LIST=yes; shift ;; + --help) echo "Usage: $0 [ --quick ] [ --kver=KERNEL_VERSION ]"; exit 0 ;; + *) shift ;; + esac +done + +if [ -f /etc/default/linux-restricted-modules-common ] && [ "$DEPMOD" = "no" ]; then + . /etc/default/linux-restricted-modules-common +fi + +# check if we have the kernel objects + +if [ ! -d /lib/linux-restricted-modules/"$KVER" ]; then + exit 0 +fi + +# if tmpfs is already mounted, skip it. +# NOTE that at this point in time we have no /proc or other fancy things to check + +if [ ! -f /lib/modules/"$KVER"/volatile/.mounted ]; then + mkdir -p /lib/modules/"$KVER"/volatile/ + mount -t tmpfs -o mode=0755 tmpfs /lib/modules/"$KVER"/volatile/ + touch /lib/modules/"$KVER"/volatile/.mounted +fi + +cd /lib/linux-restricted-modules/"$KVER" +for module in *; do + CURRENT_MODULE_DISABLED="false" + set -- $DISABLED_MODULES + while [ $# -gt 0 ]; do + case "$1" in + fc) + set -- $@ fcdsl fcdsl2 fcdslsl fcdslslusb fcdslusb fcdslusb2 fcdslusba fcpci fcusb fxusb + shift + ;; + nv) + set -- $@ nvidia nvidia_legacy nvidia_new + shift + ;; + ltm) + set -- $@ ltmodem ltserial + shift + ;; + *) + if [ "$1" = "$module" ]; then + CURRENT_MODULE_DISABLED="true" + if [ "$LIST" = "yes" ]; then + echo "$module" + fi + break + else + shift + fi + ;; + esac + done + if [ "$CURRENT_MODULE_DISABLED" = "false" ]; then + if type ld_static >/dev/null 2>&1; then + ld_static -d -r -o /lib/modules/"$KVER"/volatile/$module.ko $module/* || true + fi + fi +done + +if [ "$DEPMOD" = "yes" ]; then + if [ -f "/boot/System.map-$KVER" ]; then + depmod -a -q -F /boot/System.map-"$KVER" "$KVER" + elif type udpkg >/dev/null 2>&1; then + # Running in d-i + depmod -a -q + fi +fi + +exit 0 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/getavmcardware.py +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/getavmcardware.py @@ -0,0 +1,211 @@ +#! /usr/bin/python + +import os, re, sys +import ftplib +import fnmatch, glob +import shutil, tempfile, tarfile + +download_base = 'avm-download' +server = 'ftp.avm.de' +prefix = '/cardware' +versions = ['93', '92', '91', '90', '82', '81', '80'] +active_cards = [ + 'a1', + 'a1_pcm', + 'a1_plus', + 'b1', + 'b1_pci', + 'b1_pcm', + 'b1_usb', + 'c2', + 'c4', + 't1', + 't1-b', +] +fritz_cards = [ + 'fritzcrd.dsl', + 'fritzcrd.dsl_sl', + 'fritzcrd.dsl_sl_usb', + 'fritzcrd.dsl_usb', + 'fritzcrd.dsl_usb_analog', + 'fritzcrd.dsl_v20', + 'fritzcrd.pci', + 'fritzcrd.pcm', + #'fritzcrd.pnp', not supported anymore + 'fritzcrd.usb', + 'fritzcrdusb-v20', + 'fritzgsm', + 'fritzx.isdn', + 'fritzx.pc', + 'fritzx.usb', + 'fritzxpc.v20', + 'fritzxpc.v30', + 'fritzxusb.v20', + 'fritzxusb.v30', +] + +cards = active_cards + fritz_cards +cards = fritz_cards[:] + +class Driver: + def __init__(self, card, is64bit=False, localdir = None, tarname = None, tarsize = 0): + self.name = None + self.card = card + self.cards = set([card]) + self.dir = None + self.tarname = tarname + self.tarsize = tarsize + self.localdir = localdir + self.is64bit = is64bit + self.set_name_and_version() + + def set_name_and_version(self): + if self.tarname: + match = re.match(r'(\w+)-suse[\d.]*(?:-64bit)?-([\d.-]+)\.tar.gz', self.tarname) + self.name = match.group(1) + self.version = match.group(2) + + def getline(self, s): + self.line = s + + def get_tarball_info(self, ftp, prefix): + if self.is64bit: + linuxdir = 'linux_64bit' + else: + linuxdir = 'linux' + for version in versions: + self.directory = '%s/%s/%s/suse.%s' % (prefix, self.card, linuxdir, version) + try: + ftp.cwd(self.directory) + files = ftp.nlst() + except ftplib.error_perm, msg: + continue + p = '*suse*tar.gz' + files = fnmatch.filter(files, p) + if len(files): + self.tarname = files[0] + self.set_name_and_version() + ftp.retrlines('LIST %s/%s' % (self.directory, files[0]), self.getline) + self.tarsize = int(self.line.split()[4]) + return + return + + def is_download_needed(self, ftp, localdir): + try: + localsize = os.stat(os.path.join(localdir, self.tarname))[6] + except OSError: + return True + return localsize != self.tarsize + + def fetch_tarball(self, ftp, localdir): + print 'get %-23s %9d %s' % (self.card, self.tarsize, self.tarname) + self.localdir = localdir + ftp.retrbinary('RETR %s/%s' % (self.directory, self.tarname), + file(os.path.join(localdir, self.tarname), 'wb').write) + + def read_tarball(self): + return file(os.path.join(self.localdir, self.tarname)).read() + + def extract_tarball(self): + cwd = os.getcwd() + tmpdir = tempfile.mkdtemp() + print self.name, tmpdir + tar = tarfile.open(os.path.join(self.localdir, self.tarname), 'r:gz') + os.chdir(tmpdir) + for tarinfo in tar: + tar.extract(tarinfo) + tar.close() + os.chdir(cwd) + if os.path.isdir(os.path.join(tmpdir, 'active')): + driverdir = 'active' + elif os.path.isdir(os.path.join(tmpdir, 'fritz')): + driverdir = 'fritz' + else: + raise "ERROR, unknown directory" + print driverdir, self.name + try: + shutil.rmtree(os.path.join(driverdir, self.name)) + except: + pass + if self.is64bit: + targetdir = driverdir + '64' + else: + targetdir = driverdir + try: + os.makedirs(targetdir) + except: + pass + shutil.move(os.path.join(tmpdir, driverdir), + os.path.join(targetdir, self.name)) + shutil.rmtree(tmpdir) + +def do_download(cards, download_dir, is64bit): + tarballs = [] + ftp = ftplib.FTP(server) + ftp.login() + for card in cards: + d = Driver(card, is64bit) + d.get_tarball_info(ftp, prefix) + if d.tarname == None: + continue + try: + shutil.rmtree('%s/%s' % (download_dir, card)) + except: + pass + os.makedirs('%s/%s' % (download_dir, card)) + if d.is_download_needed(ftp, '%s/%s' % (download_dir, card)): + d.fetch_tarball(ftp, '%s/%s' % (download_dir, card)) + else: + print "up to date:", card, d.tarname + tarballs.append(d) + +def do_compare(tarballs, download_dir, is64bit): + if tarballs == None: + tarballs = [] + for tb in glob.glob('%s/*/*.tar.gz' % download_dir): + localdir, tarname = os.path.split(tb) + card = os.path.basename(localdir) + localsize = os.stat(tb)[6] + d = Driver(card, is64bit, localdir, tarname, localsize) + tarballs.append(d) + + tbset = set(tarballs) + for i1 in range(len(tarballs)): + tb1 = tarballs[i1] + data1 = tb1.read_tarball() + for i2 in range(i1+1, len(tarballs)): + tb2 = tarballs[i2] + data2 = tb2.read_tarball() + if data1 == data2: + print "Identical:", tb1.card, tb2.card + tb1.cards.add(tb2.card) + tb2.cards.add(tb1.card) + tbset.discard(tb2) + for i in range(len(tarballs)-1, -1, -1): + if not tarballs[i] in tbset: + del tarballs[i] + return tarballs + +def extract_tarballs(tarballs): + for tb in tarballs: + tb.extract_tarball() + +def do_arch(is64bit): + if is64bit: + download_dir = os.path.join(download_base, '64') + else: + download_dir = os.path.join(download_base, '32') + if not os.path.isdir(download_dir): + os.makedirs(download_dir) + tarballs = None + tarballs = do_download(cards, download_dir, is64bit) + tarballs = do_compare(tarballs, download_dir, is64bit) + for tb in tarballs: + print tb.cards + extract_tarballs(tarballs) + +def main(): + do_arch(True) # 64bit + do_arch(False) # 32bit + +main() --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/xorg-driver-fglrx.links.amd64 +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/xorg-driver-fglrx.links.amd64 @@ -0,0 +1,6 @@ +usr/lib32/libGL.so.1.2 usr/lib32/libGL.so.1 +usr/lib/libGL.so.1.2 usr/lib/libGL.so.1 +usr/lib/libfglrx_gamma.so.1.0 usr/lib/libfglrx_gamma.so.1 +usr/lib/libfglrx_pp.so.1.0 usr/lib/libfglrx_pp.so.1 +usr/lib/libfglrx_dm.so.1.0 usr/lib/libfglrx_dm.so.1 +usr/lib/libfglrx_tvout.so.1.0 usr/lib/libfglrx_tvout.so.1 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx-dev.dirs.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx-dev.dirs.in @@ -0,0 +1,3 @@ +usr/share/doc/nvidia-glx@@NV_LEGACY@@-dev/include/GL +usr/X11R6/lib +usr/lib/nvidia --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/linux-restricted-modules-common.init +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/linux-restricted-modules-common.init @@ -0,0 +1,24 @@ +#!/bin/sh + +test -x /sbin/lrm-manager || exit 0 + +. /lib/lsb/init-functions + +case "$1" in + start) + log_begin_msg "Preparing restricted drivers..." + /sbin/lrm-manager --quick + status=$? + log_end_msg $status + if [ $status -ne 0 ]; then + exit $status + fi + ;; + stop|restart|reload|force-reload) + ;; + *) + echo "Usage: $0 {start}" + ;; +esac + +exit 0 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/vmware-kernel-modules.postinst +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/vmware-kernel-modules.postinst @@ -0,0 +1,23 @@ +#!/bin/bash -e + +case "$1" in + configure) + kernel_ver=`uname -r` + if [ -f /boot/System.map-$kernel_ver ]; then + depmod -a -q -F /boot/System.map-$kernel_ver $kernel_ver + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/linux-restricted-modules-common.postinst +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/linux-restricted-modules-common.postinst @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +if [ -L /etc/rcS.d/S15linux-restricted-modules-common ]; then + mv /etc/rcS.d/S15linux-restricted-modules-common \ + /etc/rcS.d/S07linux-restricted-modules-common +fi + +#DEBHELPER# + --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.postinst.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.postinst.in @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e + +if [ -n "@@NV_ALT@@" ] && [ ! -e /lib/linux-restricted-modules/.nvidia_@@NV_ALT@@_installed ]; then + mkdir -p /lib/linux-restricted-modules + echo "# do not remove this file, it's needed by /sbin/lrm-video" \ + > /lib/linux-restricted-modules/.nvidia_@@NV_ALT@@_installed +fi + +# remove bogus libwfb divert, since the xserver version should be used or +# problems arise. +if [ "$(dpkg-divert --list /usr/lib/xorg/modules/libwfb.so | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.so > /dev/null +fi + + +#DEBHELPER# + +ldconfig --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-legacy-kernel-source.README.Debian +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-legacy-kernel-source.README.Debian @@ -0,0 +1,166 @@ +nvidia-graphics-drivers for Ubuntu +---------------------------------- + + +INTRODUCTION: +----------------------------------------------------------------------- + +Welcome to Ubuntu NVIDIA packages. This document contains notes on the +kernel module interface for the NVIDIA driver offering. + + +KERNEL MODULE INSTRUCTIONS: +----------------------------------------------------------------------- + +There are TWO ways to build the nvidia-kernel package. Which one depends on +your situation with your kernel. + + METHOD #1: You are running a Ubuntu suppiled kernel or built a + kernel-headers package along with your own self-built kernel. + + METHOD #2: You are running your own self-built kernel built from kernel + source. + +Which method you choose really depends on what kernel headers you wish to +use, those from a kernel-headers package or those from kernel +source (from which you built your own kernel). + +As mentioned above, if you are running a Ubuntu supplied kernel you will +probably want to choose METHOD #1. If you compile your own kernels, METHOD #2. + + + +PRELIMINARY: +- Decide where you want to build your module. By default it +will build under /usr/src like other kernel modules but you may choose +to build it under your home directory as some people prefer and writing to +/usr violates the FHS. + + +SUPPORT FOR 2.6 KERNELS: +------------------------ +As of 1.0.5336-1, NVIDIA includes support for a 2.6 kernel. No extra steps are +required. + + +HOTPLUG SUPPORT: +------------------------ +As of version 1.0.5336-8 there is hotplug module loading support provided +in patches that are applied by default but by default, hotplug is set to +ignore PCI/AGP cards for display. To change this set IGNORE_PCI_CLASS_DISPLAY +to false in /etc/default/hotplug or run +dpkg-reconfigure -plow hotplug + + + +METHOD #1 Using a kernel-headers package +*********************************************************************** + +As root (or using fakeroot) +1. cd /usr/src + tar xzvf nvidia-kernel-source.tar.gz -C + (It will install in /modules) + - or - + tar xzvf nvidia-kernel-source.tar.gz (if building in /usr/src) + + The standard build location is /usr/src + +2. Find out your kernel version: + + uname -r For example: 2.4.21-4-k7 + +3. Download and install package: kernel-headers-2.4.21-4-k7 + It will install in /usr/src/ + + Make sure your kernel image and headers have matching release numbers to + avoid possible problems in packages built from different sources. + +4. Set some environment variables (if bash is your shell): + + export KSRC=/usr/src/kernel-headers-2.4.21-4-k7 + export KVERS=2.4.21-4-k7 + +5. Then build nvidia-kernel package: + + cd /modules/nvidia-kernel + debian/rules binary_modules + +(You can also combine step 4 and 5 into one line: +KSRC=/usr/src/kernel-headers-2.4.21-4-k7 KVERS=2.4.21-4-k7 debian/rules binary_modules) + +6. Install nvidia-kernel-common: + + If not installed already + apt-get install nvidia-kernel-common + +7. Install the nvidia-kernel package: + + dpkg -i ../nvidia-kernel-2.4.21-4-k7_1.0.6629-1+_.Custom_i386.deb + ( or similar filename ) + +Now see GENERAL NOTES below method #2 + +METHOD #2: Using your own kernel source headers +*********************************************************************** + +To build the nvidia-kernel deb you need to first make sure you have +kernel-package installed, then do the following: + +As root +1. cd /usr/src + tar xzvf nvidia-kernel-source.tar.gz -C + (It will install in /modules) + - or - + tar xzvf nvidia-kernel-source.tar.gz (if building in /usr/src) + +2. If you are NOT using the default modules location /usr/src/modules + then you must set an environment variable that points to your modules + location. + + export MODULE_LOC=/modules + + This is needed by make-kpkg which is used later. If + is /usr/src there is no need to set this. + +3. Build the modules under MODULE_LOC i.e. /modules + + cd linux (or your kernel source directory) + make-kpkg modules_image + +4. Install nvidia-kernel-common: + + apt-get install nvidia-kernel-common + +5. Install the nvidia-kernel package: + + cd (e.g. /usr/src) + dpkg -i nvidia-kernel-KVER*.deb + +Notes for method #2: + +- It is advised not to clean the kernel source tree between +"make-kpkg kernel_image" and "make-kpkg modules_image". + +- The Riva framebuffer is known to conflict with the nvidia X driver. If you +are using X it would be wise not to compile it in. The vesa framebuffer is +known to work slow but fine. + +GENERAL NOTES: + +Also you must add any users who wish to use OpenGL applications to the group +video. You can do this with: + + adduser username video + +Also note for AGP issues and further information please see the NVIDIA +README file (README.gz) in the nvidia-glx package + +An old nvidia.o might be already loaded (run 'lsmod' to check) so +do 'rmmod nvidia.o' to remove the module from memory. + + +For any news on this package check http://people.debian.org/~rdonald and +http://bugs.debian.org/nvidia-kernel-source + + + -- Randall Donald , Fri, 30 Apr 2004 19:02:04 -0700 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.preinst.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.preinst.in @@ -0,0 +1,136 @@ +#! /bin/sh +# preinst script for nvidia-glx +# +# see: dh_installdeb(1) + +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-installation-architecture` = "amd64" ]; then + HAS_LIB32="yes" +fi + +case "$1" in + install|upgrade) + + # Forcefully remove old init scripts and defaults files + rm -f /etc/init.d/nvidia-glx + rm -f /etc/init.d/nvidia-glx-legacy + rm -f /etc/default/nvidia-glx + rm -f /etc/default/nvidia-glx-legacy + update-rc.d nvidia-glx remove >/dev/null || true + update-rc.d nvidia-glx-legacy remove >/dev/null || true + + # Hack right now. + # rm -f /usr/X11R6/lib/modules/extensions/libglx.so.1.0.5336 2>/dev/null || true + + # 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/X11R6/lib/modules/extensions/libGLcore.a + rm -f /usr/X11R6/lib/modules/extensions/libglx.a + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGLcore.a /usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libglx.a /usr/X11R6/lib/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@@NV_LEGACY@@ --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@@NV_LEGACY@@ --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null + fi + if [ -n "$HAS_LIB32" ]; then + if dpkg-divert --list /usr/X11R6/lib32/libGL.so.1 | grep 'nvidia-glx' > /dev/null; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib32/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + fi + if dpkg-divert --list /usr/X11R6/lib32/libGL.so.1.2 | grep 'nvidia-glx' > /dev/null; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/X11R6/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + fi + fi + + # libglx had a wrong path + if [ "$(dpkg-divert --list /usr/lib/xorg/modules/libglx.so | awk '{ print $7 }')" = "nvidia-glx@@NV_LEGACY@@" ]; then + dpkg-divert --remove --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/libglx.so > /dev/null + fi + + # create new diversion directories + if [ ! -d /usr/lib/nvidia ]; then + mkdir -p /usr/lib/nvidia || true + fi + if [ -n "$HAS_LIB32" ] && [ ! -d /usr/lib32/nvidia ]; then + mkdir -p /usr/lib32/nvidia || true + fi + + # remove the old nvidia-glx diversion before re-creating it, since our + # first nvidia-glx-legacy upload was broken, argh: + if [ -n "@@NV_LEGACY@@" ] && dpkg-divert --list /usr/lib/libGL.so.1 | grep 'nvidia-glx$' >/dev/null; then + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib32/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib32/libGL.so.1 > /dev/null + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib32/libGL.so.1.2 > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null + 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 + + dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGLcore.a.xlibmesa /usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null + 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 + + # make new diversions + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null + + if [ -n "$HAS_LIB32" ]; then + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib32/nvidia/libGL.so.1.xlibmesa /usr/lib32/libGL.so.1 > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib32/nvidia/libGL.so.1.2.xlibmesa /usr/lib32/libGL.so.1.2 > /dev/null + fi + + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/libGLcore.so > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@ --divert /usr/lib/nvidia/libglx.so.xserver-xorg-core /usr/lib/xorg/modules/extensions/libglx.so > /dev/null + ;; + + 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 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.prerm.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.prerm.in @@ -0,0 +1,49 @@ +#! /bin/sh +# prerm script for nvidia-drivers +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + remove|upgrade|deconfigure) +# install-info --quiet --remove /usr/info/nvidia-drivers.info.gz + if [ -n "@@NV_LEGACY@@" ]; then + rm -f /lib/linux-restricted-modules/.nvidia_legacy_installed + rmdir /lib/linux-restricted-modules 2>/dev/null || true + fi + if [ -n "@@NV_ALT@@" ]; then + rm -f /lib/linux-restricted-modules/.nvidia_new_installed + rmdir /lib/linux-restricted-modules 2>/dev/null || true + fi + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/commit-templates/sauce-patch +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/commit-templates/sauce-patch @@ -0,0 +1,40 @@ +# Ubuntu commit template. +# +# NOTE: This gets reformatted for debian/changelog +# +# +# SAUCE refers to the fact that this patch might not go upstream, but we need to +# carry it to successive releases. In most cases you DONOT want to use this +# template. +# +# An example of a SAUCE patch is the ACPI DSDT-in-initramfs patch which has been +# refused upstream, but still provides useful functionality to users with broken +# BIOSes. +# +#------------------------------------------------------------------------- +# +# The initial UBUNTU is a flag that this is an Ubuntu commit. It will be +# referenced to the Author in the debian/changelog entry. +# +# The text following is the short message that will be placed in the +# changelog. Extra text on the following lines will be ignored, but left +# in the git commit. Lines with # will be ignored in the commit. +# +# OriginalAuthor allows for alternate attribution. +# +# OriginalLocation allows for a URL or description of where the patch came +# from. +# +# BugLink is a reference to a Malone bug. +# +# Ignore: yes will keep this commit from showing up in the changelog. +# +UBUNTU: SAUCE: + + + +# OriginalAuthor: +# OriginalLocation: +# BugLink: +# Ignore: yes +# Other text below here. --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/commit-templates/config-updates +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/commit-templates/config-updates @@ -0,0 +1,13 @@ +# +# This template is used for commit messages that don't need to +# show up in debian/changelog. Administrative stuff like config +# updates, ABI bumps, etc. Setting 'Ignore: yes' prevents +# 'debian/rules insertchanges' from inserting this commit meesage +# as a changelog entry. +# +# Please give a one-line description of the config change followed +# by a detailed explanation if necessary + +UBUNTU: [Config] XXXX + +#Ignore: yes --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/commit-templates/bumpabi +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/commit-templates/bumpabi @@ -0,0 +1,3 @@ +UBUNTU: Bump ABI + +Ignore: yes --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/commit-templates/upstream-patch +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/commit-templates/upstream-patch @@ -0,0 +1,27 @@ +# Ubuntu commit template. +# +# NOTE: This gets reformatted for debian/changelog +# +# The initial UBUNTU is a flag that this is an Ubuntu commit. It will be +# referenced to the Author in the debian/changelog entry. +# +# The text following is the short message that will be placed in the +# changelog. Extra text on the following lines will be ignored, but left +# in the git commit. Lines with # will be ignored in the commit. +# +# OriginalAuthor allows for alternate attribution. +# +# OriginalLocation allows for a URL or description of where the patch came +# from. +# +# BugLink is a reference to a Malone bug +# +# Ignore: yes will keep this commit from showing up in the changelog. +# +UBUNTU: [Upstream] + +# OriginalAuthor: +# OriginalLocation: +# BugLink: +# Ignore: yes +# Other text below here. --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/commit-templates/missing-modules +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/commit-templates/missing-modules @@ -0,0 +1,3 @@ +UBUNTU: build/modules: Add modules that have intentionally gone missing + +Ignore: yes --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/commit-templates/external-driver +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/commit-templates/external-driver @@ -0,0 +1,20 @@ +# Ubuntu external driver commit. +# +# NOTE: This gets reformatted for README.Ubuntu-External-Drivers and +# debian/changelog. +# +# This is only needed when a driver is added, updated or removed. It is +# not needed when patches or fixes are applied to the driver. If the +# driver is being removed, add the line: +# +# Removing: yes +# +# to the commit, and you can remove all other tags (except UBUNTU:). +# +UBUNTU: + +ExternalDriver: +Description: +Url: +Mask: +Version: --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/commit-templates/newrelease +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/commit-templates/newrelease @@ -0,0 +1,3 @@ +UBUNTU: Start new release + +Ignore: yes --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx-dev.preinst.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx-dev.preinst.in @@ -0,0 +1,88 @@ +#! /bin/sh +# preinst script for nvidia-glx +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + install|upgrade) + # diversion transition + 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/share/nvidia-glx/diversions-X11R6 ] ; then + rm -f /usr/X11R6/lib/libGL.so + rm -f /usr/X11R6/lib/libGL.a + + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.so /usr/X11R6/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/libGL.a /usr/X11R6/lib/libGL.a > /dev/null + + + rmdir /usr/share/nvidia-glx/diversions-X11R6/ || true + rmdir /usr/share/nvidia-glx || true + fi + + + if [ ! -d /usr/lib/nvidia ]; then + mkdir -p /usr/lib/nvidia || true + fi + if [ ! -d /usr/X11R6/lib/nvidia ]; then + mkdir -p /usr/X11R6/lib/nvidia || true + fi + +# to remove old old old gl header diversions + + if [ -e /usr/share/nvidia-glx/diversions-X11R6/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/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null + + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/gl.h /usr/X11R6/include/GL/gl.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/glx.h /usr/X11R6/include/GL/glx.h > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions-X11R6/glxtokens.h /usr/X11R6/include/GL/glxtokens.h > /dev/null + + fi + + # remove the old nvidia-glx diversion before re-creating it, since our + # first nvidia-glx-legacy upload was broken, argh: + if [ -n "@@NV_LEGACY@@" ] && 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 + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null + dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null + fi + + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null + dpkg-divert --add --rename --package nvidia-glx@@NV_LEGACY@@-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null + + ;; + + 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 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/d-i/kernel-versions.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/d-i/kernel-versions.in @@ -0,0 +1,5 @@ +# arch version flavour installedname suffix build-depends +i386 @@ABIVER@@ 386 @@ABIVER@@-386 - +i386 @@ABIVER@@ generic @@ABIVER@@-generic - +powerpc @@ABIVER@@ powerpc @@ABIVER@@-powerpc - +amd64 @@ABIVER@@ generic @@ABIVER@@-generic - --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/d-i/package-list +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/d-i/package-list @@ -0,0 +1,19 @@ +# This file is used to build up the control file. The kernel version and +# "-di" are appended to the package names. Section can be left out. So can +# architecture, which is derived from the files in the modules directory. +# It overwrites specifications from /usr/share/kernel-wedge/package-list. +# +Package: nic-restricted-modules +Section: restricted/debian-installer +Priority: standard +Description: Restricted drivers for NICs + This package contains drivers for some NICs. These drivers are "restricted" + because they are not available under a completely Free licence. + +Package: nic-restricted-firmware +Section: restricted/debian-installer +Priority: standard +Description: Restricted external firmware for NIC drivers + This package contains external binary-only firmware for some NIC drivers. + These firmware images are "restricted" because they are not available under + a completely Free licence. --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/d-i/kernel-versions +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/d-i/kernel-versions @@ -0,0 +1,6 @@ +# THIS FILE IS AUTO-GENERATED FROM kernel-versions.in +# arch version flavour installedname suffix build-depends +i386 2.6.24-24 386 2.6.24-24-386 - +i386 2.6.24-24 generic 2.6.24-24-generic - +powerpc 2.6.24-24 powerpc 2.6.24-24-powerpc - +amd64 2.6.24-24 generic 2.6.24-24-generic - --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/d-i/firmware/i386/nic-restricted-firmware +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/d-i/firmware/i386/nic-restricted-firmware @@ -0,0 +1,5 @@ +RADIO0d.BIN +RADIO11.BIN +RADIO15.BIN +TIACX111.BIN +WLANGEN.BIN --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/d-i/firmware/amd64/nic-restricted-firmware +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/d-i/firmware/amd64/nic-restricted-firmware @@ -0,0 +1,5 @@ +RADIO0d.BIN +RADIO11.BIN +RADIO15.BIN +TIACX111.BIN +WLANGEN.BIN --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/d-i/firmware/powerpc/nic-restricted-firmware +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/d-i/firmware/powerpc/nic-restricted-firmware @@ -0,0 +1,5 @@ +RADIO0d.BIN +RADIO11.BIN +RADIO15.BIN +TIACX111.BIN +WLANGEN.BIN --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/d-i/modules/i386/nic-restricted-modules +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/d-i/modules/i386/nic-restricted-modules @@ -0,0 +1,3 @@ +drivers/net/wireless/ath/ath_pci.o +drivers/net/wireless/ath_hal/ath_hal.o +drivers/net/wireless/ath_rate/onoe/ath_rate_onoe.o --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/d-i/modules/amd64/nic-restricted-modules +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/d-i/modules/amd64/nic-restricted-modules @@ -0,0 +1,3 @@ +drivers/net/wireless/ath/ath_pci.o +drivers/net/wireless/ath_hal/ath_hal.o +drivers/net/wireless/ath_rate/onoe/ath_rate_onoe.o --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/d-i/modules/powerpc/nic-restricted-modules +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/d-i/modules/powerpc/nic-restricted-modules @@ -0,0 +1,3 @@ +drivers/net/wireless/ath/ath_pci.o +drivers/net/wireless/ath_hal/ath_hal.o +drivers/net/wireless/ath_rate/onoe/ath_rate_onoe.o --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.links.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.links.in @@ -0,0 +1,8 @@ +usr/lib/libGL.so.@@VERSION@@ usr/lib/libGL.so.1 +usr/lib/libGLcore.so.@@VERSION@@ usr/lib/libGLcore.so.1 +usr/lib/libnvidia-cfg.so.@@VERSION@@ usr/lib/libnvidia-cfg.so.1 +usr/lib/libnvidia-tls.so.@@VERSION@@ usr/lib/libnvidia-tls.so.1 +usr/lib/tls/libnvidia-tls.so.@@VERSION@@ usr/lib/tls/libnvidia-tls.so.1 +usr/lib/xorg/modules/extensions/libglx.so.@@VERSION@@ usr/lib/xorg/modules/extensions/libglx.so +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA.so.1 +usr/lib/libXvMCNVIDIA.so.@@VERSION@@ usr/lib/libXvMCNVIDIA_dynamic.so.1 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/xorg-driver-fglrx-dev.links +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/xorg-driver-fglrx-dev.links @@ -0,0 +1,4 @@ +usr/lib/libfglrx_gamma.so.1 usr/lib/libfglrx_gamma.so +usr/lib/libfglrx_pp.so.1 usr/lib/libfglrx_pp.so +usr/lib/libfglrx_dm.so.1 usr/lib/libfglrx_dm.so +usr/lib/libfglrx_tvout.so.1 usr/lib/libfglrx_tvout.so --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/correct-lib-path.c +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/correct-lib-path.c @@ -0,0 +1,84 @@ +#include +#include +#include +#include +#include +#include +#include +#include + +extern const char *__progname; + +int main(int argc, char *argv[]) +{ + char *buf, *p; + struct stat st; + int fd; + char *find, *replace, *file; + int f_size, r_size; + + if (argc != 4) { + fprintf(stderr, "Usage: %s \n", + __progname); + exit(1); + } + + file = argv[1]; + find = argv[2]; + replace = argv[3]; + + f_size = strlen(find) + 1; + r_size = strlen(replace) + 1; + + if (r_size > f_size) { + fprintf(stderr, "ERROR: replace strings cannot be longer than find\n"); + exit(1); + } + + printf("Search for '%s' in '%s', to replace with '%s'...\n", + find, file, replace); + + if ((fd = open(argv[1], O_RDWR)) == -1) { + perror(argv[1]); + exit(1); + } + + if (fstat(fd, &st) == -1) { + perror(argv[1]); + exit(1); + } + + if ((buf = mmap(NULL, st.st_size, PROT_READ|PROT_WRITE, MAP_SHARED, + fd, 0)) == MAP_FAILED) { + perror(argv[1]); + exit(1); + } + + for (p = buf; p - buf < st.st_size; p++) { + /* Speed things up a bit */ + if (*p != *find) + continue; + + /* Make sure there's enough left */ + if (st.st_size - (p - buf) < f_size) + break; + + /* We check the terminating nul too */ + if (memcmp(p, find, f_size)) + continue; + + /* Got one, replace it. */ + printf("\tfound occurence at offset %lu...\n", p - buf); + + memset(p, 0, f_size); + memcpy(p, replace, r_size); + + /* There should be only one, but we keep looking */ + } + + munmap(buf, st.st_size); + + printf("\tCOMPLETED\n"); + + exit(0); +} --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/vmware-kernel-modules.postrm +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/vmware-kernel-modules.postrm @@ -0,0 +1,19 @@ +#!/bin/bash -e + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + kernel_ver=`uname -r` + if [ -f /boot/System.map-$kernel_ver ]; then + depmod -a -q -F /boot/System.map-$kernel_ver $kernel_ver + fi + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +#DEBHELPER# + +exit 0 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-kernel-source.README.Debian +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-kernel-source.README.Debian @@ -0,0 +1,166 @@ +nvidia-graphics-drivers for Ubuntu +---------------------------------- + + +INTRODUCTION: +----------------------------------------------------------------------- + +Welcome to Ubuntu NVIDIA packages. This document contains notes on the +kernel module interface for the NVIDIA driver offering. + + +KERNEL MODULE INSTRUCTIONS: +----------------------------------------------------------------------- + +There are TWO ways to build the nvidia-kernel package. Which one depends on +your situation with your kernel. + + METHOD #1: You are running a Ubuntu suppiled kernel or built a + kernel-headers package along with your own self-built kernel. + + METHOD #2: You are running your own self-built kernel built from kernel + source. + +Which method you choose really depends on what kernel headers you wish to +use, those from a kernel-headers package or those from kernel +source (from which you built your own kernel). + +As mentioned above, if you are running a Ubuntu supplied kernel you will +probably want to choose METHOD #1. If you compile your own kernels, METHOD #2. + + + +PRELIMINARY: +- Decide where you want to build your module. By default it +will build under /usr/src like other kernel modules but you may choose +to build it under your home directory as some people prefer and writing to +/usr violates the FHS. + + +SUPPORT FOR 2.6 KERNELS: +------------------------ +As of 1.0.5336-1, NVIDIA includes support for a 2.6 kernel. No extra steps are +required. + + +HOTPLUG SUPPORT: +------------------------ +As of version 1.0.5336-8 there is hotplug module loading support provided +in patches that are applied by default but by default, hotplug is set to +ignore PCI/AGP cards for display. To change this set IGNORE_PCI_CLASS_DISPLAY +to false in /etc/default/hotplug or run +dpkg-reconfigure -plow hotplug + + + +METHOD #1 Using a kernel-headers package +*********************************************************************** + +As root (or using fakeroot) +1. cd /usr/src + tar xzvf nvidia-kernel-source.tar.gz -C + (It will install in /modules) + - or - + tar xzvf nvidia-kernel-source.tar.gz (if building in /usr/src) + + The standard build location is /usr/src + +2. Find out your kernel version: + + uname -r For example: 2.4.21-4-k7 + +3. Download and install package: kernel-headers-2.4.21-4-k7 + It will install in /usr/src/ + + Make sure your kernel image and headers have matching release numbers to + avoid possible problems in packages built from different sources. + +4. Set some environment variables (if bash is your shell): + + export KSRC=/usr/src/kernel-headers-2.4.21-4-k7 + export KVERS=2.4.21-4-k7 + +5. Then build nvidia-kernel package: + + cd /modules/nvidia-kernel + debian/rules binary_modules + +(You can also combine step 4 and 5 into one line: +KSRC=/usr/src/kernel-headers-2.4.21-4-k7 KVERS=2.4.21-4-k7 debian/rules binary_modules) + +6. Install nvidia-kernel-common: + + If not installed already + apt-get install nvidia-kernel-common + +7. Install the nvidia-kernel package: + + dpkg -i ../nvidia-kernel-2.4.21-4-k7_1.0.6629-1+_.Custom_i386.deb + ( or similar filename ) + +Now see GENERAL NOTES below method #2 + +METHOD #2: Using your own kernel source headers +*********************************************************************** + +To build the nvidia-kernel deb you need to first make sure you have +kernel-package installed, then do the following: + +As root +1. cd /usr/src + tar xzvf nvidia-kernel-source.tar.gz -C + (It will install in /modules) + - or - + tar xzvf nvidia-kernel-source.tar.gz (if building in /usr/src) + +2. If you are NOT using the default modules location /usr/src/modules + then you must set an environment variable that points to your modules + location. + + export MODULE_LOC=/modules + + This is needed by make-kpkg which is used later. If + is /usr/src there is no need to set this. + +3. Build the modules under MODULE_LOC i.e. /modules + + cd linux (or your kernel source directory) + make-kpkg modules_image + +4. Install nvidia-kernel-common: + + apt-get install nvidia-kernel-common + +5. Install the nvidia-kernel package: + + cd (e.g. /usr/src) + dpkg -i nvidia-kernel-KVER*.deb + +Notes for method #2: + +- It is advised not to clean the kernel source tree between +"make-kpkg kernel_image" and "make-kpkg modules_image". + +- The Riva framebuffer is known to conflict with the nvidia X driver. If you +are using X it would be wise not to compile it in. The vesa framebuffer is +known to work slow but fine. + +GENERAL NOTES: + +Also you must add any users who wish to use OpenGL applications to the group +video. You can do this with: + + adduser username video + +Also note for AGP issues and further information please see the NVIDIA +README file (README.gz) in the nvidia-glx package + +An old nvidia.o might be already loaded (run 'lsmod' to check) so +do 'rmmod nvidia.o' to remove the module from memory. + + +For any news on this package check http://people.debian.org/~rdonald and +http://bugs.debian.org/nvidia-kernel-source + + + -- Randall Donald , Fri, 30 Apr 2004 19:02:04 -0700 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.examples.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.examples.in @@ -0,0 +1 @@ +@dirname@/usr/share/doc/XF86Config.sample --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/changelog +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/changelog @@ -0,0 +1,2340 @@ +linux-restricted-modules-2.6.24 (2.6.24.18-24.1) hardy-proposed; urgency=low + + [Tim Gardner] + + * SAUCE: Patch broadcom MODULE_LICENSE + - LP: #372425 + * SAUCE: Update Broadcom to 5_10_91_9 + - LP: #372425 + + -- Stefan Bader Mon, 04 May 2009 23:37:26 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.17-24.1) hardy-proposed; urgency=low + + * Updated broadcom wl driver to 5_10_79_10 + This has been tested to fix issues with random crashed and at least one + buffer overrun with 32 byte SSIDs. + - LP: #292450 + * Added build-orig-source target to automatically create orig.tar.gz + + -- Stefan Bader Wed, 08 Apr 2009 14:22:36 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.16-24.57) hardy-proposed; urgency=low + + * Bump ABI to -24 for -proposed kernel + + -- Stefan Bader Tue, 17 Feb 2009 20:21:39 +0000 + +linux-restricted-modules-2.6.24 (2.6.24.16-23.56) hardy-proposed; urgency=low + + * Update wl to 5_10_27_12 + This update from Broadcom has a new binary blob, better locking and + protection against the interrupt handler, and sets the VLAN mode to + off by default. They have also abstracted the ioctl code for kernels newer + then 2.6.26. + - LP: #292450 + + -- Tim Gardner Fri, 02 Jan 2009 21:59:39 +0000 + +linux-restricted-modules-2.6.24 (2.6.24.15-23.55) hardy-proposed; urgency=low + + * Updated Broadcom wl driver to version 5.10.27.11. The previous version + was actually 5.10.27.9 though that value was not reflected in the original + tarball name. Broadcom says this version should address some of + the kernel crashes folks are seeing, though there do not appear to + be any release notes about what exactly was fixed. + -LP: #292450 + + -- Tim Gardner Tue, 16 Dec 2008 16:37:03 +0000 + +linux-restricted-modules-2.6.24 (2.6.24.14-23.54) hardy-proposed; urgency=low + + * ABI bump to -23 for hardy-proposed release. + + -- Stefan Bader Wed, 26 Nov 2008 09:33:56 +0000 + +linux-restricted-modules-2.6.24 (2.6.24.14-22.53) hardy-security; urgency=low + + * ABI bump to -22 for hardy-security release. + + -- Stefan Bader Thu, 20 Nov 2008 11:36:14 +0100 + +linux-restricted-modules-2.6.24 (2.6.24.14-22.52) hardy-proposed; urgency=low + + * ABI bump to -22 + + -- Stefan Bader Thu, 13 Nov 2008 07:51:18 +0000 + +linux-restricted-modules-2.6.24 (2.6.24.14-21.51) hardy-proposed; urgency=low + + * Reimplmented the VLAN mode setting patch. It was occasionally + causing kernel lock violations. + LP: #259816 + + -- Tim Gardner Fri, 10 Oct 2008 03:38:49 +0000 + +linux-restricted-modules-2.6.24 (2.6.24.14-21.50) hardy-proposed; urgency=low + + * broadcom: Force vlan_mode to off on initialization of device. Otherwise + ssh and ssl connections will not work. + LP: #259816 + + -- Tim Gardner Fri, 12 Sep 2008 20:44:46 -0600 + +linux-restricted-modules-2.6.24 (2.6.24.14-21.49) hardy-proposed; urgency=low + + * Fixed oops in Fritz fwlanusb caused by writing beyond the end of + an array. Patch from Nils Kassube in the bug report. + LP: #200589 + + -- Tim Gardner Tue, 02 Sep 2008 14:47:45 -0600 + +linux-restricted-modules-2.6.24 (2.6.24.14-21.48) hardy-proposed; urgency=low + + * Fix Fritz PCI interrupt init problem. + LP: #204624 + + -- Tim Gardner Tue, 19 Aug 2008 16:05:46 +0000 + +linux-restricted-modules-2.6.24 (2.6.24.14-21.47) hardy-proposed; urgency=low + + * ABI bump to -21 + + -- Tim Gardner Wed, 13 Aug 2008 13:08:43 -0600 + +linux-restricted-modules-2.6.24 (2.6.24.14-20.46) hardy-proposed; urgency=low + + * ABI Bump to -20 + * Upgrade Broadcom to 5.10.27 + + -- Tim Gardner Thu, 10 Jul 2008 17:07:00 -0600 + +linux-restricted-modules-2.6.24 (2.6.24.13-19.45) hardy-proposed; urgency=low + + * Fix broadcom Makefile to get correct objects from split-module. + LP: #243930 + + -- Ben Collins Sun, 06 Jul 2008 15:18:03 -0400 + +linux-restricted-modules-2.6.24 (2.6.24.13-19.44) hardy-proposed; urgency=low + + * Just ditch bcmwl from nic-restricted udeb. + + -- Ben Collins Thu, 26 Jun 2008 19:40:42 -0400 + +linux-restricted-modules-2.6.24 (2.6.24.13-19.43) hardy-proposed; urgency=low + + * Use split_module on wl.ko + * Add wl_supported for lrm-common + + -- Ben Collins Thu, 26 Jun 2008 10:34:57 -0400 + +linux-restricted-modules-2.6.24 (2.6.24.13-19.42) hardy-proposed; urgency=low + + * ABI bump to -19 + + -- Tim Gardner Wed, 04 Jun 2008 10:43:41 -0600 + +linux-restricted-modules-2.6.24 (2.6.24.13-18.41) hardy-security; urgency=low + + * Fix powerpc FTBS, need to explicitly disable Broadcom driver build. + + -- Tim Gardner Fri, 30 May 2008 10:49:48 -0600 + +linux-restricted-modules-2.6.24 (2.6.24.13-18.40) hardy-security; urgency=low + + * Fix lpia FTBS. The build arch for the new Broadcom WL driver was + not properly specified. + + -- Tim Gardner Thu, 29 May 2008 15:02:53 -0600 + +linux-restricted-modules-2.6.24 (2.6.24.13-18.39) hardy-security; urgency=low + + * Security upload with ABI bump to -18 + + -- Tim Gardner Thu, 29 May 2008 11:25:17 -0600 + +linux-restricted-modules-2.6.24 (2.6.24.13-17.38) hardy-proposed; urgency=low + + * Add new Broadcom driver that supports only PCI ID 14e4:4315. There is no + overlap with any kernel driver, therefore no possiblity of regression. + * Skip 17.37 version number since that is the Dell pre-installed + version of LRM with this Broadcom driver. It was used by Dell but + never got uploaded to the Ubuntu archive. + + -- Tim Gardner Wed, 28 May 2008 08:24:57 -0600 + +linux-restricted-modules-2.6.24 (2.6.24.12-17.36) hardy-proposed; urgency=low + + * nvidia: Do not divert libwfb.so, because if the xserver provides one + it should be used. Remove the diversion in postinst. This caused at + least problems with some websites making the xserver crash (LP: #212648), + and missing or falsely colored shadows with compiz. (LP: #186382) + * fglrx: Patch authatieventsd.sh to search for xauth files from + /var/run/xauth/. Otherwise the session would freeze on logout for KDM + users. Thanks Ilja Pavkovic! (LP: #118605) + + -- Timo Aaltonen Wed, 07 May 2008 11:27:35 +0300 + +linux-restricted-modules-2.6.24 (2.6.24.12-17.35) hardy-proposed; urgency=low + + * Kernel ABI bump to 17. + + -- Tim Gardner Fri, 02 May 2008 07:44:34 -0600 + +linux-restricted-modules-2.6.24 (2.6.24.12-16.34) hardy; urgency=low + + * Bump the ABI to 16. + * rules: fix dh_strip to not strip the current versions of nvidia. + + -- Timo Aaltonen Fri, 11 Apr 2008 00:48:35 +0300 + +linux-restricted-modules-2.6.24 (2.6.24.12-15.33) hardy; urgency=low + + [ Matthias Klose ] + * nvidia-glx: Install the TLS library in /usr/lib, symlink the one in + /usr/lib/tls to the one in /usr/lib. LP: #205079. + + -- Timo Aaltonen Fri, 04 Apr 2008 16:59:50 +0300 + +linux-restricted-modules-2.6.24 (2.6.24.12-14.32) hardy; urgency=low + + * ABI bump to 14. + * Madwifi 0.9.4 (LP: #208754): + - fixes compilation for recently released kernel 2.6.24 + - introduces Minstrel rate control algorithm + - introduces switch to turn ANI (Ambience Noise Immunity) off, which + can help to improve performance (see also #705) + - several bug fixes to improve stability + - now defaults to radiotap headers in monitor mode + - adds support for variable number of VAPs, tunable via module + parameter + * control: Drop the nvidia-kernel-ABIVER dependencies from nvidia-glx*, since + fglrx is doing just fine without them, and they only create problems + during upgrades when apt selects the first package to provide the + virtual package. (LP: #188287) + * ltmodem/serial.c: Modify to compile with 2.6.24. Enable ltmodem again. + (LP: #210652) + * Add openvz flavour. + + -- Timo Aaltonen Thu, 03 Apr 2008 01:45:22 +0300 + +linux-restricted-modules-2.6.24 (2.6.24.11-12.31) hardy; urgency=low + + * fglrx 8-3 (LP: #199304) + - On workstation hardware 3D applications will no longer be corrupted + if the screen width is not an integer multiple of 64 pixels, for + example with a 1680x1050 wide screen display. Further details can be + found in topic number 737-31720 + - Display flicker is no longer be noticed when the gnome screen-saver + starts (LP: #198702) + - Several image brightness and gamma-correction issues were + resolved. Setting the gamma correction using xgamma, fglrx_xgamma, + xorg.conf and in OpenGL games will all work as expected now. + - Diagonal tearing will no longer be noticed when playing a video file + using a video player that utilizes the XVideo extension + - Video playback will no longer look blocky when playing a video file + using a video player that utilizes the XVideo extension + + -- Timo Aaltonen Tue, 11 Mar 2008 17:23:04 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.10-12.30) hardy; urgency=low + + * ABI Bump to 12 + + -- Ben Collins Sat, 08 Mar 2008 13:19:11 -0500 + +linux-restricted-modules-2.6.24 (2.6.24.10-11.29) hardy; urgency=low + + * ABI bump to -11. + * nvidia-new 169.12 (LP: #195901) + - Improved power management support with GeForce 8 GPUs. + - Further improved stability on some GeForce 8 GPUs. + - Fixed a bug that broke certain TwinView configurations with TV-OUT on + GeForce 8 GPUs. + - Fixed a bug that could cause OpenGL to crash in certain cases, e.g. + when running Counter-Strike under Wine. (LP: #194599) + - Further improved GLX_EXT_texture_from_pixmap out-of-memory handling. + - Fixed a bug that could result in incorrect PowerMizer state being + reported. + - Improved nvidia-xconfig behavior when updating X configuration files + without a "Module" section. + - Worked around a problem that caused function key presses on some + Toshiba notebooks to result in system crashes. + + -- Timo Aaltonen Fri, 29 Feb 2008 18:48:02 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.9-10.28) hardy; urgency=low + + * Fix the Fritz drivers for i386 and amd64 to build with 2.6.24. + + -- Matthias Klose Wed, 27 Feb 2008 19:19:40 +0100 + +linux-restricted-modules-2.6.24 (2.6.24.9-10.27) hardy; urgency=low + + [ Timo Aaltonen ] + * Re-use 3-check-for-xen-build.diff for ati, refreshed (FTBFS). + * rules: Obtain the abiver with dpkg-parsechangelog. + + [ Chuck Short ] + * Modify nvidia/patches/1-nvidia-2.6.24-xen.patch to use . + Still doesn't build though, so not enabled. + + -- Timo Aaltonen Tue, 26 Feb 2008 18:24:36 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.9-10.26) hardy; urgency=low + + * ABI bump to -10. + * Enable xen on amd64, i386. No nvidia for now, since it doesn't build. + + -- Timo Aaltonen Tue, 26 Feb 2008 12:40:49 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.9-8.25) hardy; urgency=low + + * nvidia-glx.links.amd64.in: sigh, add a missing slash. (LP: 192253) + + -- Timo Aaltonen Sun, 17 Feb 2008 09:34:01 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.9-8.24) hardy; urgency=low + + * This time fix the libglx.so link path for amd64, and while at it do + the same for lintian overrides. (LP: #192253) + + -- Timo Aaltonen Sat, 16 Feb 2008 09:38:46 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.9-8.23) hardy; urgency=low + + * Brown paper bag release vol. 2, now with a bottle. + * nvidia-glx.links.in: + - Fix the path of libglx.so. + + -- Timo Aaltonen Fri, 15 Feb 2008 17:34:10 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.9-8.22) hardy; urgency=low + + * Brown paper bag release. + * Bump the ABI-version this time.. + + -- Timo Aaltonen Fri, 15 Feb 2008 02:17:02 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.9-8.21) hardy; urgency=low + + * nvidia/patches-new/1-nvidia-2.6.24-xen.patch: + - Patch to disable xen properly for nvidia-new (FTBFS). + + -- Timo Aaltonen Thu, 14 Feb 2008 22:38:54 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.9-8.20) hardy; urgency=low + + [ Timo Aaltonen ] + * nvidia-glx*: + - When using the nvidia-settings binary for storing + values in xorg.conf it clutters up the file with unneeded settings, + and some are just plain wrong nowadays (the mouse device for + instance). So, don't ship the version included in the drivers, instead + Suggest nvidia-settings -package (again), and fix the issues there. + - Don't ship nvidia-settings.desktop, only the .png file. + Nvidia-settings will include the desktop-file. + * rules: + - Enable fglrx for -rt (LP: #182242) + * rules, control.stub.in: + - Enable -server flavor. (LP: #153011) + * dvb: + - Add dvb-usb-bluebird-01.fw (LP: #90723) + - Add dvb-fe-tda10046.fw (LP: #107090) + * ati: Update fglrx to 8-02. (LP: #173663, #189772) + * {nvidia-glx,nvidia-glx-dev,xorg-driver-fglrx}.postrm.in + - Check that the diverted file actually belongs to the current package + before trying to remove the diversion. Thanks to Kirk Turner and + Alberto Milone for patches, and Michael Vogt for review! + (LP: #36625, #130208, #175789) + * nvidia-glx.{preinst,postrm}.in, rules: + - Fix the path of libglx.so. + * rules: + - Unexport CFLAGS and LDFLAGS to cope with the new dpkg-buildpackage. + + [ Alberto Milone ] + * debian/lrm-video: Add support for EnvyNG. + + -- Timo Aaltonen Thu, 14 Feb 2008 17:57:44 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.8-7.19) hardy; urgency=low + + * Really include nvidia-settings binary in nvidia-glx-legacy, and set + Conflicts accordingly. (LP: #22297) + * nvidia-glx-new suggested nvidia-settings, now conflicts instead. + + -- Timo Aaltonen Fri, 08 Feb 2008 14:17:30 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.8-7.18) hardy; urgency=low + + * Update nvidia -> 96.43.05, nvidia-legacy -> 71.86.04. + * nvidia*: Add the desktop file and png for nvidia-settings. + (LP: #44897) + * Added DVB firmware files: + - dvb-usb-wt220u-fc03.fw (LP: #91415) + - dvb-usb-wt220u-zl0353-01.fw (LP: #61181) + - dvb-usb-dib0700-1.10.fw (LP: #179626, #95277) + * Add atieventsd -initscript to xorg-driver-fglrx. (LP: #58785) + + -- Timo Aaltonen Fri, 08 Feb 2008 13:42:42 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.7-7.17) hardy; urgency=low + + * Kernel ABI bump to -7. Skipped (-6) because of kernel FTBS issues. + * Use different locking mechanism for -rt flavor. + * Deleted the ipw3945d tarball (hence the bump to 2.6.24.7) + + -- Tim Gardner Tue, 5 Feb 2008 08:16:38 -0700 + +linux-restricted-modules-2.6.24 (2.6.24.6-5.16) hardy; urgency=low + + * Kernel ABI bump to -5 + + -- Tim Gardner Thu, 24 Jan 2008 11:16:55 -0700 + +linux-restricted-modules-2.6.24 (2.6.24.6-4.15) hardy; urgency=low + + * fglrx: Install amdpcsdb.default, in fact install everything from + etc/ati/* just to be sure. (LP: #185654) + + -- Timo Aaltonen Thu, 24 Jan 2008 17:32:19 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.6-4.14) hardy; urgency=low + + * rules: Fix amdcccle.desktop install path. + + -- Timo Aaltonen Wed, 23 Jan 2008 12:04:17 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.6-4.13) hardy; urgency=low + + [ Timo Aaltonen ] + * nvidia: Update to 169.09 + - Fixed a problem causing the fan on some GPUs to always run + at full speed. (LP: #184914) + - Fixed a bug that caused the X driver to crash if the X.Org + GLX extension module was loaded intead of NVIDIA's. + - Improved the X driver's awareness of the current notebook + docking status. + - Fixed brightness control on HP Compaq notebooks. + - Fixed a bug in the Linux/i2c algorithm driver implementation + that prevented core transfer types from succeeding. + * fglrx: Update to 8-01 (LP: #177829, #148345) + - Corruption will no longer be noticed in the lower right corner + of the display or on the mouse pointer after the system is + running for a long period of time. (LP: #106148) + - Connecting a display device that supports 1680x1050 to a system + running Linux will no longer result in a maximum display resolution + of 1280x1024 only being available. + - Custom mode lines in xorg.conf will no longer be ignored by the + fglrx driver. + - Suspending to RAM or DISK on kernel version 2.6.23 or later no + longer fails. (LP: #121653) + * nvidia/nvidia-glx-config: Remove, not needed anymore and only confuses + people and breaks keyboard setups (LP: #152486) + * control.stub.in: Add fglrx-amdcccle dummy package for easy transition + from packages generated by the ATI installer. + * fglrx-control: + - Remove fireglcontrol*.desktop, and install amdcccle*.desktop from + the extracted installer instead. + - Install amdcccle in this package, not the driver. + - Conflicts/Replaces xorg-driver-fglrx <= $previousversion. + * fglrx.xsession: Obsolete by now, removed. + * Drop obsolete build-dependencies: libxxf86misc-dev, libxtst-dev, + libxxf86vm-dev, libxinerama-dev, libstdc++5, libqt-mt-dev. + + [ Johan Kiviniemi ] + * nvidia_supported: New version to support the latest NVIDIA + release. (LP: #182237) + + -- Timo Aaltonen Wed, 23 Jan 2008 11:41:54 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.5-4.12) hardy; urgency=low + + * Upgrade madwifi tarball to 0.9.3.3 + * Add patch to fix sysctl for 2.6.24 to madwifi + (LP: 178648) + + -- Amit Kucheria Fri, 18 Jan 2008 20:04:51 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.4-4.11) hardy; urgency=low + + * Kernel ABI bump to -4 + * Added rt to build. + * Fixed powerpc package duplication. + + -- Tim Gardner Thu, 10 Jan 2008 10:47:00 -0700 + +linux-restricted-modules-2.6.24 (2.6.24.4-3.10) hardy; urgency=low + + * Kernel ABI bump to -3 + * Updated dvd firmware to dvb-usb-wt220u-02.fw + + -- Tim Gardner Fri, 4 Jan 2008 13:43:56 -0700 + +linux-restricted-modules-2.6.24 (2.6.24.3-2.9) hardy; urgency=low + + * nvidia-glx-new: Update to 169.07 (LP: #177826). + * Move fwlanusb to the tarball, was previously in the diff. + * fix nvidia-glx-new-dev description (LP: #158530). + * debian/rules: Clean up ati:Revision and ati:XFree86Version tags, + which were not used. + * fglrx: Added signature and control files to remove watermark + (LP: #176638). + * lrm-manager: Add --list parameter to show disabled modules + (LP: #121590). + + -- Timo Aaltonen Thu, 03 Jan 2008 14:09:29 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.2-2.8) hardy; urgency=low + + * debian/control.stub.in: + - nvidia*/fglrx Provides: xserver-xorg-video-2. (LP: #177609) + - fglrx: Updated the list of supported cards. + * debian/nvidia-glx.{preinst,postrm}.in + - Divert libwfb.so provided by xserver-xorg-core. (LP: #98641) + - Clean up old X11R6 diversions from preinst. + - Clean up some whitespace from preinst for readability. + + -- Timo Aaltonen Sat, 22 Dec 2007 21:32:11 +0200 + +linux-restricted-modules-2.6.24 (2.6.24.2-2.7) hardy; urgency=low + + * Updated 96xx and 71xx nvidia drivers to latest from nvidia.com + + -- Ben Collins Wed, 19 Dec 2007 12:10:42 -0500 + +linux-restricted-modules-2.6.24 (2.6.24.1-2.6) hardy; urgency=low + + * Add epoch to fglrx packages. New ATI version computes as lower than the + previous release. + + -- Ben Collins Wed, 19 Dec 2007 08:54:14 -0500 + +linux-restricted-modules-2.6.24 (2.6.24.1-2.5) hardy; urgency=low + + * Whoops, ati subdir disappeared + + -- Ben Collins Tue, 18 Dec 2007 12:51:48 -0500 + +linux-restricted-modules-2.6.24 (2.6.24.1-2.4) hardy; urgency=low + + * Add -N to `dh_gencontrol -s` call, to exclude all packages where we + handle special versions. This was causing duplicate debian/files entries. + It only recently began breaking the build with newer dpkg-dev. + * x86_64: Use x86 arch files. ATI upstream no longer provides lib32 dir. + + -- Ben Collins Tue, 18 Dec 2007 10:40:12 -0500 + +linux-restricted-modules-2.6.24 (2.6.24.1-2.3) hardy; urgency=low + + * Try a rebuild with cleaned up control file. + + -- Ben Collins Mon, 17 Dec 2007 12:38:06 -0500 + +linux-restricted-modules-2.6.24 (2.6.24.1-2.2) hardy; urgency=low + + * ABI bump to -2 + * Patches for nv and nv-legacy to compile against newer kernel + - kmem_cache_t -> struct kmem_cache + - kmem_cache_create() doesn't take a constructor anymore + - unregister_chrdev doesn't return value anymore + + -- Ben Collins Mon, 17 Dec 2007 09:55:02 -0500 + +linux-restricted-modules-2.6.24 (2.6.24.1-1.1) hardy; urgency=low + + * Convert to build with 2.6.24 + * Disable xen/rt builds + * Disable ltmodem and fritz for now, doesn't build with current headers + + -- Ben Collins Tue, 04 Dec 2007 16:27:06 -0500 + +linux-restricted-modules-2.6.22 (2.6.22.4-14.10) gutsy-proposed; urgency=low + + * Fix module load issue for fcpci, et. al. LP: #121978 + * remove hidden file .nvidia_new_installed. LP: #106217 + + -- LaMont Jones Mon, 29 Oct 2007 10:34:50 -0600 + +linux-restricted-modules-2.6.22 (2.6.22.4-14.9) gutsy; urgency=low + + * Fix fwlanusb driver (Alexander Sack). LP: #152867. + + -- Matthias Klose Mon, 15 Oct 2007 10:55:20 +0200 + +linux-restricted-modules-2.6.22 (2.6.22.4-14.8) gutsy; urgency=low + + * Bump ABI to -14. + + -- Kyle McMartin Mon, 08 Oct 2007 10:31:41 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.4-13.7) gutsy; urgency=low + + * Fix a typo is calling postinst - nv_flavours -> flavours + Fixes bug #150495 + + -- Amit Kucheria Mon, 08 Oct 2007 18:46:25 +0300 + +linux-restricted-modules-2.6.22 (2.6.22.4-13.6) gutsy; urgency=low + + * Make 'nv' in /etc/default/linux-restricted-modules-common disable + nvidia_new as well. + + -- Colin Watson Fri, 05 Oct 2007 20:40:06 +0100 + +linux-restricted-modules-2.6.22 (2.6.22.4-13.5) gutsy; urgency=low + + * Add lpiacompat flavour for lpia + * Bump ABI to -13 + + -- Amit Kucheria Wed, 03 Oct 2007 18:49:53 +0300 + +linux-restricted-modules-2.6.22 (2.6.22.4-12.4) gutsy; urgency=low + + * Add fwlanusb driver for i386. + + -- Matthias Klose Sat, 29 Sep 2007 12:08:23 +0200 + +linux-restricted-modules-2.6.22 (2.6.22.4-12.3) gutsy; urgency=low + + * hppa no longer needs to build-depend gcc-3.4. + + -- LaMont Jones Sun, 23 Sep 2007 10:19:01 -0600 + +linux-restricted-modules-2.6.22 (2.6.22.4-12.2) gutsy; urgency=low + + * Updated nvidia_supported to correctly output lines for latest nvidia + driver. Thanks Johan Kiviniemi + + -- Ben Collins Sun, 23 Sep 2007 11:17:05 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.4-12.1) gutsy; urgency=low + + * ABI bump for -12 + * Upgrade nvidia-new driver to 100.14.19 + * Default to nvidia-new + * Add patch to allow fglrx to compile with xen/rt flavours + * Enable nvidia/fglrx on xen/rt flavours + + -- Ben Collins Wed, 19 Sep 2007 17:00:05 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.3-11.4) gutsy; urgency=low + + * Build xen flavour on amd64. + * Use debian/compat rather than DH_COMPAT. + + -- Colin Watson Wed, 19 Sep 2007 19:31:51 +0100 + +linux-restricted-modules-2.6.22 (2.6.22.3-11.3) gutsy; urgency=low + + * Include libwfb.so symlink + + -- Ben Collins Sat, 08 Sep 2007 11:45:34 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.3-11.2) gutsy; urgency=low + + * ABI bump to -11 + * Add lpia architecture support + * Install libwfb, LP: #98641 + + -- Ben Collins Fri, 07 Sep 2007 11:44:20 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.3-10.1) gutsy; urgency=low + + * Update nvidia drivers: + - nvidia-legacy -> 1.0-7185 + - nvidia-new -> 100.14.11 + - nvidia -> 1.0-9639 + + * ABI bump for -10 + + -- Ben Collins Mon, 20 Aug 2007 11:59:21 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.2-9.8) gutsy; urgency=low + + * Upgraded madwifi to 0.9.3.2 + + -- Tim Gardner Tue, 14 Aug 2007 17:58:58 +0000 + +linux-restricted-modules-2.6.22 (2.6.22.2-9.7) gutsy; urgency=low + + * lrm for -rt needs to dep on -rt kernel, not -xen kernel. + + -- Ben Collins Mon, 06 Aug 2007 12:06:44 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.2-9.6) gutsy; urgency=low + + * Oh well, disable xen/rt for fglrx and nvidia. + + -- Ben Collins Mon, 30 Jul 2007 21:11:44 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.2-9.5) gutsy; urgency=low + + * ABI bump + * Add -xen build for i386 + * Add -rt builds for i386 and amd64 + + -- Ben Collins Sat, 28 Jul 2007 12:58:52 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.2-8.4) gutsy; urgency=low + + * madwifi update to 0.9.3.1: + CVE-2006-7180 - http://madwifi.org/changeset/1760 + CVE-2006-7177 - http://madwifi.org/changeset/1818 + CVE-2006-7178 - http://madwifi.org/changeset/1818 + CVE-2006-7179 - http://madwifi.org/changeset/1762 + + -- Tim Gardner Tue, 17 Jul 2007 19:55:18 +0000 + +linux-restricted-modules-2.6.22 (2.6.22.2-8.3) gutsy; urgency=low + + * ABI bump for -8 + + -- Amit Kucheria Tue, 26 Jun 2007 00:46:24 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.2-7.2) gutsy; urgency=low + + * ABI bump for -7 + * Remove bigiron. + + -- Ben Collins Tue, 26 Jun 2007 00:46:24 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.2-6.1) gutsy; urgency=low + + * Update fglrx to new upstream 8.37.6 + - New features since 8.34.8: + + Support for linux kernel 2.6.20 + + Catalyst Control Center version 1.0 for adjusting 3D apps + - Resolved issues since 8.34.8: + + In certain AGP graphics cards the system no longer ceases to + respond when switching from the X-Server display to a text console. + + The screen no longer turns black if the X-Server is terminated + from the text console. This condition was known to occur only on + certain laptop configurations. [ATI# 737-26829]. + + Logging out of a session to the graphical login manager no longer + crashes the Xserver + - Known issues as of 8.37.6: + + Using the xgl enabled x-server interface disables display + switching hot plug support + + An increase in CPU utilization will be experienced for video + playback using GLESX comapred with GSL. [ATI# 737-26983] + + Video tearing during playback. [ATI# 737-26984] + + There is no support for video playback on the second head in dual + head mode. [ATI# 737-26985] + * Drop patch 1-2.6.20-fixes.diff - compatibility to 2.6.20 no longer + required, so patch is obsolete. [LP: #101984] + + -- Bryce Harrington Mon, 18 Jun 2007 14:05:13 -0700 + +linux-restricted-modules-2.6.22 (2.6.22.1-6.8) gutsy; urgency=low + + * ABI bump for -6 + + -- Ben Collins Fri, 01 Jun 2007 15:38:46 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.1-5.7) gutsy; urgency=low + + * ABI bump for -5. + + -- Ben Collins Sat, 19 May 2007 09:05:40 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.1-4.6) gutsy; urgency=low + + * ABI bump for -4 + + -- Ben Collins Thu, 17 May 2007 13:44:55 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.1-3.5) gutsy; urgency=low + + * ati: ioctl32.h is not longer needed. + + -- Ben Collins Tue, 15 May 2007 16:59:05 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.1-3.4) gutsy; urgency=low + + * madwifi: Fix FTBFS on amd64. Cannot use skb->end for pointer, must use + skb_end_pointer(). + + -- Ben Collins Tue, 15 May 2007 13:50:34 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.1-3.3) gutsy; urgency=low + + * *sigh* Remove -rt and -xen from build-deps too. + + -- Ben Collins Tue, 15 May 2007 11:08:59 -0400 + +linux-restricted-modules-2.6.22 (2.6.22.1-3.2) gutsy; urgency=low + + * ABI bump. + * Add patches for madwifi to make it compile with newer kernels (sk_buff + changes). + * Diable rt and xen builds. + * Add generic to LTMODEM build. + + -- Ben Collins Sun, 6 May 2007 18:18:35 +0200 + +linux-restricted-modules-2.6.22 (2.6.22.1-1.1) gutsy; urgency=low + + * New kernel, new lrm. + * Added -rt and -xen flavours. Do not build fglrx for -rt (wont compile due + to use of GPL-only symbol). + + -- Ben Collins Sat, 21 Apr 2007 12:40:36 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.5-15.20) feisty; urgency=low + + * ABI bump for -15. + + -- Colin Watson Fri, 13 Apr 2007 13:37:30 +0100 + +linux-restricted-modules-2.6.20 (2.6.20.5-14.19) feisty; urgency=low + + * debian/linux-restricted-modules-common.modprobe: Add line for nvidia_new, + so that it does not get autoloaded on boot. (LP: #105593) + + -- Martin Pitt Thu, 12 Apr 2007 07:50:30 +0000 + +linux-restricted-modules-2.6.20 (2.6.20.5-14.18) feisty; urgency=low + + * Fix typo in last change to really fix ppc build failure. + + -- Ben Collins Tue, 10 Apr 2007 18:06:52 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.5-14.17) feisty; urgency=low + + * Do not do ath supported for powerpc64-smp. Fixes FTBFS on ppc. + + -- Ben Collins Tue, 10 Apr 2007 12:18:32 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.5-14.16) feisty; urgency=low + + * Change nvidia back to 9631, add epoch for nvidia-glx packages. + * Add nvidia-news package at version 9755. This is the path of least + surprise. + * Add module alias override patch from Johan Kiviniemi + . + + -- Ben Collins Tue, 10 Apr 2007 00:16:00 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.4-14.15) feisty; urgency=low + + * ABI bump for -14. + + -- Colin Watson Thu, 5 Apr 2007 12:46:12 +0100 + +linux-restricted-modules-2.6.20 (2.6.20.4-13.14) feisty; urgency=low + + * Don't fail if debian/d-i/{modules,firmware}/$(DEB_HOST_ARCH) doesn't + exist. + + -- Colin Watson Mon, 2 Apr 2007 09:29:17 +0100 + +linux-restricted-modules-2.6.20 (2.6.20.4-13.13) feisty; urgency=low + + * Build generic flavour udebs for i386 (LP: #85362). + * Ship debian/control.stub as debian/control, and build the real control + file on the fly with the udebs for just the current architecture. This + is nasty, I know, but kernel-wedge can't consolidate the multiple + stanzas for nic-restricted-*-generic-di and debhelper doesn't like there + being more than one stanza for a given package name. + + -- Colin Watson Mon, 2 Apr 2007 01:31:28 +0100 + +linux-restricted-modules-2.6.20 (2.6.20.4-13.12) feisty; urgency=low + + * madwifi: Update to v0.9.3. + * ABI bump for -13. + + -- Ben Collins Wed, 21 Mar 2007 22:10:24 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.3-12.11) feisty; urgency=low + + * ABI bump for -12 + + -- Ben Collins Sun, 18 Mar 2007 00:20:23 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.3-11.10) feisty; urgency=low + + * Bump ABI for -11. + + -- Ben Collins Thu, 15 Mar 2007 08:41:26 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.3-10.9) feisty; urgency=low + + * ABI bump to -10. + * Update ATI driver to 8.34.8 + + -- Ben Collins Mon, 12 Mar 2007 12:01:06 -0400 + +linux-restricted-modules-2.6.20 (2.6.20.2-9.8) feisty; urgency=low + + * ABI bump to -9. + + -- Ben Mon, 26 Feb 2007 12:01:12 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.2-8.7) feisty; urgency=low + + * Fix vmware post inst/rm. + + -- Ben Collins Sat, 17 Feb 2007 18:30:08 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.2-8.6) feisty; urgency=low + + * ABI bump for -8.14 + * Update ATI driver to 8.33.6. + + -- Ben Collins Mon, 12 Feb 2007 14:58:39 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-7.5) feisty; urgency=low + + * Fix vmware kernel module post inst/rm calls for depmod. + * ABI bump for -7.12 + + -- Ben Collins Mon, 5 Feb 2007 10:43:56 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-6.4) feisty; urgency=low + + * Beat me with a stick. + * Fix the powerpc build, finally. + + -- Ben Collins Mon, 5 Feb 2007 06:30:09 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-6.3) feisty; urgency=low + + * madwifi: Switch ppc and others to elf-hal, like i386/x86_64/ia64. + + -- Ben Collins Mon, 5 Feb 2007 03:50:22 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-6.2) feisty; urgency=low + + * Add madwifi-0.9.3-wip patch, taken from svn trunk. Should fix atheros + crashes. + + -- Ben Collins Sun, 4 Feb 2007 12:24:04 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-6.1) feisty; urgency=low + + * ABI bump for 2.6.20-6.7 + * Version match with kernel ABI. + + -- Ben Collins Tue, 9 Jan 2007 20:21:58 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-6) feisty; urgency=low + + * ABI bump for 2.6.20-5.7 + + -- Ben Collins Sat, 6 Jan 2007 12:01:38 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-5) feisty; urgency=low + + * ABI bump for 2.6.20-4.5. + + -- Ben Collins Wed, 3 Jan 2007 21:04:07 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-4) feisty; urgency=low + + * vmware-server: Add server(amd64,i386) and server-bigiron(i386) flavours. + * vmware-tools: Add server(amd64,i386) flavours. + * Add build-dep for server/server-bigiron headers. + * ABI bump for 2.6.20-3 + + -- Ben Collins Mon, 18 Dec 2006 18:03:37 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-3) feisty; urgency=low + + * Revert ATI kernel module build to use syscall entries. Had to add i386 and + amd64 versions of these deprecated macros. + + -- Ben Collins Mon, 18 Dec 2006 11:37:04 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-2) feisty; urgency=low + + * Disable vmdesched on x86_64. Fixes FTBFS. + + -- Ben Collins Sun, 17 Dec 2006 00:06:12 -0500 + +linux-restricted-modules-2.6.20 (2.6.20.1-1) feisty; urgency=low + + * Bump and first release for 2.6.20-2. + + -- Ben Collins Sun, 10 Dec 2006 21:11:08 -0500 + +linux-restricted-modules-2.6.19 (2.6.19.3-2) feisty; urgency=low + + * Bump ABI to -7. + * Add lowlatency target for x86 and x86_64. + + -- Ben Collins Wed, 29 Nov 2006 09:05:06 -0500 + +linux-restricted-modules-2.6.19 (2.6.19.3-1) feisty; urgency=low + + * Update ATI drivers to 8.31.5. + + -- Ben Collins Tue, 21 Nov 2006 21:30:36 -0500 + +linux-restricted-modules-2.6.19 (2.6.19.2-2) feisty; urgency=low + + * ati: Fix typo which caused xorg modules to not be installed on amd64. + + -- Ben Collins Tue, 21 Nov 2006 20:51:54 -0500 + +linux-restricted-modules-2.6.19 (2.6.19.2-1) feisty; urgency=low + + * Upgrade nvidia drivers to 1.0-9629 + + -- Ben Collins Mon, 20 Nov 2006 19:34:15 -0500 + +linux-restricted-modules-2.6.19 (2.6.19.1-1) feisty; urgency=low + + * First release for 2.6.19. + + [madwifi] + + * Remove includes for linux/config.h + * Fix irq handler declarations + * Disable -Werror, since some crypto functions produce warnings due to being + obsolete. + + [vmware-player] + + * CHECKSUM_HW -> CHECKSUM_COMPLETE + + [ltmodem] + + * Fix irq handler declarations + * Remove includes for linux/config.h + + [ati] + + * Update driver to 8.29.6. Now uses a single shar for both x86 and x86_64. + * Reworked build setup for new packaging. + + [nvidia] + + * Fix irq handler declarations + * Remove includes for linux/config.h + + [fritz] + + * Remove includes for linux/config.h + * Fix irq handler declarations + + -- Ben Collins Wed, 1 Nov 2006 13:46:06 -0500 + +linux-restricted-modules-2.6.17 (2.6.17.5-11) edgy; urgency=low + + * nvidia/nvidia-glx-config: Use modprobe with -i when checking for the + nvidia module, since it will not load before xorg.conf gets changed. + Closes: LP#66908 + + -- Martin Pitt Thu, 19 Oct 2006 15:36:24 +0000 + +linux-restricted-modules-2.6.17 (2.6.17.5-10) edgy; urgency=low + + * Introduce /sbin/lrm-video to do detection of the current Xorg driver, + and load the right (nvidia/nvidia_legacy/fglrx or none) module. + * Remove the modprobe hack that was used for the above, and replace with + a much simpler modprobe.d snippet that just calls the above script. + * Make nvidia-glx, nvidia-glx-legacy, and xorg-driver-fglrx depend on + linux-restricted-modules-common to get the above script when wanted. + * Disable building and shipping madwifi for powerpc64-smp, since we don't + have a powerpc64 binary blob provided by upstream (yet, here's hoping). + * Fix the clean target to get rid of vmware-player-kernel-modules.postrm. + + -- Adam Conrad Mon, 9 Oct 2006 15:36:47 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.5-9) edgy; urgency=low + + * Use the /.../I GNU extension to sed to match and replace + case-insensitively instead of using /usr/bin/tr, otherwise people with + /usr on a separate partition won't get the fglrx module loaded. + + -- Scott James Remnant Wed, 4 Oct 2006 10:03:48 +0100 + +linux-restricted-modules-2.6.17 (2.6.17.5-8) edgy; urgency=low + + * Don't allow the fglrx module to be loaded if it's not used in + xorg.conf + + -- Scott James Remnant Tue, 3 Oct 2006 10:30:01 +0100 + +linux-restricted-modules-2.6.17 (2.6.17.5-7) edgy; urgency=low + + * Fix FTBFS on powerpc, s/powerpc-smp,/powerpc-smp/ in debian/rules. + + -- Adam Conrad Tue, 3 Oct 2006 13:27:50 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.5-6) edgy; urgency=low + + * Add powerpc64-smp target on powerpc. + - Malone #63197 + + -- Ben Collins Sun, 1 Oct 2006 12:11:00 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.5-5) edgy; urgency=low + + * ABI bump to -10. + + -- Ben Collins Tue, 26 Sep 2006 10:20:26 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.5-4) edgy; urgency=low + + * ABI bump to -9 + + -- Tollef Fog Heen Fri, 22 Sep 2006 13:49:43 +0200 + +linux-restricted-modules-2.6.17 (2.6.17.5-3) edgy; urgency=low + + * Temporary fixup for default acx111 v16 and v17 firmware. Set default to + 1.2.1.34. Next time the .orig.tar.gz is recreated, remove the default + symlinks, and we'll always generate them in the rules file. + + -- Ben Collins Tue, 19 Sep 2006 12:17:37 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.5-2) edgy; urgency=low + + * Kernel ABI bump for linux-source-2.6.17 version 2.6.17-8.21. + + -- Ben Collins Mon, 18 Sep 2006 11:02:00 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.5-1) edgy; urgency=low + + * ABI bump. + * Include vmware-player modules. vmware-server modules coming soon. + * Rework package names based on recent kernel changes. + * Add vmware-player vmmon and vmnet kernel modules. These are from + vmware-player 1.0.2. + + -- Ben Collins Wed, 30 Aug 2006 13:00:06 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.4-1) edgy; urgency=low + + * Repack the orig with the correct nvidia-legacy package for amd64, this + time including 32-bit libraries. Revert the previous change to cope. + + -- Adam Conrad Wed, 30 Aug 2006 19:01:32 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.3-2) edgy; urgency=low + + * Adjust some static strings in debian/rules to cope with nvidia changing + the filename for the amd64 nvidia-legacy package, resolving amd64 FTBFS. + + -- Adam Conrad Wed, 30 Aug 2006 11:09:14 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.3-1) edgy; urgency=low + + * Update fglrx to new upstream 8.28.8, required to support edgy's Xorg 7.1: + - Include links in xorg-driver-fglrx for the new libfglrx_tvout library. + - Include binaries from /usr/sbin and manpages from /usr/share/man/man8. + * Update non-legacy NVIDIA driver to new upstream 1.0.8774 and legacy NVIDIA + driver to new upstream 1.0.7184, both required for Xorg 7.1 support. + * Bump xserver-xorg-core dependencies to (>= 1:1.1.1) for the above changes. + + -- Adam Conrad Tue, 29 Aug 2006 22:16:27 +1000 + +linux-restricted-modules-2.6.17 (2.6.17.2-1) edgy; urgency=low + + * ipw3945: Update ipw3945d to 1.7.22. + * madwifi: Remove legacy and ng drivers. Replace with stock madwifi-ng 0.9.2 + driver. + * dvb: Added dvb firmware. + * Kernel ABI bump for linux-source-2.6.17 version 2.6.17-6.17. + + -- Ben Collins Wed, 9 Aug 2006 14:37:41 -0400 + +linux-restricted-modules-2.6.17 (2.6.17.1-6) edgy; urgency=low + + * Kernel ABI bump for linux-source-2.6.17 version 2.6.17-5.9. + + -- Colin Watson Sat, 15 Jul 2006 18:42:13 +0100 + +linux-restricted-modules-2.6.17 (2.6.17.1-5) edgy; urgency=low + + * Provides: xserver-xorg-video instead of xserver-xorg-driver. + + -- Fabio M. Di Nitto Thu, 13 Jul 2006 13:58:25 +0200 + +linux-restricted-modules-2.6.17 (2.6.17.1-4) edgy; urgency=low + + * debian/nvidia-glx.dirs.in: Add missing /usr/lib32/nvidia to fix ia32-libs + installation breakage when nvidia-glx is installed (otherwise the + libGL.so.1.2 diversion points into a nonexisting directory). + + -- Martin Pitt Thu, 13 Jul 2006 10:36:35 +0000 + +linux-restricted-modules-2.6.17 (2.6.17.1-3) edgy; urgency=low + + * Kernel ABI bump for linux-source-2.6.17 version 2.6.17-4.5. + + -- Ben Collins Fri, 30 Jun 2006 14:54:34 +0000 + +linux-restricted-modules-2.6.17 (2.6.17.1-2) edgy; urgency=low + + * Work around buggy binutils by not stripping pre-build nvidia libs. + + -- Ben Collins Thu, 29 Jun 2006 18:14:21 +0000 + +linux-restricted-modules-2.6.17 (2.6.17.1-1) edgy; urgency=low + + * 2.6.17 kernel, glad to meet ya. + * s/ia32-libs/libc6-i386/ on amd64 build-deps. + * Use gcc on non-hppa, instead of gcc-4.0. + * ATI + - Add patch to fix no_iommu missing error. + - Add patch to rework the makefile, since it's targets were clashing + somehow with kbuil built-in targets. + * Nvidia + - Update legacy driver to 7182 + * Fritz + - Disable fcpcmcia and fcpcmcia_cs. No longer build, no longer supported. + + -- Ben Collins Tue, 27 Jun 2006 21:05:50 -0400 + +linux-restricted-modules-2.6.15 (2.6.15.11-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 version 2.6.15-24. + + -- Ben Collins Fri, 9 Jun 2006 15:36:34 -0400 + +linux-restricted-modules-2.6.15 (2.6.15.11-1) dapper; urgency=low + + * Update non-legacy NVIDIA driver to 1.0.8762, legacy still at 1.0.7174: + - Added support for QuadroFX 4500 X2, FX 5500, FX 3500, and FX 1500. + - Confirmed that it fixes dual DVI connections, which weren't working + at all in the last driver, on any card (closes: launchpad.net/42258) + - Confirmed that this new version can drive several laptops sporting + 5x00go chipsets that both the previous drivers refused to work with. + * Update fglrx to 8.25.18, now claiming to "officially" support Xorg 7.0: + - Add support for FireGL V7350, V7300, V7200, V5200, V3400, V3350, V2200. + - Confirmed that running two simultaneous Xservers no longer hardlocks. + - Fixes segfaults on Xserver init with several of the new X1xxx cards. + - Confirmed fix for shutdown hangs on at least two different machines. + - Confirmed fix for hangs on VT switch on my ATI Radeon Mobility M300. + * Make nvidia-glx and xorg-driver-fglrx provide xserver-xorg-driver, so + people can remove all their other drivers and streamline their systems. + * Only build ltmodem on the 386 kernel, as it's been shown to not behave + on SMP kernels, causing kernels to panic (closes: launchpad.net/46685) + * Mangle the *modnames structs in madwifi-ng, fixing the internal module + system, so the driver isn't stillborn (closes: launchpad.net/47137) + + -- Adam Conrad Mon, 29 May 2006 02:30:08 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.10-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 version 2.6.15-23. + + -- Ben Collins Thu, 18 May 2006 12:31:19 -0400 + +linux-restricted-modules-2.6.15 (2.6.15.10-1) dapper; urgency=low + + * Add madwifi-ng support + + -- Matthew Garrett Tue, 16 May 2006 13:45:04 +0100 + +linux-restricted-modules-2.6.15 (2.6.15.9-4) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 version 2.6.15-22. + + -- Adam Conrad Mon, 8 May 2006 11:42:20 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.9-3) dapper; urgency=low + + * Add patch from madwifi upstream to fix usage of the pm_message_t type + on recent kernels (version 2.6.11 and higher), which eliminates some + compiler warnings, and may make suspend/resume happier with madwifi. + * Brown paper bag fix: add a missing semicolon in the build-udebs rule. + + -- Adam Conrad Mon, 24 Apr 2006 00:29:32 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.9-2) dapper; urgency=low + + * Mangle the build-udebs target in debian/rules to conditionalise it to + only try to copy the bits we want when we have them, fixing the build + failure introduced on powerpc when I added ipw3945d to the nic udeb. + + -- Adam Conrad Sun, 23 Apr 2006 23:49:22 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.9-1) dapper; urgency=low + + * Update fglrx to 8.24.8, which includes support for the Radeon X1n00 series + and the Mobility Radeon X1n00 series cards (closes: launchpad.net/39924) + * Include the binary-only ipw3945 daemon to go with the driver that has been + added to the latest Ubuntu kernel series (closes: launchpad.net/36684) + * Include a modprobe.d file for ipw3945 that loads the ipw3945d daemon when + the module is loaded, and kills it off before the module is unloaded. + * Add the above ipw3945d hacks to the nic-restricted-modules udebs for d-i. + * Kernel ABI bump for linux-source-2.6.15 version 2.6.15-21. + + -- Adam Conrad Sat, 22 Apr 2006 02:23:52 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.8-1) dapper; urgency=low + + * Update non-legacy NVIDIA driver to 1.0.8756, legacy still at 1.0.7174: + - Drop patches 001 through 006, all incorporated in the new version. + - Includes improved power management support, and support for all the + latest/shiniest NVIDIA hardware, (closes: launchpad.net/{38637,35628}) + * Fix whitespace in fglrx rules file (closes: launchpad.net/{32576,23250}) + * Stop having nvidia-glx-enable add the nvidia kernel modules to the end + of /etc/modules, since it is properly autoloaded by the X server. This + stops us breaking /etc/modules as a bonus (closes: launchpad.net/27579) + + -- Adam Conrad Mon, 10 Apr 2006 14:51:39 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.7-4) dapper; urgency=low + + * Test for /sbin/lrm-manager in our init script, for the case where we + have been removed, rather than purged (closes: launchpad.net/36705) + * Call ld with the '-d' switch in lrm-manager, to assign space in the + final ltmodem object for common symbols (closes: launchpad.net/37321) + * Install the missing libnvidia-cfg.so.1 (closes: launchpad.net/34912) + * Kernel ABI bump for linux-source-2.6.15 2.6.15-20. + + -- Adam Conrad Wed, 5 Apr 2006 14:15:27 +1000 + +linux-restricted-modules-2.6.15 (2.6.15.7-3) dapper; urgency=low + + * Incorporate patch by Robert Love and Dan Williams needed for WPA support + in NetworkManager 0.6.0, backported to madwifi-old by Johan Kiviniemi. + * nvidia-glx (but not -legacy) needs to conflict with nvidia-xconfig, as + we've recently absorbed that binary as well (closes: launchpad.net/6600) + + -- Adam Conrad Sat, 18 Mar 2006 04:36:08 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.7-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-19. + + -- Ben Collins Mon, 20 Mar 2006 16:21:45 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.7-1) dapper; urgency=low + + * Update to fglrx 8.23.7, including support for a wide range of desktop + and mobile Radeon X800 and X850 series video cards, as well as FSAA. + * Freshen AVM Fritz drivers to the latest upstream builds (still 3.11) + * Kernel ABI bump for linux-source-2.6.15 2.6.15-18. + + -- Adam Conrad Fri, 10 Mar 2006 11:51:14 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.6-3) dapper; urgency=low + + * Stop using the hideous "mangle TLS symlinks on boot" hack, which was + second-guessing our linker (which appears to do the right thing anyway) + - Removed the init script and /etc/default fragment from nvidia-glx + - Install TLS libraries directly to /usr/lib/tls and /usr/lib32/tls. + * Make nvidia-glx-config use /var/lib/x11 instead of /var/lib/xfree86. + * These changes fix launchpad.net/33456 and launchpad.net/{32878,29234} + + -- Adam Conrad Tue, 7 Mar 2006 14:21:22 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.6-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-17. + + -- Ben Collins Fri, 3 Mar 2006 07:30:19 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.6-1) dapper; urgency=low + + * Update fglrx to 8.22.5 (UVF exception granted by mdz) which, among + other things, finally claims to "officially" support kernel 2.6.15. + * Drop ati/patches/fglrx-2.6.15.patch, which is no longer necessary. + * Add proper symlinks and shlibs for the new libfglrx_dm library. + * Add .so symlinks to xorg-driver-fglrx-dev for the libraries we ship. + * Kernel ABI bump for linux-source-2.6.15 2.6.15-16. + + -- Adam Conrad Tue, 21 Feb 2006 17:51:20 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.5-2) dapper; urgency=low + + * Change boot-time message. + + -- Scott James Remnant Wed, 8 Feb 2006 14:54:08 +0000 + +linux-restricted-modules-2.6.15 (2.6.15.5-1) dapper; urgency=low + + * Change maintainer to the Ubuntu Kernel Team, in an attempt to do a + soft transition from sole maintenance to handing over to Ben and Co. + * Update fglrx to version 8.21.7, which claims to support OpenGL 2.0. + * Adjust for the corrected SONAMEs (thanks, ATI!) of libfglrx_gamma.so.1 + and libfglrx_pp.so.1 (used to be libfglrx_pp.1 and libfglrx_gamma.1) + * Drop ati/patches/panel_fglrx_pp_proto.patch, fixed in upstream source. + * nvidia-glx conflicts with nvidia-settings, as we now ship that binary + ourselves directly from upstream sources (Closes launchpad.net/27040) + * Add nvidia/patches/003_NVIDIA_kernel-1.0-8178-change_page_attr.patch, + resolving crashes with some broken implementations of change_page_attr() + * Add nvidia/patches/004_NVIDIA_kernel-1.0-8178-gcc-4.1_fix.patch, making + the compiler tests more robust in the face of recent GCC 4.x changes. + * Add nvidia/patches/005_NVIDIA_kernel-1.0-8178-2.6.15-git8.patch, fixing + a build failure with certain versions of the linux source (not ours) + * Add nvidia/patches/006_NVIDIA_kernel-1.0-8178-PAT_fix.patch, which + makes us fall back to using MTRRs if our CPU does not support PAT. + * Kernel ABI bump for linux-source-2.6.15 2.6.15-15. + + -- Adam Conrad Wed, 8 Feb 2006 20:20:16 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.4-4) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-14. + + -- Ben Collins Wed, 25 Jan 2006 23:17:24 +0000 + +linux-restricted-modules-2.6.15 (2.6.15.4-3) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-13 (Look Adam!! I got it + right the first time!!). + + -- Ben Collins Thu, 19 Jan 2006 17:47:14 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.4-2) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-12. + + -- Adam Conrad Fri, 13 Jan 2006 16:20:42 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.4-1) dapper; urgency=low + + * Include a config file, /etc/default/linux-restricted-modules-common, + allowing users to disable link-on-boot for individual drivers, thus + making it easier to keep linux-restricted-modules installed while also + installing updates from 3rd parties (like those nvidia or ati provide) + * Update non-legacy NVIDIA driver to 1.0.8174, legacy still at 1.0.7174: + - Drop incorporated patches (AGP_kernel_BUG.patch and broken_paths.patch) + - Carry forward unfixed patches (pm_fixes.patch and vm_insert_page.patch) + - Add libgtk2.0-dev to our build-deps to get proper GTKish dependencies + for the nvidia-settings binary, which is installed to nvidia-glx. + * Mangle fglrx sources and how we build them to make things actually work: + - Rearrange basedir of fglrx patches and unpack target in debian/rules to + not require individual patch calls in debian/rules for each new patch + - Very carefully edit libGL.so.1.2 (x3) with a hex editor (original files + are saved in the tarball as .orig, for comparison) to point at the new + path at /usr/lib{,32}/dri instead of /usr/X11R6/lib{,64}/modules/dri + - Add a shlibs file for xorg-driver-fglrx to cover the two shared libs + that we ship in that package (libfglrx_pp.1 and libfglrx_gamma.1) + - Apply fglrx-2.6.15.patch, which should make fglrx happy on new kernels. + * Update ltmodem drivers to 8.31+2.6-alk-8: + - Works around some broken versions of wvdial which fail if they are + unable to change baud rate (which makes no sense with softmodems) + - Drop our patch to compile correctly on 2.6.15, incorporated upstream. + * Fix acx/readme.txt to use the correct module parameter (firmware_ver=XXX) + + -- Adam Conrad Thu, 5 Jan 2006 23:01:48 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.3-5) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-11. + + -- Ben Collins Wed, 4 Jan 2006 07:36:57 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.3-4) dapper; urgency=low + + * Really bump the ABI this time. + + -- Ben Collins Tue, 27 Dec 2005 17:22:49 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.3-3) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-10. + * No more amd64-k8-smp. + * Fix acx/readme.txt (fixed in diff, needs to be fixed in .orig.tar.gz + someday). + + -- Ben Collins Tue, 27 Dec 2005 11:48:22 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.3-2) dapper; urgency=low + + * Another kernel ABI bump, this time for linux-source-2.6.15 2.6.15-9. + * NOTE/WARNING: Yes, there is a fix for fglrx DRI, but I'm intentionally + not enabling it until fglrx on 2.6.15 is fixed somewhat, since enabling + DRI causes every machine I've seen so far to kernel panic constantly. + + -- Adam Conrad Wed, 21 Dec 2005 05:19:08 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.3-1) dapper; urgency=low + + * Include new firmware for acx100 USB, acx100 PCI and acx111 PCI to match + the layout that our shiny new driver expects to see, courtesy of BenC. + * Update non-legacy NVIDIA driver to 1.0.8174, legacy still at 1.0.7174. + - Install /usr/bin/nvidia-settings, /usr/bin/nvidia-xconfig, and their + manpages in nvidia-glx. nvidia-xconfig is provided to allow you to + create sample configs and customise your xorg.conf should you want to, + however, it's recommended most people don't use it as it conflicts + with how we currently configure X (nvidia-glx-config), and with how + we plan to do it in the future (re-seed debconf and re-run dexconf) + - Add NVIDIA_kernel-1.0-7174-global_flush_tlb.patch to work around + tickling buggy behaviour in global_flush_tlb on some amd64 kernels. + - Add NVIDIA_kernel-1.0-8174-pm_fixes.patch to fix power management + support in line with changes in the kernel as of version 2.6.14. + - Add NVIDIA_kernel-1.0-8174-broken_paths.patch to resolve a failure + to find the correct version of the kernel header tree built against. + - Add NVIDIA_kernel-1.0-8174-vm_insert_page.patch, adding support for + the new vm_insert_page() kernel interface introduced in 2.6.15-rc5. + - Add NVIDIA_kernel-1.0-8174-AGP_kernel_BUG.patch, resolving a situation + where the nvidia module can throw a kernel BUG on some AGP systems. + * Update ATI fglrx driver to version 8.20.8, now with PowerPlay support. + - Add panel_fglrx_pp_proto.patch to bring back the fglrx_pp_proto.h + header that seems to have mysteriously gone missing from this update. + - NOTE: This driver still DOES NOT correctly support kernel 2.6.15, + which is what we are shipping. If you use it, your system WILL crash, + very likely while in use, definitely when shutting down. We are + hoping to get this issue resolved upstream as soon as we possibly can. + * Another kernel ABI bump, this time for linux-source-2.6.15 2.6.15-8. + + -- Adam Conrad Tue, 13 Dec 2005 15:04:42 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.2-3) dapper; urgency=low + + * Kernel ABI bump for linux-source-2.6.15 2.6.15-7 + + -- Ben Collins Tue, 6 Dec 2005 12:29:22 -0500 + +linux-restricted-modules-2.6.15 (2.6.15.2-2) dapper; urgency=low + + * Make lrm-manager check for ld_static before running it; kernel-wedge + makes it hard for nic-restricted-modules-* to depend on + binutils-static-udeb, but for the moment I've just set the latter's + priority so that it will usually be there. + * d-i doesn't have /boot/System.map-*. If that isn't there but udpkg is (a + sanity check), just run 'depmod -a -q'. + + -- Colin Watson Mon, 5 Dec 2005 23:22:25 +0000 + +linux-restricted-modules-2.6.15 (2.6.15.2-1) dapper; urgency=low + + * Update ltmodem drivers with Aleksey Kondratenko's hacked sources from + linmodems.technion.ac.il, which actually build on modern kernels. + * Add ltmodem/patches/pci_id.patch to locally define the PCI ID for the + PCI_DEVICE_ID_ATT_L56XMF device, which went away in recent 2.6.15-rcX. + * Fix generation of xorg-driver-fglrx-dev's deps to make it installable. + + -- Adam Conrad Mon, 5 Dec 2005 17:36:33 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.1-2) dapper; urgency=low + + * Brown paper bag fix: s,#/bin/sh,#!/bin/sh, in postinst (Ubuntu #20350) + + -- Adam Conrad Fri, 2 Dec 2005 15:18:04 +1100 + +linux-restricted-modules-2.6.15 (2.6.15.1-1) dapper; urgency=low + + * Update madwifi driver to the trunk of the "madwifi-old" branch in the + madwifi.org SVN. Not sure if "madwifi-ng" is yet stable enough to trust. + * Stop cleaning away the postinst of linux-restricted-modules-common during + clean, so we actually get the init script migration from the last upload. + * Restore buildability on powerpc by changing KARCH from ppc to powerpc + and exporting TARGET=powerpc-be-eabi while doing madwifi's split-modules. + * Give nvidia-glx, nvidia-glx-legacy, and xorg-driver-fglrx versioned deps + on xserver-xorg-core (>= 1:0.99.0-1), since we use the new Xorg paths. + * Kernel ABI bump to 2.6.15-6 for linux-source-2.6.15_2.6.15-6.8. + + -- Adam Conrad Thu, 1 Dec 2005 18:35:31 +1100 + +linux-restricted-modules-2.6.15 (2.6.15-1) dapper; urgency=low + + * First linux-restricted-modules upload for Dapper's 2.6.15 kernel series. + * Update NVIDIA driver (non-legacy) to 1.0.7676, legacy still at 1.0.7174. + - Add NVIDIA_kernel-1.0-7174-bigram.patch, resolving an issue with the + legacy driver's inability to load on systems with 4GB of RAM or more. + - Add NVIDIA_kernel-1.0-7174-register_ioctl32.patch to get the legacy + driver to actually load on modern kernels, rather than erroring out. + - Add NVIDIA_kernel-1.0-7676-IOMMU-SWIOTLB.patch, resolving an issue + where the nvidia driver can trigger a kernel BUG() on amd64 systems + using either the IOMMU or the SWIOTLB. + - Add NVIDIA_kernel-1.0-{7174,7676}-change_page_attr.patch, working + around differing implementations of the change_page_attr() interface. + - Add NVIDIA_kernel-1.0-{7174,7676}-no-execute-page.patch, resolving + issues with amd64 system that don't support no-execute page protection. + * Update ATI fglrx driver to version 8.19.10, using the Xorg 6.9.0 loader. + - Drop ati/patches/fglrx-2.6.12-x86-64.patch, incorporated upstream + * Move a LOT of files around to accomodate two fundamental changes: + - Xorg has eliminated X11R6, and files now go to /usr/lib/{,xorg} + - firmware from /lib/hotplug/firmware/$FW-$KV to /lib/firmware/$KV/$FW + * Autogenerate debian/control better than we already did, by removing all + kernel versions and ABI versions from debian/control and have them + specified in debian/rules instead. + * Autogenerate d-i/kernel-versions as well, using the above mechanism. + * Drop linux-restricted-modules-nvidia-legacy package, and instead ship + the nvidia_legacy module in the main linux-restricted-modules package. + * Make nvidia-glx-legacy employ a modprobe.d hack to have the above work. + * Attempt to document which hardware is supported in nvidia-glx versus + nvidia-glx-legacy in the package descriptions. + * Stop using crazy *_minor versioning scheme, and just have the oddball + packages use a scheme of UpstreamVer+SourceVer (ie: 1.0.7676+2.6.15-1) + * Change the logic we use for diversions to divert lib32 stuff on arches + that MAY have lib32 directories, rather than testing for one on disk. + This eliminates weird issues seen when we're installed before ia32-libs. + * Move LRM init script from S15 to S07 in accordance with Scott's master + plan for faster boot times in dapper. + + -- Adam Conrad Wed, 30 Nov 2005 23:13:32 +1100 + +linux-restricted-modules-2.6.12 (2.6.12.4-14) dapper; urgency=low + + * Add a --kver=KERNEL_VERSION option to lrm-manager, so it can be asked to + act on specific kernel versions (handy for invocation in our postinst) + * Add --help to lrm-manager to document the fact that we now have two args. + * Replace "lrm-manager; depmod" with "lrm-manager --kver=@@KVERSION@@" in + the linux-restricted-modules and lrm-nvidia-legacy postinst scripts. + * Remove the touch --date call from lrm-manager. Since we're not running + depmod on boot anymore, this hack is no longer necessary. + + -- Adam Conrad Wed, 9 Nov 2005 23:01:12 -0500 + +linux-restricted-modules-2.6.12 (2.6.12.4-13) dapper; urgency=low + + * Restore lrm-manager's depmod usage, but make both the init script and the + postinst use "lrm-manager --quick", so the previous changes still achieve + their goals, while the nic-restricted-modules postinst continues to work. + + -- Adam Conrad Wed, 9 Nov 2005 22:13:57 -0500 + +linux-restricted-modules-2.6.12 (2.6.12.4-12) dapper; urgency=low + + * After installing, upgrading or removing any package we ship that + contains modules run depmod against the symbols and version of the + kernel that we ship them for. + * Drop support for lrm-manager to run depmod, as this would run it for + the current kernel rather than the installing one. Run depmod + yourself now. + + -- Scott James Remnant Wed, 9 Nov 2005 19:23:03 -0500 + +linux-restricted-modules-2.6.12 (2.6.12.4-11) breezy; urgency=low + + * Enable atheros in debian-installer, by making lrm-manager the postinst + for nic-restricted-modules (fails gracefully if ld_static isn't around) + + -- Adam Conrad Tue, 11 Oct 2005 19:40:36 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-10) breezy; urgency=low + + * Increment all those evil *_minor versions yet again. + + -- Adam Conrad Tue, 11 Oct 2005 12:14:22 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-9) breezy; urgency=low + + * Mount the volatile tmpfs with mode 0755 + + -- Matt Zimmerman Mon, 10 Oct 2005 18:00:46 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.4-8) breezy; urgency=low + + * Have lrm-manager touch everything in /lib/modules/"$KVER"/volatile/ to + a timestamp one day in the future, to account for possible timestamp + and timezone skews, so the later call to depmod --quick will work. + * Shrink the nic-restricted-modules udeb to only contain madwifi. Even + if we don't end up using this in the installer, the udeb was HUGE and + needed to be shrunk, so lowmem installs can extract it without dying. + * Remove the volatile mount and directory on removal/purge. (#16310) + + -- Adam Conrad Wed, 5 Oct 2005 14:53:12 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-7) breezy; urgency=low + + * Increment *_minor. + + -- Colin Watson Fri, 23 Sep 2005 13:01:21 +0100 + +linux-restricted-modules-2.6.12 (2.6.12.4-6) breezy; urgency=low + + * Fix the ABI versioning for the avm-fritz-firmware-2.6.12 stuff. Oops. + + -- Adam Conrad Fri, 23 Sep 2005 19:55:22 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-5) breezy; urgency=low + + * Kernel ABI bump from -8- to -9- for all kernel module packages and udebs. + * Fix FTBFS on architectures that aren't building nvidia packages. + * Make sure nvidia-legacy-kernel-source actually ships files, and refresh + the outdated nvidia*kernel-source debian directory while we're in there. + * Adjust some more to the new reality that libGL now lives in /usr/lib + and /usr/lib32, rather than /usr/X11R6/lib{,32} (should fix bug #15473) + + -- Adam Conrad Fri, 23 Sep 2005 15:01:39 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-4) breezy; urgency=low + + * Re-work the nvidia-glx/nvidia-glx-legacy split to make all our debian/* + files autogenerated in debian/rules, so we can do clever things, like get + the right directories and package names in maintainer scripts and such. + * Make sure that diversions are happening, and are owned by the correct + packages, to avoid overwrite errors (as seen in Ubuntu bug #15962) + * Remove old broken diversions made by the preinst of the first uploads + of the nvidia-glx-legacy packages, so we don't get diversion conflicts. + * Stop having nvidia-glx-legacy replace nvidia-glx, as this is hideously + broken and incorrect, and dpkg will take interesting shortcuts with + Conflicts/Provides/Replaces triplets that can lead to diversions blowing + up when we try to install one and we already have the other installed. + * Make nvidia-glx-legacy-dev conflict with nvidia-glx-dev to ensure that + the latter is always deconfigured before the former is (pre)installed. + * Fix up some instances where files weren't being installed to the -legacy + packages, like the TLS libraries and nvidia-glx-config (Ubuntu #15828) + * Fix the clean target to actually clean all the *legacy* generated files. + * Build-dep on libstdc++5, rather than hardcoding our library dependencies. + * Put myself in the maintainer field, may god have mercy on my soul. + + -- Adam Conrad Tue, 20 Sep 2005 18:17:15 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.4-3) breezy; urgency=low + + * Really add xorg-driver-fglrx Depends: libstdc++5 + + -- Fabio M. Di Nitto Mon, 19 Sep 2005 14:50:45 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.4-2) breezy; urgency=low + + * Fix build-deps for SCC architectures. + * And another *_minor dance, of course. + + -- LaMont Jones Fri, 16 Sep 2005 17:43:56 -0600 + +linux-restricted-modules-2.6.12 (2.6.12.4-1) breezy; urgency=low + + * New tarball to remove madwifi cruft (Ubuntu Bugzilla #15592) + * Do the *_minor dance + + -- Matt Zimmerman Fri, 16 Sep 2005 15:46:03 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.3-6) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * Fix xorg-driver-fglrx-dev Depends: + (Closes: #15561) + + * Make nvidia-glx{,-legacy} Conflicts with xorg-driver-fglrx since all of + them provides diversion for libGL and they can't be installed at the same + time. + + -- Fabio M. Di Nitto Fri, 16 Sep 2005 09:31:08 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-5) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * fglrx-control /usr/X11R6/bin -> /usr/bin transition. + + -- Fabio M. Di Nitto Fri, 16 Sep 2005 06:41:47 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-4) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * readd ati minors in version generation. + + -- Fabio M. Di Nitto Thu, 15 Sep 2005 14:00:34 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-3) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * The "When can we get root and chroots?" ;) aka B-D ia32-libs on amd64. + + -- Fabio M. Di Nitto Thu, 15 Sep 2005 13:27:37 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-2) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * Fix (AGAIN) nvidia-legacy install target for amd64. + + -- Fabio M. Di Nitto Thu, 15 Sep 2005 11:03:33 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.3-1) breezy; urgency=low + + Changes by Fabio M. Di Nitto: + + * Reimport madwifi patches to build on ppc. + + * Readd patch fglrx-2.6.12-x86_64.diff still required to build on amd64. + + * Fix nvidia-legacy install target for amd64. + + Changes by Daniel Stone: + + * Bump to new fglrx upstream version 8.16.20. + + Adds support for mobile chipsets which were previously only supported in + 8.13 and not 8.14. + + Switches to version built against DRI protocol 5.0.0, making it usable + with our current server (closes: Ubuntu#13538). Since this is built for + a server using dlloader, relink fglrx_drv.so -> fglrx_drv.o and + libfglrxdrm.so -> libfglrxdrm.a. + + Remove fglrx-2.6.12-new-agpgart.diff, fglrx-2.6.12-inter_module_get.diff + and fglrx-2.6.12-x86_64.diff, since the new upstream version already + supports 2.6.12. + + Remove fglrx-2.6-agpgart.diff, which has already been applied upstream. + + Add fglrx-panel-style.diff, which removes the call to force the style fo + the Windows style, as it is no longer built in to our version of Qt. + + Add dependency on libstdc++5, since the DRI modules are built against + that version (closes: Ubuntu#14255). + + Revert change from 2.6.12.1-2. ati_base_xorg_version is now 6.8.0 + instead of 6_8_0. ati_xorg_package_version no longer exists. + + Move utilities to /usr/bin (closes: Ubuntu#14383). + * Add nvidia legacy driver support, which is currently just the old driver + version (1.0-7174) (closes: Ubuntu#14210). Since it still uses the + 'nvidia' kernel module, ship + linux-restricted-modules-2.6.12-*-nvidia-legacy. Add + nvidia-glx{,-dev}-legacy and nvidia-kernel-source-legacy. + * Remove support for multiple nvidia driver versions, as they do not seem to + be releasing any ia64 drivers any more (i.e. no more support for 5336). + * Call lrm-manager from postinst, and use ld-static in lrm-manager, instead + of ld (closes: Ubuntu#14115, Ubuntu#13952). + * Fix clean target: remove nic-restricted-*. + * Add ltmodem licence to debian/copyright (closes: Ubuntu#13830). + * Remove nonsensical 'Provides: xserver' from nvidia-glx. + * Change dependencies on xserver-xorg to -core, and nvidia's xserver-common + dependency to one of -xorg-core, -xorg, or -xfree86; having xserver-common + installed is no guarantee that we'll have a working server which supports + the nvidia driver. + + -- Fabio M. Di Nitto Thu, 15 Sep 2005 09:55:59 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.2-12) breezy; urgency=low + + * Man, this package is bringing out the worst in me. Let's try to + get the minor's and stuff working this time. + + -- Ben Collins Tue, 30 Aug 2005 23:22:59 -0400 + +linux-restricted-modules-2.6.12 (2.6.12.2-11) breezy; urgency=low + + * Increment *_minor + + -- Ben Collins Tue, 30 Aug 2005 20:54:03 -0400 + +linux-restricted-modules-2.6.12 (2.6.12.2-10) breezy; urgency=low + + * Bump kernel ABI. + + -- Ben Collins Tue, 30 Aug 2005 17:21:20 -0400 + +linux-restricted-modules-2.6.12 (2.6.12.2-9) breezy; urgency=low + + * Increment *_minor + + -- Matt Zimmerman Mon, 29 Aug 2005 13:40:00 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.2-8) breezy; urgency=low + + * Skip depmod invocation if lrm-manager is invoked with --quick + * Invoke lrm-manager with --quick in the init script + + -- Matt Zimmerman Mon, 29 Aug 2005 11:29:04 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.2-7) breezy; urgency=low + + * Add LSB status messages to init script + + -- Matt Zimmerman Mon, 29 Aug 2005 11:23:55 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.2-6) breezy; urgency=low + + * hppa, ia64, sparc fixes. + + -- LaMont Jones Fri, 26 Aug 2005 14:53:48 -0600 + +linux-restricted-modules-2.6.12 (2.6.12.2-5) breezy; urgency=low + + * And remember to update all the minor revisions for the binary packages. + + -- Adam Conrad Sun, 21 Aug 2005 21:17:18 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.2-4) breezy; urgency=low + + * Fix dependencies for nvidia-glx{,-dev} for the xorg -> mesa transition. + + -- Adam Conrad Sun, 21 Aug 2005 19:02:34 +1000 + +linux-restricted-modules-2.6.12 (2.6.12.2-3) breezy; urgency=low + + * Bump Kernel ABI. + + -- Fabio M. Di Nitto Fri, 19 Aug 2005 07:38:23 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.2-2) breezy; urgency=low + + * Always divert the libGL.so.* files, else installing ia32-libs after + xorg-driver-fglrx will fail. + + -- Tollef Fog Heen Mon, 15 Aug 2005 14:42:51 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.2-1) breezy; urgency=low + + * Fritz drivers: + - Update fritz drivers. + - Add fritz drivers for amd64. + - Remove fcpnp driver, which FTBFS, not supported anymore. + - Fix linking of pcmcia_cs module. + * Increment *_minor. + + -- Matthias Klose Thu, 11 Aug 2005 12:18:46 +0200 + +linux-restricted-modules-2.6.12 (2.6.12.1-8) breezy; urgency=low + + * Ensure that KERNELPATH is passed to the madwifi Makefile + + -- Matt Zimmerman Sun, 7 Aug 2005 21:58:47 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-7) breezy; urgency=low + + * Use the faster depmod -A rather than depmod -a + * Fix handling of module names + * Simplify and automate determining which objects make up each module + * Simplify lrm-manager not to require hardcoded lists of objects + * Use /lib/modules/$VER/volatile rather than .../kernel/drivers/volatile + * Increment *_minor + * Add versioned dependencies on linux-restricted-modules-common + * Don't install all of madwifi in volatile, only ath_hal + * Temporarily disable fcpcmcia_cs; it needs more fiddling to work with + the new scheme + + -- Matt Zimmerman Thu, 4 Aug 2005 20:44:01 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-6) breezy; urgency=low + + * Increment all of the minor revisions + + -- Matt Zimmerman Thu, 4 Aug 2005 08:41:00 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-5) breezy; urgency=low + + * Ensure .ko extension for volatile modules + * Update Section to match overrides (restricted/misc) + + -- Matt Zimmerman Wed, 3 Aug 2005 22:25:03 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-4) breezy; urgency=low + + * Fix fglrx version numbering + + -- Matt Zimmerman Wed, 3 Aug 2005 20:13:56 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-3) breezy; urgency=low + + * Get things building again after -2 + + -- Matt Zimmerman Wed, 3 Aug 2005 18:15:22 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-2) breezy; urgency=low + + * Use 6.8.0 rather than 6_8_0 as the xorg base version, as previous versions + did. This change was not documented, so I don't know why it was made, + and underscores are not valid in package version numbers. Hopefully + doesn't break anything. + + -- Matt Zimmerman Wed, 3 Aug 2005 16:41:39 -0700 + +linux-restricted-modules-2.6.12 (2.6.12.1-1) breezy; urgency=low + + * New upstream releases. + * New object linking infrastructure + + -- Matt Zimmerman Wed, 3 Aug 2005 11:25:35 -0700 + +linux-restricted-modules-2.6.10 (2.6.10.6-1) breezy; urgency=low + + * Update fglrx to 8.12.10, released today. + + Patch to build with 2.6.10 is no longer necessary. + * Reset atiminor to 0ubuntu1; bump minor for everything else. + + -- Daniel Stone Fri, 8 Apr 2005 16:00:19 +1000 + +linux-restricted-modules-2.6.10 (2.6.10.5-1) hoary; urgency=low + + * Update nVidia driver to 1.0-7174, and remove agpgart patch (which has been + merged). + * Reset nvidiaminor to 0ubuntu1; bump minor for everything else. + * Clean up nvidia-glx.examples (generated file). + + -- Daniel Stone Sat, 2 Apr 2005 12:42:49 +1000 + +linux-restricted-modules-2.6.10 (2.6.10.4-1) hoary; urgency=low + + * New NVIDIA upstream release (1.0-7167) + agpart patch. + + * Double bump *_minor to allow all the nice guys that have done testing + for us, to upgrade and be in sync with archive. + + -- Fabio M. Di Nitto Thu, 31 Mar 2005 18:49:31 +0200 + +linux-restricted-modules-2.6.10 (2.6.10.3-8) hoary; urgency=low + + * Bump *_minor. + + -- Fabio M. Di Nitto Tue, 15 Mar 2005 17:44:06 +0100 + +linux-restricted-modules-2.6.10 (2.6.10.3-7) hoary; urgency=low + + * Update for 2.6.10-5. + * Bump *_minor. + * Remove unneeded binary modules from nvidia-kernel-source (closes: + Ubuntu#6785). + + -- Daniel Stone Tue, 15 Mar 2005 22:20:05 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.3-6) hoary; urgency=low + + * Update AVM copyright text. + * Bump *_minor. + + -- Matthias Klose Sun, 13 Mar 2005 20:07:37 +0100 + +linux-restricted-modules-2.6.10 (2.6.10.3-5) hoary; urgency=low + + * Update for 2.6.10-4. + * Bump *_minor. + + -- LaMont Jones Mon, 21 Feb 2005 20:46:28 -0700 + +linux-restricted-modules-2.6.10 (2.6.10.3-4) hoary; urgency=low + + * Update for 2.6.10-3. + * Bump *_minor. + + -- Colin Watson Tue, 8 Feb 2005 10:42:03 +0000 + +linux-restricted-modules-2.6.10 (2.6.10.3-3) hoary; urgency=low + + * Change --with-kernel-dir to --with-kernel for ltmodem. + * Bump *_minor. + + -- Daniel Stone Thu, 27 Jan 2005 13:27:43 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.3-2) hoary; urgency=low + + * Bump *_minor. + + -- Daniel Stone Tue, 25 Jan 2005 05:20:01 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.3-1) hoary; urgency=low + + * Include ltmodem source. + * Make x{org,free86}-driver-fglrx install an Xsession.d file which sets + LIBGL_DRIVER_PATH=/usr/X11R6/lib/modules/dri:/usr/X11R6/lib32/modules/dri + on directories where fglrx is set up with lib and lib64, so 32-bit GL apps + can still work. + + -- Daniel Stone Thu, 20 Jan 2005 11:30:12 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.2-2) hoary; urgency=low + + * Change fglrx-control's Depends to be xorg-driver-fglrx | + xfree86-driver-fglrx. + * Kill off fglrx-driver altogether, and have x{org,free86}-driver-fglrx + Conflicts/Replaces/Provides it; ditto fglrx-driver-dev (closes: + Ubuntu#5630). + * Divert /usr/lib32/libGL.so.* as well in + xorg-driver-fglrx/xfree86-driver-fglrx (closes: Ubuntu#5627). + * Synchronise xorg-driver-fglrx.links* to xfree86-driver-fglrx. + * Update nvidia-glx-config help text (closes: Ubuntu#5320). + * Bump *_minor. + + -- Daniel Stone Tue, 18 Jan 2005 14:30:04 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.2-1) hoary; urgency=low + + * Update fglrx driver to 8.8.25 (new Catalyst series); this version adds + support for X.Org and amd64. Update Build-Depends accordingly; split + fglrx-driver into xfree86-driver-fglrx and xorg-driver-fglrx, and + fglrx-driver-dev into xfree86-driver-fglrx-dev, and xorg-driver-fglrx-dev. + The original packages are retained as dummy packages. Bump versions + accordingly. Change 'grafics' to 'graphics' in ati/*.desktop. Add + 8.08-kernel-2.6.10.patch, an official ATI patch to deal with changed + pci_*() semantics in 2.6.10. Update list of supported cards. Add libGL + diversions for fglrx. + * Fix dependencies between l-r-m-2.6.10-2-power* and l-i-2.6.10-2-power*; this + fix seems to have got lost in a previous revision. + * Change l-r-m -> avm-fritz-firmware from Depends to Recommends. + * Bump nvidia_minor, ati_minor, avm_minor. + + -- Daniel Stone Sat, 8 Jan 2005 05:10:17 +1100 + +linux-restricted-modules-2.6.10 (2.6.10.1-1) hoary; urgency=low + + * Reupload with unpacked avm tarball. + * Bump nvidia_minor, ati_minor, avm_minor. + + -- Matthias Klose Sat, 15 Jan 2005 21:21:15 +0100 + +linux-restricted-modules-2.6.10 (2.6.10-6) hoary; urgency=low + + * Add AVM ISDN drivers (as uuencoded tarball, unpack them for the next upload + of an .orig tarball). + * Bump nvidia_minor and ati_minor. + + -- Matthias Klose Sat, 15 Jan 2005 17:37:18 +0100 + +linux-restricted-modules-2.6.10 (2.6.10-5) hoary; urgency=low + + * Fix minor numbers + + -- LaMont Jones Thu, 13 Jan 2005 17:04:24 -0700 + +linux-restricted-modules-2.6.10 (2.6.10-4) hoary; urgency=low + + * Update for 2.6.10-2-*. + + -- Daniel Stone Thu, 13 Jan 2005 21:21:11 +1100 + +linux-restricted-modules-2.6.10 (2.6.10-3) hoary; urgency=low + + * ati/patches/agpgart_be.patch: add fglrx kernel patch to reflect changed + function name in 2.6.10. + + -- Daniel Stone Sat, 8 Jan 2005 04:57:20 +1100 + +linux-restricted-modules-2.6.10 (2.6.10-2) hoary; urgency=low + + * Bump nvidiaminor and atiminor. + + -- Daniel Stone Sat, 8 Jan 2005 02:02:51 +1100 + +linux-restricted-modules-2.6.10 (2.6.10-1) hoary; urgency=low + + * Update to 2.6.10. + * Update madwifi driver to current CVS, to build with 2.6.10. + * Add two nVidia patches from Thomas Vander (see nvnews.net) to fix + compilation against 2.6.10 for 6629; 5111 (the current latest on ia64) + does not work with .10. + * Change Maintainer field to myself. + * Add /etc/default/nvidia-glx and /etc/init.d/nvidia-glx to nvidia-glx's + conffiles. + + -- Daniel Stone Thu, 6 Jan 2005 01:19:18 +1100 + +linux-restricted-modules-2.6.9 (2.6.9-11) hoary; urgency=low + + * [arch]-style dependencies don't work in the binary package parts of + debian/control. Use substvars instead. + + -- Colin Watson Sun, 26 Dec 2004 02:17:38 +0000 + +linux-restricted-modules-2.6.9 (2.6.9-10) hoary; urgency=low + + * Forgot to bump nvidiaminor and ati_minor in debian/rules. + + -- Colin Watson Fri, 24 Dec 2004 13:28:44 +0000 + +linux-restricted-modules-2.6.9 (2.6.9-9) hoary; urgency=low + + * debian/nvidia-glx.postrm.in: Fix /usr/X11R6/lib32/libGL.so.1 diversion + removal. + + -- Colin Watson Fri, 24 Dec 2004 01:00:59 +0000 + +linux-restricted-modules-2.6.9 (2.6.9-8) hoary; urgency=low + + * Sanitise powerpc l-r-m -> l-i dependencies. + * Fix nvidia-glx sed scripts to catch all the @@VERSION@@ substitutions. + * Divert /usr/X11R6/lib32 GL modules when installing nvidia-glx (closes: + Ubuntu#2500). + * Remove previous patches to nvidia-glx and sync back with Debian patches + from new Debian 6629 packages, fixing segfaults (closes: Ubuntu#4640). + * Create nic-restricted-modules udeb, containing the Atheros driver. + + -- Daniel Stone Sat, 11 Dec 2004 22:29:55 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-7) hoary; urgency=low + + * Create udebs: + - debian/d-i/: Incorporate linux-kernel-restricted-di-2.6 version 0.3. + - debian/control: Move to debian/control.stub; kernel-wedge will + generate the real control file. + - debian/control.stub: Build-depend on kernel-wedge. + - debian/rules: Update to copy /lib/modules and /lib/hotplug/firmware to + a temporary tree and generate udebs from them. + * debian/d-i/kernel-versions: Remove superfluous build-dependency fields. + * debian/d-i/firmware/: Add amd64 and powerpc nic-restricted-firmware + packages. + + -- Colin Watson Tue, 14 Dec 2004 18:40:37 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-6) hoary; urgency=low + + * Bump nvidiaminor and atiminor in debian/rules; this must be done every + revision! + * Add Build-Depends on libxinerama-dev. + + -- Daniel Stone Sat, 11 Dec 2004 13:16:57 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-5) hoary; urgency=low + + * Fix kernel boot failure on powerpc: l-r-m-2.6.9-1-powerpc[-smp] now + depends on linux-image-2.6.9-1-powerpc, not on -power3 + + -- Martin Pitt Sat, 11 Dec 2004 12:11:32 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-4) hoary; urgency=low + + * Really add libxxf86vm-dev B-D; the last upload only added libxtst-dev. + + -- Daniel Stone Fri, 10 Dec 2004 17:12:15 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-3) hoary; urgency=low + + * Add libxxf86vm-dev Build-Depends. + + -- Daniel Stone Fri, 10 Dec 2004 13:58:35 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-2) hoary; urgency=low + + * Add Build-Depends on libxtst-dev and libxxf86misc-dev, fixing i386 FTBFS. + * Temporarily remove ia64 from the nvidia-* architecture list until I get it + building properly on halley, which involves splitting the patch system. + + -- Daniel Stone Fri, 10 Dec 2004 12:58:03 +0100 + +linux-restricted-modules-2.6.9 (2.6.9-1) hoary; urgency=low + + * Updated to 2.6.9. + * Add nvidia-glx 1.0.6629 (i386/amd64), and nvidia-glx 1.0.5336 (ia64). + + Added two patches from zander in nVidia forums to fix several issues + with 6629 (nvidia/patches). + * Add fglrx 3.14.6 (still only for XFree86 4.3.0/X.Org 6.7.0). + + Add fglrx-kernel-source, for people building their own kernels. + * Updated madwifi to CVS from 20041124, and enable building on amd64 and + powerpc (closes: Ubuntu#3010). + + New linux-restricted-modules-2.6.9-1-power{3,4,pc}{,-smp} packages. + + Removed default setting of TOOLPREFIX in + madwifi/hal/linux/{x86_64-elf,powerpc-be-eapi}.inc, as we compile + natively. + * Rewrite large swathes of debian/rules to have a greater segregation + between drivers; e.g, use $(nv_dirname), et al, for nVidia driver. + * Make nvidia-glx-config aware of X.Org. + + -- Daniel Stone Fri, 3 Dec 2004 10:58:53 +0000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.3-4) warty; urgency=low + + * Fix nvidia-glx call to date. (Closes: #2429) + + -- Fabio M. Di Nitto Mon, 18 Oct 2004 05:37:36 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.3-3) warty; urgency=low + + * .. and bump the version number of nvidia-glx. + + -- Tollef Fog Heen Mon, 11 Oct 2004 21:01:22 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.3-2) warty; urgency=low + + * Brown paper bug -- too much copy&paste in debian/rules is not a + good idea. Actually copy the madwifi directory to build it. + * amd64-xeon is amd64, not i386. + + -- Tollef Fog Heen Mon, 11 Oct 2004 18:19:51 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.3-1) warty; urgency=low + + * s/Debian/Ubuntu/ in some readme files + * Add nvidia amd64 modules + + -- Tollef Fog Heen Sat, 09 Oct 2004 14:24:18 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.2-3) warty; urgency=low + + * Fixed acx100 firmware filenames. + + -- Herbert Xu Fri, 8 Oct 2004 09:07:29 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.2-2) warty; urgency=low + + * [debian/rules] Update nvidia driver package version + + -- Herbert Xu Fri, 8 Oct 2004 07:27:07 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.2-1) warty; urgency=low + + * Added acx100 firmware. + + -- Herbert Xu Thu, 7 Oct 2004 21:34:45 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-7) warty; urgency=low + + * [debian/rules] Update nvidia driver package version + + -- Matt Zimmerman Mon, 27 Sep 2004 11:57:13 -0700 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-6) warty; urgency=low + + * Updated ABI + * Add "Atheros" to description, for keyword searches + * Add note to nvidia-kernel-source description explaining that this package + is not needed in ubuntu + * Add instructions to nvidia-glx description about how to enable the driver + * Remove pointer to nvidia-kernel-source from nvidia-glx description + + -- Matt Zimmerman Mon, 27 Sep 2004 10:48:42 -0700 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-5) warty; urgency=low + + * Build-Depends: bzip2 + + -- Matt Zimmerman Mon, 20 Sep 2004 18:58:27 -0700 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-4) warty; urgency=low + + * Improved /etc/modules modification in nvidia-glx-config + (Fabio M. Di Nitto). + + -- Herbert Xu Mon, 20 Sep 2004 21:00:03 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-3) warty; urgency=low + + * Added nvidia-glx-config script (Fabio M. Di Nitto) + + -- Herbert Xu Sat, 18 Sep 2004 14:23:49 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-2) warty; urgency=low + + * Added ATI license to copyright. + + -- Herbert Xu Wed, 15 Sep 2004 19:58:51 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.1-1) warty; urgency=low + + * Added ATI driver. + * Clarified package descriptions. + + -- Herbert Xu Tue, 14 Sep 2004 20:25:27 +1000 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.0-2) warty; urgency=low + + * Build-Depends: sharutils + + -- Matt Zimmerman Fri, 10 Sep 2004 18:38:02 -0700 + +linux-restricted-modules-2.6.8.1 (2.6.8.1.0-1) warty; urgency=low + + * Add nvidia kernel and X driver: + + Roll new orig.tar.gz. to add nvidia directory and binary installer. + + Update copyright file to include NVIDIA license and email exchange + between Debian maintainer and upstream to clarify a few points + about the redistribution. + + Build-Depends on debhelper >= 4.0.0 and sed >> 3.0. + + Make flavour regexpr more strict to match only kernel modules packages + and clear pkg var after each match to avoid duplicates. + + Add comments in debian/rules to identify specific drivers operations. + + Make clean: target wipe only linux-restricted*.postinst and postrm. + + Create nvidia-kernel-source, nvidia-glx and nvidia-glx-dev packages + and give them proper version. + + Build nvidia kernel driver and install in linux-restricted-modules-* + + Add nvidia bits to linux-restricted-modules postinst and postrm. + + linux-restricted-modules Depends: nvidia-kernel-common, + Provides: nvidia-kernel-1.0.6111 and Suggests: nvidia-glx + + nvidia-glx Depends: nvidia-kernel-1.0.6111 + + -- Fabio M. Di Nitto Sat, 11 Sep 2004 01:19:12 +0200 + +linux-restricted-modules-2.6.8.1 (2.6.8.1-2) warty; urgency=low + + * Built for linux-source 2.6.8.1-3. + * Replaced the word non-free by restricted. + + -- Herbert Xu Fri, 10 Sep 2004 09:22:59 +1000 + +linux-non-free-modules-2.6.8.1 (2.6.8.1-1) unstable; urgency=low + + * Initial release. + + -- Herbert Xu Sun, 29 Aug 2004 15:06:44 +1000 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-new-kernel-source.README.Debian +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-new-kernel-source.README.Debian @@ -0,0 +1,166 @@ +nvidia-graphics-drivers for Ubuntu +---------------------------------- + + +INTRODUCTION: +----------------------------------------------------------------------- + +Welcome to Ubuntu NVIDIA packages. This document contains notes on the +kernel module interface for the NVIDIA driver offering. + + +KERNEL MODULE INSTRUCTIONS: +----------------------------------------------------------------------- + +There are TWO ways to build the nvidia-kernel package. Which one depends on +your situation with your kernel. + + METHOD #1: You are running a Ubuntu suppiled kernel or built a + kernel-headers package along with your own self-built kernel. + + METHOD #2: You are running your own self-built kernel built from kernel + source. + +Which method you choose really depends on what kernel headers you wish to +use, those from a kernel-headers package or those from kernel +source (from which you built your own kernel). + +As mentioned above, if you are running a Ubuntu supplied kernel you will +probably want to choose METHOD #1. If you compile your own kernels, METHOD #2. + + + +PRELIMINARY: +- Decide where you want to build your module. By default it +will build under /usr/src like other kernel modules but you may choose +to build it under your home directory as some people prefer and writing to +/usr violates the FHS. + + +SUPPORT FOR 2.6 KERNELS: +------------------------ +As of 1.0.5336-1, NVIDIA includes support for a 2.6 kernel. No extra steps are +required. + + +HOTPLUG SUPPORT: +------------------------ +As of version 1.0.5336-8 there is hotplug module loading support provided +in patches that are applied by default but by default, hotplug is set to +ignore PCI/AGP cards for display. To change this set IGNORE_PCI_CLASS_DISPLAY +to false in /etc/default/hotplug or run +dpkg-reconfigure -plow hotplug + + + +METHOD #1 Using a kernel-headers package +*********************************************************************** + +As root (or using fakeroot) +1. cd /usr/src + tar xzvf nvidia-kernel-source.tar.gz -C + (It will install in /modules) + - or - + tar xzvf nvidia-kernel-source.tar.gz (if building in /usr/src) + + The standard build location is /usr/src + +2. Find out your kernel version: + + uname -r For example: 2.4.21-4-k7 + +3. Download and install package: kernel-headers-2.4.21-4-k7 + It will install in /usr/src/ + + Make sure your kernel image and headers have matching release numbers to + avoid possible problems in packages built from different sources. + +4. Set some environment variables (if bash is your shell): + + export KSRC=/usr/src/kernel-headers-2.4.21-4-k7 + export KVERS=2.4.21-4-k7 + +5. Then build nvidia-kernel package: + + cd /modules/nvidia-kernel + debian/rules binary_modules + +(You can also combine step 4 and 5 into one line: +KSRC=/usr/src/kernel-headers-2.4.21-4-k7 KVERS=2.4.21-4-k7 debian/rules binary_modules) + +6. Install nvidia-kernel-common: + + If not installed already + apt-get install nvidia-kernel-common + +7. Install the nvidia-kernel package: + + dpkg -i ../nvidia-kernel-2.4.21-4-k7_1.0.6629-1+_.Custom_i386.deb + ( or similar filename ) + +Now see GENERAL NOTES below method #2 + +METHOD #2: Using your own kernel source headers +*********************************************************************** + +To build the nvidia-kernel deb you need to first make sure you have +kernel-package installed, then do the following: + +As root +1. cd /usr/src + tar xzvf nvidia-kernel-source.tar.gz -C + (It will install in /modules) + - or - + tar xzvf nvidia-kernel-source.tar.gz (if building in /usr/src) + +2. If you are NOT using the default modules location /usr/src/modules + then you must set an environment variable that points to your modules + location. + + export MODULE_LOC=/modules + + This is needed by make-kpkg which is used later. If + is /usr/src there is no need to set this. + +3. Build the modules under MODULE_LOC i.e. /modules + + cd linux (or your kernel source directory) + make-kpkg modules_image + +4. Install nvidia-kernel-common: + + apt-get install nvidia-kernel-common + +5. Install the nvidia-kernel package: + + cd (e.g. /usr/src) + dpkg -i nvidia-kernel-KVER*.deb + +Notes for method #2: + +- It is advised not to clean the kernel source tree between +"make-kpkg kernel_image" and "make-kpkg modules_image". + +- The Riva framebuffer is known to conflict with the nvidia X driver. If you +are using X it would be wise not to compile it in. The vesa framebuffer is +known to work slow but fine. + +GENERAL NOTES: + +Also you must add any users who wish to use OpenGL applications to the group +video. You can do this with: + + adduser username video + +Also note for AGP issues and further information please see the NVIDIA +README file (README.gz) in the nvidia-glx package + +An old nvidia.o might be already loaded (run 'lsmod' to check) so +do 'rmmod nvidia.o' to remove the module from memory. + + +For any news on this package check http://people.debian.org/~rdonald and +http://bugs.debian.org/nvidia-kernel-source + + + -- Randall Donald , Fri, 30 Apr 2004 19:02:04 -0700 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/README-for-security-teams_or_to-update-the-nvidia-driver +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/README-for-security-teams_or_to-update-the-nvidia-driver @@ -0,0 +1,27 @@ +Hi guys, + if i will not be around when the time will come, hopefully never, that +you will have to do a security update of this package, there are several +things that you need to check and change. Specially in regards of the nvidia +part, that is yes simpler than the Debian package, but it has a bunch of +hardencoded values in different place that needs to be updated. + +This is list a good reference to keep handy: + +nvidia/NVIDIA-Linux-x86*: upstream source package +nvidia/debian.binary: contains the debian dir that will be installed + in nvidia-kernel-source package. Only the changelog entry needs + to be updated manually. All the other files are parsed automatically. + +debian/rules: there is a nvidia section at the top of the file that contains + upstreamrelease and debian version. You might want to update these + values to generate proper nvidia* packages. + The rules file can only build kernel driver for 2.6 (see PATCHLEVEL=6). + +debian/control: clearly here you need to give some love to dependecies in case + of major releases. + +debian$ grep 6111 * -rl will give you a good shot of the files that will +requires update (gived that 6111 is the nvidia release). + +Have fun! +Fabio --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/rules.d/0-common-vars.mk +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/rules.d/0-common-vars.mk @@ -0,0 +1,13 @@ +# Rip some version information from our changelog +# +gitver=$(shell if test -f .git/HEAD; then cat .git/HEAD; else uuidgen; fi) + +pkgname := $(shell dpkg-parsechangelog | awk '/^Source/{print $$2}') + +abi_version = $(shell dpkg-parsechangelog | grep ^Version | sed 's/.*-//;s/\..*//') +kernel_version = $(shell dpkg-parsechangelog | grep ^Source | sed 's/.*-//') +kernel_abi_version = $(kernel_version)-$(abi_version) +lrm_version = $(shell dpkg-parsechangelog | awk '/Version:/{print $$2}') +lrm_versions := $(shell sed -n 's/^$(pkgname)\ .*(\(.*\)).*$$/\1/p' debian/changelog | tac) +prev_lrm_versions := $(filter-out $(lrm_version),0.0 $(lrm_versions)) +prev_lrm_version := $(word $(words $(prev_lrm_versions)),$(prev_lrm_versions)) --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/rules.d/1-maintainer.mk +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/rules.d/1-maintainer.mk @@ -0,0 +1,74 @@ +# The following targets are for the maintainer only! do no run if you don't +# know what they do. + +.PHONY: printchanges insertchanges startnewrelease help + +help: + @echo "These are the targets in addition to the normal debian ones:" + @echo + @echo " printenv : Print some variables used in the build" + @echo + @echo " printchanges : Print the current changelog entries (from git)" + @echo + @echo " insertchanges : Insert current changelog entries (from git)" + @echo + @echo " startnewrelease : Start a new changelog set" + @echo + @echo " build-orig-source: Creates the orig tarball after doing some" + @echo " binary changes" + @echo + @echo " help : If you are kernel hacking, you need the professional" + @echo " version of this" + @echo + @echo "Environment variables:" + @echo + @echo " NOKERNLOG : Do not add upstream kernel commits to changelog" + @echo " CONCURRENCY_LEVEL=X" + @echo " : Use -jX for kernel compile" + @echo " PRINTSHAS : Include SHAs for commits in changelog" + +ARCH_CONFIGS=i386 amd64 ia64 hppa powerpc sparc + +printenv-e: + @dh_testdir + @echo "pkgname = $(pkgname)" + @echo "lrm_versions = $(lrm_versions)" + @echo "lrm_version = $(lrm_version)" + @echo "prev_lrm_versions = $(prev_lrm_versions)" + @echo "prev_lrm_version = $(prev_lrm_version)" + @echo "abi_version = $(abi_version)" + @echo "kernel_abi_version = $(kernel_abi_version)" + @echo "gitver = $(gitver)" + +printchanges: + @git-log Ubuntu-$(prev_lrm_version)..HEAD | \ + perl -w -f debian/scripts/misc/git-ubuntu-log $(ubuntu_log_opts) + +insertchanges: + @perl -w -f debian/scripts/misc/insert-changes.pl + +startnewrelease: + dh_testdir + @newversion=$$(echo $(lrm_version) | awk -F. '{ \ + V = ""; \ + for (i=1; i < NF; i++) \ + V = V $$i "."; \ + print V ($$NF + 1); \ + }'); \ + now="$$(date -R)"; \ + echo "Creating new changelog set for $$newversion..."; \ + echo "$(pkgname) ($$newversion) UNRELEASED; urgency=low" \ + >debian/changelog.new; \ + echo "" >>debian/changelog.new; \ + echo " CHANGELOG: Do not edit directly. Autogenerated at release." \ + >>debian/changelog.new; \ + echo " CHANGELOG: Use the printchanges target to see the curent changes." \ + >>debian/changelog.new; \ + echo " CHANGELOG: Use the insertchanges target to create the final log." \ + >>debian/changelog.new; \ + echo "" >>debian/changelog.new; \ + echo " -- $$DEBFULLNAME <$$DEBEMAIL> $$now" >>debian/changelog.new; \ + echo "" >>debian/changelog.new; \ + cat debian/changelog >> debian/changelog.new; \ + mv debian/changelog.new debian/changelog + --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-kernel-source.dirs +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-kernel-source.dirs @@ -0,0 +1 @@ +usr/src --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.dirs.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.dirs.in @@ -0,0 +1,13 @@ +usr/bin +usr/lib +usr/sbin +usr/share/applications +usr/share/man/man1 +usr/share/lintian/overrides +usr/share/pixmaps +usr/lib/xorg/modules/drivers +usr/lib/xorg/modules/extensions +usr/lib/tls +usr/lib/nvidia +usr/lib32/nvidia +usr/share/bug/nvidia-glx@@NV_LEGACY@@ --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/scripts/misc/git-ubuntu-log +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/scripts/misc/git-ubuntu-log @@ -0,0 +1,243 @@ +#!/usr/bin/perl -w + +use strict; +use Text::Wrap; + +my $kernel_auth = "Upstream Kernel Changes"; + +my (%map, @reverts); +my $pstate = 1; +my $no_kern_log = 0; +my $print_shas = 0; +my $first_print = 1; + +while (@ARGV) { + my $opt = $ARGV[0]; + shift; + if ($opt eq "--no-kern-log") { + $no_kern_log = 1; + } elsif ($opt eq "--print-shas") { + $print_shas = 1; + } else { + print STDERR "Unknown options: $opt\n"; + exit(1); + } +} + +sub check_reverts($) { + my ($entry) = @_; + my ($check); + + foreach $check (reverse @reverts) { + my $desc = "Revert \"" . $entry->{'desc'} . "\""; + if ($check->{'desc'} eq $desc) { + @reverts = grep($_->{'desc'} ne $desc, @reverts); + return 1; + } + } + + return 0; +} + +sub add_entry($) { + my ($entry) = @_; + my $key = $entry->{'author'}; + + # store description in array, in email->{desc list} map + if (exists $map{$key}) { + # grab ref + my $obj = $map{$key}; + + # add desc to array + push(@$obj, $entry); + } else { + # create new array, containing 1 item + my @arr = ($entry); + + # store ref to array + $map{$key} = \@arr; + } +} + +sub shortlog_entry($$$$$) { + my ($name, $desc, $bug, $cve, $commit) = @_; + my $entry; + + $desc =~ s#/pub/scm/linux/kernel/git/#/.../#g; + $desc =~ s#\[PATCH\] ##g; + + $desc =~ s#^\s*##g; + $desc =~ s# *UBUNTU: ##g; + + $entry->{'desc'} = $desc; + if ($bug ne '') { + $entry->{'bugno'} = $bug; + } + $entry->{'cve'} = $cve; + $entry->{'commit'} = $commit; + $entry->{'author'} = $name; + + if ($desc =~ /^Revert "/) { + push(@reverts, $entry); + return; + } + + return if check_reverts($entry); + + add_entry($entry); +} + +# sort comparison function +sub by_name($$) { + my ($a, $b) = @_; + + uc($a) cmp uc($b); +} + +sub shortlog_output { + my ($obj, $key, $entry); + + foreach $key (sort by_name keys %map) { + next if $key eq $kernel_auth and $no_kern_log; + + print "\n" unless $first_print; + $first_print = 0; + + # output author + printf " [%s]\n\n", $key; + + # output author's 1-line summaries + $obj = $map{$key}; + foreach $entry (reverse @$obj) { + print wrap(" * ", " ", $entry->{'desc'}) . "\n"; + # For non upstream changes, add other info. + if ($key ne $kernel_auth) { + if ($print_shas) { + print " - GIT-SHA " . $entry->{'commit'} . + "\n"; + } + } + if (defined($entry->{'bugno'})) { + print " - LP: #" . $entry->{'bugno'} . "\n"; + } + if (defined($entry->{'cve'})) { + print " - " . $entry->{'cve'} . "\n"; + } + } + } +} + +sub changelog_input { + my ($author, $desc, $commit, $entry, $cve); + + while () { + # get commit + if ($pstate == 1) { + next unless /^commit (.*)/; + + $commit = $1; + + $pstate++; + } + + # get author and email + elsif ($pstate == 2) { + my ($email); + + next unless /^[Aa]uthor:?\s*(.*?)\s*<(.*)>/; + + $author = $1; + $email = $2; + $desc = undef; + $cve = undef; + + # cset author fixups + if (!$author) { + $author = $email; + } + $pstate++; + } + + # skip to blank line + elsif ($pstate == 3) { + next unless /^\s*$/; + $pstate++; + } + + # skip to non-blank line + elsif ($pstate == 4) { + next unless /^\s*?(.*)/; + my $ignore = 0; + my $bug = undef; + my %bugz = (); + my $k; + + # skip lines that are obviously not + # a 1-line cset description + next if /^\s*From: /; + + chomp; + $desc = $1; + + if ($desc =~ /^ *(Revert "|)UBUNTU:/) { + while () { + $ignore = 1 if /^ *Ignore: yes/i; + if (/^ *Bug: *(#|)(.*)/i) { + foreach $k (split('(,|)*\s*#', $2)) { + $bugz{$k} = 1 if (($k ne '') and ($k =~ /[0-9]+/)); + } + } + elsif (/^ *BugLink: *http.*:\/\/.*\/([0-9]+)/i) { + $bugz{$1} = 1; + } + elsif (/^ *(CVE-.*)/) { + $cve = $1 + } + last if /^commit /; + } + } else { + $author = $kernel_auth; + $ignore = 1 if $desc =~ /Merge /; + while () { + if (/^ *Bug: *(#|)(.*)/i) { + foreach $k (split('(,|)*\s*#', $2)) { + $bugz{$k} = 1 if (($k ne '') and ($k =~ /[0-9]+/)); + } + } + elsif (/^ *BugLink: *http.*:\/\/.*\/([0-9]+)/i) { + $bugz{$1} = 1; + } + elsif (/^ *(CVE-.*)/) { + $cve = $1 + } + last if /^commit /; + } + } + + $bug = join(", #", keys(%bugz)); + if (!$ignore) { + &shortlog_entry($author, $desc, $bug, + $cve, $commit, 0); + } + + $pstate = 1; + if ($_ && /^commit (.*)/) { + $commit = $1; + $pstate++; + } + } + + else { + die "invalid parse state $pstate"; + } + } + + foreach $entry (@reverts) { + add_entry($entry); + } +} + +&changelog_input; +&shortlog_output; + +exit(0); --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/scripts/misc/insert-changes.pl +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/scripts/misc/insert-changes.pl @@ -0,0 +1,30 @@ +#!/usr/bin/perl -w + +system("make -s -f debian/rules printchanges > debian/changes"); + +open(CHANGELOG, "< debian/changelog") or die "Cannot open changelog"; +open(CHANGES, "< debian/changes") or die "Cannot open new changes"; +open(NEW, "> debian/changelog.new") or die "Cannot open new changelog"; + +$printed = 0; + +while () { + if (/^ CHANGELOG: /) { + next if $printed; + + while () { + print NEW; + } + + $printed = 1; + } else { + print NEW; + } +} + +close(NEW); +close(CHANGES); +close(CHANGELOG); + +rename("debian/changelog.new", "debian/changelog"); +unlink("debian/changes"); --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/linux-restricted-modules.postrm +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/linux-restricted-modules.postrm @@ -0,0 +1,16 @@ +#!/bin/sh + +if [ -f /lib/modules/@@KVERSION@@/volatile/.mounted ]; then + umount /lib/modules/@@KVERSION@@/volatile/ +fi + +rm -rf /lib/modules/@@KVERSION@@/volatile/ + + +case "$1" in + remove|purge) + depmod -a -q -F /boot/System.map-@@KVERSION@@ @@KVERSION@@ + ;; +esac + +exit 0 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx.reportbug.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx.reportbug.in @@ -0,0 +1,33 @@ +#!/bin/sh + +PATH=/sbin:$PATH + +printf "uname -r:\n" >&3 +echo `uname -a` >&3 +printf "\n\n/proc/version:\n" >&3 +cat /proc/version >&3 +printf "\n\n" >&3 + +if [ -e /proc/driver/nvidia/version ]; then + printf "/proc/driver/nvidia/version:\n" >&3 + cat /proc/driver/nvidia/version + printf "\n\n" >&3 +fi + +if (lspci --version) > /dev/null 2>&1; then + LC_ALL=C lspci | grep 'VGA compatible controller:' >&3 + LC_ALL=C lspci -n | grep 'Class 0300:' >&3 + printf "\n" >&3 +fi + +#if [ -e /etc/X11/XF86Config-4 ]; then +# cat /etc/X11/XF86Config-4 >&3 +# printf "\n" >&3 +#fi + +#if [ -e /var/log/XFree86.0.log ]; then +# cat /var/log/XFree86.0.log >&3 +# printf "\n" >&3 +#fi + +#ls -d -l /var/log/XFree86.*.log >&3 2> /dev/null --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/control.stub.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/control.stub.in @@ -0,0 +1,514 @@ +Source: linux-restricted-modules-@@KVERSION@@ +Section: restricted/misc +Priority: optional +Maintainer: Ubuntu Kernel Team +Uploaders: Adam Conrad , Ben Collins +Standards-Version: 3.6.1 +Build-Depends: cpio, debhelper (>= 4.0.0), libc6-i386 [amd64], + kernel-wedge (>= 2.05ubuntu2), module-init-tools, rpm, sed (>> 3.0), + sharutils, bzip2, libgtk2.0-dev [i386 amd64], + linux-headers-@@ABIVER@@-386 [i386], + linux-headers-@@ABIVER@@-server [amd64 i386], + linux-headers-@@ABIVER@@-generic [amd64 i386], + linux-headers-@@ABIVER@@-lpia [lpia], + linux-headers-@@ABIVER@@-lpiacompat [lpia], + linux-headers-@@ABIVER@@-openvz [i386 amd64], + linux-headers-@@ABIVER@@-rt [i386 amd64], + linux-headers-@@ABIVER@@-xen [amd64 i386], + linux-headers-@@ABIVER@@-powerpc [powerpc], + linux-headers-@@ABIVER@@-powerpc-smp [powerpc], + linux-headers-@@ABIVER@@-powerpc64-smp [powerpc], + linux-headers-@@ABIVER@@-mckinley [ia64], + linux-headers-@@ABIVER@@-itanium [ia64], + linux-headers-@@ABIVER@@-hppa32 [hppa], + linux-headers-@@ABIVER@@-hppa64 [hppa], + linux-headers-@@ABIVER@@-sparc64-smp [sparc], + linux-headers-@@ABIVER@@-sparc64 [sparc] +Vcs-Git: http://kernel.ubuntu.com/git-repos/ubuntu/ubuntu-hardy-lrm.git + +Package: linux-restricted-modules-common +Architecture: all +Priority: optional +Depends: binutils-static +Description: Non-free Linux @@KVERSION@@ modules helper script + This package provides only a set of helper scripts to handle + linux-restricted-modules. + +Package: linux-restricted-modules-@@ABIVER@@-386 +Architecture: i386 +Priority: optional +Provides: nvidia-kernel-@@NV_VERSION@@, nvidia-kernel-@@NV_LEGACY_VERSION@@, nvidia-kernel-@@NV_NEW_VERSION@@ +Depends: linux-image-@@ABIVER@@-386, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-@@ABIVER@@ +Description: Non-free Linux @@KVERSION@@ modules on 386 + This package provides restricted modules for Linux version @@KVERSION@@ on + 386. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl, fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcdslusba, + fcpci, fcusb, fwlanusb, fxusb (AVM ISDN) + - ltmodem (Winmodem) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: nvidia-glx +Architecture: i386 amd64 +Depends: linux-restricted-modules-common, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-kernel-source (>= ${nvidia:Version}), nvidia-settings +Conflicts: nvidia-glx-src, nvidia-xconfig, nvidia-glx-legacy, nvidia-glx-new +Replaces: nvidia-glx-src +Provides: xserver-xorg-video-2 +Description: NVIDIA binary XFree86 4.x/X.Org driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and support the newer + GeForce, nForce and Quadro families of NVIDIA chipsets. AGP, TV-out and + flat panel displays are also supported. + . + If you have a TNT, TNT2, or older GeForce, you may need the nvidia-glx-legacy + package instead of this one. + +Package: nvidia-glx-dev +Architecture: i386 amd64 +Depends: nvidia-glx (>= ${nvidia:Version}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Conflicts: nvidia-glx-legacy-dev, nvidia-glx-new-dev +Description: NVIDIA binary XFree86 4.x/X.Org driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org driver + development files. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx (>= ${nvidia:Version}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src +Replaces: nvidia-kernel-src +Description: NVIDIA binary kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + +Package: nvidia-glx-new +Architecture: i386 amd64 +Depends: linux-restricted-modules-common, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-new-kernel-source (>= ${nvidia:NewVersion}), nvidia-settings +Conflicts: nvidia-glx-src, nvidia-xconfig, nvidia-glx, nvidia-glx-legacy +Replaces: nvidia-glx-src +Provides: nvidia-glx, xserver-xorg-video-2 +Description: NVIDIA binary XFree86 4.x/X.Org 'new' driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and supports the newer + GeForce, nForce and Quadro families of NVIDIA chipsets. AGP, TV-out and + flat panel displays are also supported. + . + If you have a TNT, TNT2, or older GeForce, you may need the nvidia-glx-legacy + package instead of this one. If you have a GeForce4, you may need the nvidia-glx + package. + +Package: nvidia-glx-new-dev +Architecture: i386 amd64 +Depends: nvidia-glx-new (>= ${nvidia:NewVersion}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Conflicts: nvidia-glx-dev, nvidia-glx-legacy-dev +Description: NVIDIA binary XFree86 4.x/X.Org 'new' driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org 'new' driver + development files. + . + This is the 'new' driver for newer chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-new description, please use the + nvidia-glx driver, which is more compatible. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-new-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx-new (>= ${nvidia:NewVersion}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src, nvidia-kernel-source, nvidia-legacy-kernel-source +Replaces: nvidia-kernel-src, nvidia-kernel-source +Provides: nvidia-kernel-source +Description: NVIDIA binary 'new' kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + . + This is the 'new' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-new description, please use the + nvidia-glx driver, which is more compatible. + +Package: nvidia-glx-legacy +Architecture: i386 amd64 +Depends: linux-restricted-modules-common, xserver-xorg-core (>= 1:0.99.0-1), libglu1-mesa | libglu1, ${shlibs:Depends} +Suggests: nvidia-legacy-kernel-source (>= ${nvidia:LegacyVersion}), nvidia-settings +Conflicts: nvidia-glx-src, nvidia-glx +Replaces: nvidia-glx-src +Provides: nvidia-glx, xserver-xorg-video-2 +Description: NVIDIA binary XFree86 4.x/X.Org 'legacy' driver + These XFree86 4.x/X.Org binary drivers provide optimized hardware acceleration + of OpenGL applications via a direct-rendering X Server and supports the TNT, + TNT2, TNT Ultra, GeForce, and GeForce2 chipsets. AGP, TV-out and flat panel + displays are also supported. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the above paragraph, please use the nvidia-glx driver, + which is much more up to date. + +Package: nvidia-glx-legacy-dev +Architecture: i386 amd64 +Depends: nvidia-glx-legacy (>= ${nvidia:LegacyVersion}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev +Conflicts: nvidia-glx-dev +Description: NVIDIA binary XFree86 4.x/X.Org 'legacy' driver development files + This package contains the NVIDIA binary XFree86 4.x/X.Org 'legacy' driver + development files. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-legacy description, please use the + nvidia-glx driver, which is much more up to date. + . + For more information on this source package visit NVIDIA's homepage + at http://www.nvidia.com/ . + +Package: nvidia-legacy-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: nvidia-glx-legacy (>= ${nvidia:LegacyVersion}), kernel-package (>= 8.082), devscripts +Conflicts: nvidia-kernel-src, nvidia-kernel-source +Replaces: nvidia-kernel-src, nvidia-kernel-source +Provides: nvidia-kernel-source +Description: NVIDIA binary 'legacy' kernel module source + This package builds the NVIDIA XFree86 4.x/X.Org binary kernel module needed + by nvidia-glx. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + . + This is the 'legacy' driver for older chipsets. Unless your chipset is + explicitly listed in the nvidia-glx-legacy description, please use the + nvidia-glx driver, which is much more up to date. + +Package: fglrx-kernel-source +Architecture: i386 amd64 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: xorg-driver-fglrx (>= ${ati:XOrgVersion}), kernel-package (>= 8.082), devscripts +Description: ATI binary kernel module source + This package builds the ATI XFree86 4.x/X.Org binary kernel module needed + by xorg-driver-fglrx. This package is not needed on an + Ubuntu system because a pre-compiled kernel module is supplied by the + linux-restricted-modules packages. + +Package: xorg-driver-fglrx +Architecture: i386 amd64 +Depends: linux-restricted-modules-common, xserver-xorg-core (>= 1:0.99.0-1), ${shlibs:Depends} +Conflicts: fglrx-driver, xfree86-driver-fglrx, nvidia-glx, nvidia-glx-legacy +Replaces: fglrx-driver, xfree86-driver-fglrx +Provides: fglrx-driver, xserver-xorg-video-2 +Description: Video driver for ATI graphics accelerators + Video driver for the ATI Radeon and FireGL graphics accelerators. + . + This version of the ATI driver officially supports: + . + * FireGL: V8650, V8600, V7600, V7350, V7300, V7200, V7100, + V5600, V5200, V5100, V5000, HD3870, HD3850, V3600, V3400, + V3300, V3200, V3100, X3-256, X3, X2-256, Z1-128, T2-128, + X1-128, X1-256p + * FireMV: 2200 (Single card PCI-e configuration) + * Mobility FireGL: V5000, T2 + * Mobility Radeon: X1800, X1600, X1400, X1300, X800, X700, X600, X300, + X200, 9800, 9600, 9550, 9500 + * Radeon Xpress: 1200 series, 1100 series, 200 series + * Radeon: HD2900, HD2600, HD2400, X1900, X1800, X1600, X1300, X850, + X800, X700, X600, X550, X300, 9800, 9700, 9600, 9550, 9500 + . + ATI All-in-Wonder variants of the above cards/chips are also supported, + but video capture is not. + . + This package provides 2D display drivers and hardware accelerated OpenGL. + +Package: xorg-driver-fglrx-dev +Architecture: i386 amd64 +Depends: xorg-driver-fglrx (= ${ati:XOrgFullVersion}) +Conflicts: fglrx-driver-dev, xfree86-driver-fglrx-dev +Replaces: fglrx-driver-dev, xfree86-driver-fglrx-dev +Provides: fglrx-driver-dev +Description: Video driver for ATI graphics accelerators (devel files) + Video driver for the ATI Radeon and FireGL graphics accelerators. + . + This package provides definitions for the GL and GLX extensions + and the FGLRXGAMMA extension interface library. + +Package: fglrx-control +Architecture: i386 amd64 +Depends: xorg-driver-fglrx, ${shlibs:Depends} +Conflicts: xorg-driver-fglrx (< 1:7.1.0-7-11+2.6.24.5-4.12) +Replaces: xorg-driver-fglrx (< 1:7.1.0-7-11+2.6.24.5-4.12) +Description: Control panel for the ATI graphics accelerators + Control panel for the ATI Radeon and FireGL graphics accelerators. + . + This package provides the control panel compiled for Qt3. + +Package: fglrx-amdcccle +Architecture: i386 amd64 +Depends: fglrx-control +Description: Dummy package for easy transition + This is a dummy package for easy transition with ATI's packages. + +Package: avm-fritz-kernel-source +Architecture: amd64 i386 +Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0) +Recommends: kernel-package (>= 8.082), devscripts +Description: AVM Fritz! binary kernel module source + This package builds the binary kernel modules needed for the AVM FRITZ! + ISDN hardware. This package is not needed on an Ubuntu system because + a pre-compiled kernel module is supplied by the linux-restricted-modules + packages. + +Package: avm-fritz-firmware-@@ABIVER@@ +Architecture: amd64 i386 +Depends: capiutils (>= 1:3.6.2005-01-03-3ubuntu1) +Recommends: drdsl +Description: Firmware for AVM Fritz! ISDN hardware + This package contains firmware binaries needed for various Fritz! ISDN cards + made by AVM. The firmware is installed in a kernel specific directory to + match driver and firmware version, if more than one kernel installed. + +Package: linux-restricted-modules-@@ABIVER@@-generic +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-@@NV_VERSION@@, nvidia-kernel-@@NV_LEGACY_VERSION@@, nvidia-kernel-@@NV_NEW_VERSION@@ +Depends: linux-image-@@ABIVER@@-generic, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-@@ABIVER@@ +Description: Non-free Linux @@KVERSION@@ modules on x86/x86_64 + This package provides restricted modules for Linux version @@KVERSION@@ on + x86/x86_64. + . + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcpci (AVM ISDN) + - fcdsl, fcdslusba, fcusb, fwlanusb, fxusb (AVM ISDN x86 only) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-rt +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-@@NV_VERSION@@, nvidia-kernel-@@NV_LEGACY_VERSION@@, nvidia-kernel-@@NV_NEW_VERSION@@ +Depends: linux-image-@@ABIVER@@-rt, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-@@ABIVER@@ +Description: Non-free Linux @@KVERSION@@ modules on x86/x86_64 + This package provides restricted modules for Linux version @@KVERSION@@ on + x86/x86_64. + . + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcpci (AVM ISDN) + - fcdsl, fcdslusba, fcusb, fwlanusb, fxusb (AVM ISDN x86 only) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-server +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-@@NV_VERSION@@, nvidia-kernel-@@NV_LEGACY_VERSION@@, nvidia-kernel-@@NV_NEW_VERSION@@ +Depends: linux-image-@@ABIVER@@-server, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-@@ABIVER@@ +Description: Non-free Linux @@KVERSION@@ modules on x86/x86_64 + This package provides restricted modules for Linux version @@KVERSION@@ on + x86/x86_64. + . + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + - fcdsl2, fcdslsl, fcdslslusb, fcdslusb, fcdslusb2, fcpci (AVM ISDN) + - fcdsl, fcdslusba, fcusb, fwlanusb, fxusb (AVM ISDN x86 only) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-powerpc +Architecture: powerpc +Priority: optional +Depends: linux-image-@@ABIVER@@-powerpc, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on PowerPC + This package provides restricted modules for Linux version @@KVERSION@@ on + PowerPC. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-powerpc-smp +Architecture: powerpc +Priority: optional +Depends: linux-image-@@ABIVER@@-powerpc-smp, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on PowerPC SMP + This package provides restricted modules for Linux version @@KVERSION@@ on + PowerPC SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-powerpc64-smp +Architecture: powerpc +Priority: optional +Depends: linux-image-@@ABIVER@@-powerpc64-smp, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on PowerPC 64-bit SMP + This package provides restricted modules for Linux version @@KVERSION@@ on + PowerPC 64-bit SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-itanium +Architecture: ia64 +Priority: optional +Depends: linux-image-@@ABIVER@@-itanium, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on Itanium + This package provides restricted modules for Linux version @@KVERSION@@ on + Itanium. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-mckinley +Architecture: ia64 +Priority: optional +Depends: linux-image-@@ABIVER@@-mckinley, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on Itanium 2 + This package provides restricted modules for Linux version @@KVERSION@@ on + Itanium 2. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-hppa32 +Architecture: hppa +Priority: optional +Depends: linux-image-@@ABIVER@@-hppa32, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on 32-bit HPPA + This package provides restricted modules for Linux version @@KVERSION@@ on + 32-bit HPPA. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-hppa64 +Architecture: hppa +Priority: optional +Depends: linux-image-@@ABIVER@@-hppa64, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on 64-bit HPPA + This package provides restricted modules for Linux version @@KVERSION@@ on + 64-bit HPPA. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-lpia +Architecture: lpia +Priority: optional +Depends: linux-image-@@ABIVER@@-lpia, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on LPIA + This package provides restricted modules for Linux version @@KVERSION@@ on + 32-bit LPIA + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-lpiacompat +Architecture: lpia +Priority: optional +Depends: linux-image-@@ABIVER@@-lpiacompat, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on LPIAcompat + This package provides restricted modules for Linux version @@KVERSION@@ on + 32-bit LPIAcompat + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-sparc64 +Architecture: sparc +Priority: optional +Depends: linux-image-@@ABIVER@@-sparc64, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on 64-bit Sparc + This package provides restricted modules for Linux version @@KVERSION@@ on + 64-bit Sparc. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-sparc64-smp +Architecture: sparc +Priority: optional +Depends: linux-image-@@ABIVER@@-sparc64-smp, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools +Description: Non-free Linux @@KVERSION@@ modules on 64-bit Sparc SMP + This package provides restricted modules for Linux version @@KVERSION@@ on + 64-bit Sparc SMP. + Currently the following modules are included: + - madwifi (Atheros) + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-xen +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-@@NV_VERSION@@, nvidia-kernel-@@NV_LEGACY_VERSION@@, nvidia-kernel-@@NV_NEW_VERSION@@ +Depends: linux-image-@@ABIVER@@-xen, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-@@ABIVER@@ +Description: Non-free Linux @@KVERSION@@ modules on Xen + This package provides restricted modules for Linux version @@KVERSION@@ on + Xen dom0 and domU. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + . + These modules are "restricted" because they are not available under a + completely Free licence. + +Package: linux-restricted-modules-@@ABIVER@@-openvz +Architecture: amd64 i386 +Priority: optional +Provides: nvidia-kernel-@@NV_VERSION@@, nvidia-kernel-@@NV_LEGACY_VERSION@@, nvidia-kernel-@@NV_NEW_VERSION@@ +Depends: linux-image-@@ABIVER@@-openvz, linux-restricted-modules-common (>= @@KVERSION@@), module-init-tools, nvidia-kernel-common +Suggests: nvidia-glx | nvidia-glx-legacy | nvidia-glx-new, avm-fritz-firmware-@@ABIVER@@ +Description: Non-free Linux @@KVERSION@@ modules on OpenVZ Virtualization enabled kernel + This package provides restricted modules for Linux version @@KVERSION@@ on + OpenVZ Virtualization enabled kernel. + Currently the following modules are included: + - madwifi (Atheros) + - fglrx (ATI) + - nvidia + . + These modules are "restricted" because they are not available under a + completely Free licence. --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/nvidia-glx-dev.postinst.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/nvidia-glx-dev.postinst.in @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + if [ -e /etc/init.d/nvidia-glx@@NV_LEGACY@@ ] ; then + /etc/init.d/nvidia-glx@@NV_LEGACY@@ start + fi + ;; +esac + +#DEBHELPER# --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/copy-modules.in +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/copy-modules.in @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +source="$1" +dest="$2" + +do_copy() { + cd $source + for i in $MODULES; do + tar cp $(eval "echo \$${i}_objs") | tar xpC $dest + done +} + --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/compat +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/compat @@ -0,0 +1 @@ +4 --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/lrm-video +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/lrm-video @@ -0,0 +1,32 @@ +#!/bin/sh + +PATH=/sbin:/bin + +MODULE="$1" +shift + +if [ "$MODULE" = "nvidia" ]; then + if [ -e /lib/linux-restricted-modules/.nvidia_legacy_installed ]; then + MODULE="nvidia_legacy" + fi + if [ -e /lib/linux-restricted-modules/.nvidia_new_installed ]; then + MODULE="nvidia_new" + fi + XORG="nvidia"; +elif [ "$MODULE" = "nvidia_legacy" -o "$MODULE" = "nvidia_new" ]; then + XORG="nvidia"; +elif [ "$MODULE" = "fglrx" ]; then + XORG="fglrx"; +fi + +if cat /etc/X11/xorg.conf 2>/dev/null | \ + sed -n -e '/^[ \t]*section[ \\t]*"device"/I,/^[ \t]*endsection/I{/^[ \t]*driver[ \t]*/I{s/^[ \t]*driver[ \t]*"*//I;s/"*[ \t]*$//;p}}' | \ + grep -q -w $XORG; then + if [ -e /etc/default/envy-dkms ]; then + modprobe --ignore-install -Qb $@ $XORG + else + modprobe --ignore-install -Qb $@ $MODULE + fi + else + echo "Not loading $MODULE module; not used in /etc/X11/xorg.conf" 1>&2 +fi --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/linux-restricted-modules-common.default +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/linux-restricted-modules-common.default @@ -0,0 +1,18 @@ +# This file is sourced from the linux-restricted-modules-common init +# script and is used to disable the link-on-boot feature, one module +# at a time. This can be useful if you want to use hand-compiled +# versions of one or more modules, but keep linux-restricted-modules +# installed on your system, or just to disable modules you don't use +# and speed up your boot process by a second or two. +# +# Use a space-separated list of modules you wish to not have linked +# on boot. The following example shows a (condensed) list of all +# modules shipped in the linux-restricted-modules packages: +# +# DISABLED_MODULES="ath_hal fc fglrx ltm nv" +# +# Note that disabling "fc" disables all fcdsl drivers, "ltm" disables +# ltmodem and ltserial, and "nv" disables the three nvidia drivers. +# You can also name each module individually, if you prefer a subset. + +DISABLED_MODULES="" --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/linux-restricted-modules.postinst +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/linux-restricted-modules.postinst @@ -0,0 +1,7 @@ +#!/bin/sh + +case "$1" in + configure) + lrm-manager --kver=@@KVERSION@@ + ;; +esac --- linux-restricted-modules-2.6.24-2.6.24.18.orig/debian/xorg-driver-fglrx.shlibs +++ linux-restricted-modules-2.6.24-2.6.24.18/debian/xorg-driver-fglrx.shlibs @@ -0,0 +1,4 @@ +libGL 1 libgl1-mesa | libgl1 +libfglrx_pp 1 xorg-driver-fglrx +libfglrx_gamma 1 xorg-driver-fglrx +libfglrx_dm 1 xorg-driver-fglrx