Bug#687292: unblock: nvidia-graphics-drivers-legacy-96xx/96.43.23-2
Control: retitle -1 unblock: nvidia-graphics-drivers-legacy-96xx/96.43.23-2
On 2012-09-12 04:39, Andreas Beckmann wrote:
> On 2012-09-11 15:49, Andreas Beckmann wrote:
>> On Sept 4th a new release of the 96xx series appeared on Nvidia's ftp
>> server [...] that adds support for Xorg Xserver 1.12
> https://plus.google.com/u/0/118125769023950376556/posts/RfCBEGaPHnX
> * this is an official release
> * no further releases for 96xx are planned, i.e. no Xserver 1.13+ support
I've now uploaded the revived 96xx legacy packages to unstable and ask
for an unblock.
I'm attaching two diffs: one vs 96.43.20-8 in testing (excluding *.run
- the blobs, and excluding *.po*) and one vs 173xx in testing which was
the synchronization point for the further packaging changes that were
applied (there anything specific to the 96xx vs 173xx was filtered:
symbol changes, id lists, ... see patch header for a list).
Andreas
unblock: nvidia-graphics-drivers-legacy-96xx/96.43.23-2
diffstat for nvidia-graphics-drivers-legacy-96xx-96.43.20 nvidia-graphics-drivers-legacy-96xx-96.43.23
NEWS | 16 ---
bug-control.in | 2
changelog | 71 +++++++++++++++++
control | 104 +++++++++----------------
control.models | 4
libgl1-nvidia-glx-ia32.NEWS | 14 +++
libgl1-nvidia-glx-ia32.docs | 1
libgl1-nvidia-glx-ia32.install.in | 4
libgl1-nvidia-glx-ia32.links.in | 4
libgl1-nvidia-glx-ia32.symbols | 1
libgl1-nvidia-glx.install.in | 2
libgl1-nvidia-glx.links.in | 2
libgl1-nvidia-glx.lintian-overrides.in | 2
module/conftest.h | 28 ++++++
module/debian/control.template.in | 1
module/debian/patches/kernel-3.4.patch | 27 ------
module/debian/patches/series | 3
module/debian/rules | 6 +
po/POTFILES.in | 1
rules | 28 ++----
rules.defs | 4
xserver-xorg-video-nvidia.config | 9 ++
xserver-xorg-video-nvidia.install.in | 2
xserver-xorg-video-nvidia.lintian-overrides.in | 6 -
xserver-xorg-video-nvidia.templates | 12 --
25 files changed, 190 insertions(+), 164 deletions(-)
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/NEWS nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/NEWS
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/NEWS 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/NEWS 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-nvidia-graphics-drivers-legacy-96xx (96.43.20-5) unstable; urgency=low
-
- Nvidia Corporation has not updated the legacy 96xx driver to support
- current X servers, so this driver is no longer usable. For graphics
- adapters that are not supported by a newer Nvidia driver generation,
- the best option is to use the free Nouveau driver.
-
- To switch to the Nouveau driver, please uninstall all Nvidia driver
- packages, remove all Nvidia-specific configuration from
- /etc/X11/xorg.conf (and xorg.conf.d/), and *purge* the
- nvidia-kernel-common package - just removing it is insufficient.
-
- The Nouveau driver (xserver-xorg-video-nouveau) should work without
- needing any specific xorg.conf settings.
-
- -- Andreas Beckmann <debian@abeckmann.de> Thu, 28 Jun 2012 16:36:17 +0200
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/bug-control.in nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/bug-control.in
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/bug-control.in 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/bug-control.in 2012-09-19 12:59:58.000000000 +0200
@@ -1,3 +1,3 @@
report-with: nvidia-glx#LEGACY# libgl1-nvidia#LEGACY#-glx xserver-xorg-video-nvidia#LEGACY# nvidia-alternative#LEGACY# nvidia-kernel#LEGACY#-dkms nvidia-kernel#LEGACY#-source glx-alternative-nvidia
-package-status: nvidia-glx#LEGACY# nvidia-kernel#LEGACY#-dkms nvidia-kernel#LEGACY#-source nvidia-glx-any libgl1-nvidia-glx-any libgl1-nvidia-glx-ia32-any xserver-xorg-video-nvidia-any nvidia-settings nvidia-xconfig nvidia-support nvidia-kernel-common xserver-xorg xserver-xorg-core linux-headers libdrm-nouveau1 libdrm-nouveau1a xserver-xorg-video-nouveau
+package-status: nvidia-glx#LEGACY# nvidia-kernel#LEGACY#-dkms nvidia-kernel#LEGACY#-source nvidia-glx-any libgl1-nvidia-glx-any libgl1-nvidia-glx-ia32-any libgl1-nvidia-glx-ia32 libgl1-nvidia-legacy-173xx-glx-ia32 libgl1-nvidia-alternatives-ia32 xserver-xorg-video-nvidia-any nvidia-settings nvidia-xconfig nvidia-support nvidia-kernel-common xserver-xorg xserver-xorg-core linux-headers libdrm-nouveau1 libdrm-nouveau1a xserver-xorg-video-nouveau ia32-libs
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/changelog nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/changelog
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/changelog 2012-09-03 22:20:51.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/changelog 2012-09-19 12:59:58.000000000 +0200
@@ -1,3 +1,74 @@
+nvidia-graphics-drivers-legacy-96xx (96.43.23-2) unstable; urgency=low
+
+ * http://nvidia.custhelp.com/app/answers/detail/a_id/3142
+ 96.43.23 is the final 96xx legacy release.
+ No further releases from the 96.43.* series are planned.
+ * Synchronize packaging with nvidia-graphics-drivers 302.17-3:
+ - xserver-xorg-video-nvidia.{config,postinst}: Present a debconf note
+ about needing manual Xorg configuration to enable the nvidia driver.
+ - xserver-xorg-video-nvidia.postrm: Present a debconf note if the driver
+ was removed, but it is still enabled in xorg.conf(.d/).
+ * Synchronize packaging with nvidia-graphics-drivers 304.22-1:
+ - Work around dpkg-gencontrol bug #659814.
+ - Convert *-ia32 into transitional packages due to ia32-libs transition:
+ - $pkg:i386 Provides: $pkg-i386
+ - $pkg-ia32 Recommends: $pkg-i386
+ - Add multiarch instructions to long descriptions.
+ * Synchronize packaging with nvidia-graphics-drivers 304.30-1:
+ - xserver-xorg-video-nvidia-legacy-96xx.postrm: Do not fail if the
+ debconf templates from nvidia-support are not available.
+ * Synchronize packaging with nvidia-graphics-drivers 304.30-2:
+ - Disable patch-3.0-rt-nvidia.patch, no longer needed.
+ * Synchronize packaging with nvidia-graphics-drivers 304.32-1:
+ - debian/rules: get-orig-source: Make --pasv overridable.
+ * Synchronize packaging with nvidia-graphics-drivers 304.37-1:
+ - nvidia-kernel-legacy-96xx-source: Add Built-Using attribute to the
+ generated module packages to record the exact versions of linux and
+ nvidia-graphics-drivers-legacy-96xx that were used during the build.
+ - libgl1-nvidia-legacy-96xx-glx:i386: Add Breaks: ia32-libs (<< 20120701)
+ because that is shipping /usr/lib32/libGL.so.1 which gets no longer
+ diverted away.
+ - nvidia-kernel-legacy-96xx-dkms: Set Multi-Arch: foreign (instead of
+ allowed).
+ - Add nvidia-kernel-legacy-96xx-dkms (= ${binary:Version}) as preferred
+ alternative to (virtual) nvidia-kernel-${nvidia:Version}.
+ * Synchronize packaging with nvidia-graphics-drivers 304.43-1:
+ - conftest.h:
+ - Implement check for linux/screen_info.h (302.17).
+ - Implement check for linux/kconfig.h (304.30).
+ - Implement new conftest.sh function acpi_os_wait_events_complete
+ (304.43).
+ - bug-control: Report installed versions of
+ libgl1-nvidia-alternatives-ia32, libgl1-nvidia{,-legacy-173xx}-glx-ia32,
+ and ia32-libs.
+ - libgl1-nvidia-legacy-96xx-glx-ia32: Add NEWS file describing the steps
+ needed to install the multiarch :i386 nvidia packages on amd64.
+ * Synchronize packaging with nvidia-graphics-drivers 304.48-1:
+ - get-orig-source: Skip downloading if cached files are in ../.cache/
+ - Switch .deb compression to xz.
+ * Synchronize packaging with nvidia-graphics-drivers-legacy-173xx
+ 173.14.35-3:
+ - libgl1-nvidia-legacy-96xx-glx: add Breaks: nvidia-settings (>= 302)
+ which is no longer backwards compatible.
+ - Suggests: nvidia-settings-legacy-173xx instead.
+ * Upload to unstable.
+
+ -- Andreas Beckmann <debian@abeckmann.de> Wed, 19 Sep 2012 12:58:42 +0200
+
+nvidia-graphics-drivers-legacy-96xx (96.43.23-1) experimental; urgency=low
+
+ * New upstream beta 96.43.23 (2012-09-04).
+ - Added support for X.Org xserver versions 1.11 and 1.12.
+ (Closes: #643584)
+ - Improved compatibility with recent Linux kernels.
+ * Enable xorg-video-abi-11 and xorg-video-abi-12.
+ * kernel-3.4.patch: remove, fixed upstream.
+ * Revert turning the 96xx legacy driver into empty transitional packages
+ (96.43.20-5, 96.43.20-6, 96.43.20-7, 96.43.20-8).
+ * Upload to experimental (but build in wheezy due to ia32-libs).
+
+ -- Andreas Beckmann <debian@abeckmann.de> Tue, 11 Sep 2012 14:51:54 +0200
+
nvidia-graphics-drivers-legacy-96xx (96.43.20-8) unstable; urgency=low
[ Debconf translations ]
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/control nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/control
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/control 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/control 2012-09-19 12:59:58.000000000 +0200
@@ -1,6 +1,6 @@
Source: nvidia-graphics-drivers-legacy-96xx
-Section: non-free/oldlibs
-Priority: extra
+Section: non-free/libs
+Priority: optional
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel@lists.alioth.debian.org>
Uploaders:
Russ Allbery <rra@debian.org>,
@@ -14,13 +14,12 @@
dkms (>= 2.1.1.1),
libxext6,
quilt,
-# ia32-libs (>= 20090804) [amd64],
- po-debconf,
Standards-Version: 3.9.3
Homepage: http://www.nvidia.com
XS-Autobuild: yes
Package: nvidia-glx-legacy-96xx
+Section: non-free/x11
Architecture: i386 amd64
Pre-Depends:
dpkg (>= 1.15.7.2),
@@ -29,23 +28,19 @@
libgl1-nvidia${nvidia:Legacy}-glx (= ${binary:Version}),
xserver-xorg-video-nvidia${nvidia:Legacy} (= ${binary:Version}),
nvidia-alternative${nvidia:Legacy} (= ${binary:Version}),
- nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
+ nvidia-kernel${nvidia:Legacy}-dkms (= ${binary:Version})
+ | nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
nvidia-support,
${shlibs:Depends}, ${misc:Depends}
+Recommends:
+ libgl1-nvidia${nvidia:Legacy}-glx-i386 [amd64],
Suggests:
- nvidia-settings,
+ nvidia-settings-legacy-173xx,
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
Provides:
-# nvidia-glx-any,
-Description: OBSOLETE NVIDIA metapackage${nvidia:LegacyDesc}
- .
- Nvidia Corporation has not updated the legacy 96xx driver to support
- current X servers, so this driver is no longer usable.
- .
- This package is now a transitional package to aid switching to the free
- Nouveau driver. See NEWS.Debian.gz for further instructions.
- .
+ nvidia-glx-any,
+Description: NVIDIA metapackage${nvidia:LegacyDesc}
.
This metapackage depends on the NVIDIA binary driver and libraries
that provide optimized hardware acceleration of
@@ -63,42 +58,36 @@
for a complete list of supported GPUs and PCI IDs.
Package: xserver-xorg-video-nvidia-legacy-96xx
+Section: non-free/x11
Architecture: i386 amd64
Pre-Depends:
nvidia-installer-cleanup,
Depends:
libgl1-nvidia${nvidia:Legacy}-glx (= ${binary:Version}),
nvidia-alternative${nvidia:Legacy} (= ${binary:Version}),
- nvidia-support,
-# ${nvidia:xorgDepends},
- xserver-xorg-video-nouveau,
+ nvidia-support (>= 20120630),
+ ${nvidia:xorgDepends},
${shlibs:Depends}, ${misc:Depends}
Recommends:
- nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
+ nvidia-kernel${nvidia:Legacy}-dkms (= ${binary:Version})
+ | nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
Suggests:
- nvidia-settings,
+ nvidia-settings-legacy-173xx,
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
Provides:
-# xserver-xorg-video-nvidia-any,
-# ${nvidia:xorgProvides},
+ xserver-xorg-video-nvidia-any,
+ ${nvidia:xorgProvides},
Breaks:
nvidia-glx (<< 275.09.07-2),
nvidia-glx-legacy (<< 71.86.14-3),
nvidia-glx-legacy-71xx (<< 71.86.14-3),
nvidia-glx-legacy-96xx (<< 96.43.19-2),
nvidia-glx-legacy-173xx (<< 173.14.30-2),
- fglrx-driver (<< 11-6-~),
+ fglrx-driver (<< 1:11-6-~),
Replaces:
nvidia-glx${nvidia:Legacy} (<< 96.43.19-2),
-Description: OBSOLETE NVIDIA binary Xorg driver${nvidia:LegacyDesc}
- .
- Nvidia Corporation has not updated the legacy 96xx driver to support
- current X servers, so this driver is no longer usable.
- .
- This package is now a transitional package to aid switching to the free
- Nouveau driver. See NEWS.Debian.gz for further instructions.
- .
+Description: NVIDIA binary Xorg driver${nvidia:LegacyDesc}
.
These binary drivers provide optimized hardware acceleration of
OpenGL applications via a direct-rendering X Server.
@@ -115,6 +104,8 @@
for a complete list of supported GPUs and PCI IDs.
Package: nvidia-glx-legacy-96xx-ia32
+Section: non-free/oldlibs
+Priority: extra
Architecture: amd64
Depends:
libgl1-nvidia${nvidia:Legacy}-glx-ia32,
@@ -134,12 +125,14 @@
nvidia-support,
${shlibs:Depends}, ${misc:Depends}
Recommends:
- nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
+ nvidia-kernel${nvidia:Legacy}-dkms (= ${binary:Version})
+ | nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
Suggests:
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
Provides:
-# libgl1-nvidia-glx-any,
+ libgl1-nvidia${nvidia:Legacy}-glx-i386 [i386],
+ libgl1-nvidia-glx-any,
Conflicts:
libgl1-nvidia${nvidia:Legacy}-dev,
nvidia-glx${nvidia:Legacy}-dev,
@@ -155,19 +148,14 @@
libgl1-nvidia-legacy-71xx-glx (<< 71.86.14-3),
# libgl1-nvidia-legacy-96xx-glx (<< 96.43.19-2),
libgl1-nvidia-legacy-173xx-glx (<< 173.14.30-2),
- fglrx-glx (<< 11-6-~),
+ fglrx-glx (<< 1:11-6-~),
+ ia32-libs (<< 20120701) [i386],
+ nvidia-settings (>= 302),
Replaces:
nvidia-glx${nvidia:Legacy} (<< 96.43.18),
libgl1-nvidia${nvidia:Legacy}-dev,
nvidia-glx${nvidia:Legacy}-dev,
-Description: OBSOLETE NVIDIA binary OpenGL libraries${nvidia:LegacyDesc}
- .
- Nvidia Corporation has not updated the legacy 96xx driver to support
- current X servers, so this driver is no longer usable.
- .
- This package is now a transitional package to aid switching to the free
- Nouveau driver. See NEWS.Debian.gz for further instructions.
- .
+Description: NVIDIA binary OpenGL libraries${nvidia:LegacyDesc}
.
These binary libraries provide optimized hardware acceleration of
OpenGL applications via a direct-rendering X Server.
@@ -177,22 +165,16 @@
for a complete list of supported GPUs and PCI IDs.
Package: libgl1-nvidia-legacy-96xx-glx-ia32
+Section: non-free/oldlibs
+Priority: extra
Architecture: amd64
Pre-Depends:
libc6-i386 (>= 2.9-18),
nvidia-installer-cleanup,
- ${misc:Pre-Depends}
Depends:
- libgl1-nvidia-alternatives-ia32,
- nvidia-support,
${shlibs:Depends}, ${misc:Depends}
Recommends:
- nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
-Suggests:
- nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
- | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
-Provides:
-# libgl1-nvidia-glx-ia32-any,
+ libgl1-nvidia${nvidia:Legacy}-glx-i386,
Conflicts:
libgl1-nvidia-glx-ia32,
libgl1-nvidia-glx-ia32-any,
@@ -206,21 +188,13 @@
libgl1-nvidia${nvidia:Legacy}-glx (<< ${nvidia:Version}),
Replaces:
nvidia-glx${nvidia:Legacy}-ia32 (<< 96.43.18),
-Description: OBSOLETE NVIDIA binary OpenGL 32-bit libraries${nvidia:LegacyDesc}
- .
- Nvidia Corporation has not updated the legacy 96xx driver to support
- current X servers, so this driver is no longer usable.
+Description: please switch to multiarch libgl1-nvidia${nvidia:Legacy}-glx:i386
.
- This package is now a transitional package to aid switching to the free
- Nouveau driver. See NEWS.Debian.gz for further instructions.
+ This is an empty transitional package to aid switching to multiarch.
.
- .
- These binary 32-bit libraries provide optimized hardware acceleration of
- OpenGL applications via a direct-rendering X Server.
- .
- See the description of the nvidia-glx${nvidia:Legacy} package
- or /usr/share/doc/libgl1-nvidia${nvidia:Legacy}-glx/README.txt.gz
- for a complete list of supported GPUs and PCI IDs.
+ Run the following commands to install the multiarch library:
+ * dpkg --add-architecture i386 ; apt-get update
+ * apt-get install libgl1-nvidia${nvidia:Legacy}-glx:i386
Package: nvidia-alternative-legacy-96xx
Architecture: i386 amd64
@@ -248,7 +222,7 @@
Package: nvidia-kernel-legacy-96xx-dkms
Section: non-free/kernel
Architecture: i386 amd64
-Multi-Arch: allowed
+Multi-Arch: foreign
Pre-Depends:
nvidia-installer-cleanup,
Depends:
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/control.models nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/control.models
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/control.models 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/control.models 2012-09-19 12:59:58.000000000 +0200
@@ -1,4 +1,4 @@
-The 96xx legacy driver was the last release that supported the following GPUs:
+This legacy version is the last release that supports the following GPUs:
GeForce2 Go [NV11], GeForce2 MX Integrated Graphics [NVCrush11],
GeForce2 MX/MX 400 [NV11], GeForce2 MX200 [NV11DDR], GeForce3 [NV20],
GeForce3 Ti 200 [NV20], GeForce3 Ti 500 [NV20], GeForce4 410 Go 16M [NV17],
@@ -19,6 +19,6 @@
Quadro4 750 XGL [NV25GL], Quadro4 780 XGL [NV28GL], Quadro4 900 XGL [NV25GL],
Quadro4 980 XGL [NV28GL], Quadro4 Go700 [NV28GLM], NV40GL.
-There were several "more modern" GPUs supported by this package, too, but the
+There are several "more modern" GPUs supported by this package, too, but the
updated drivers in the newer legacy packages or the current nvidia-glx
package usually provide more features and better support.
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx-ia32.NEWS nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx-ia32.NEWS
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx-ia32.NEWS 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx-ia32.NEWS 2012-09-19 12:59:58.000000000 +0200
@@ -0,0 +1,14 @@
+nvidia-graphics-drivers-legacy-96xx (96.43.23-2) unstable; urgency=low
+
+ The *nvidia*-ia32 packages have been converted into empty dummy packages
+ to aid switching to multiarch packages and removing the obsolete ia32-libs
+ packages.
+
+ To install the 32-bit multiarch packages on amd64, you need to enable i386
+ as a foreign architecture and install the i386 packages you need:
+
+ dpkg --add-architecture i386
+ apt-get update
+ apt-get install libgl1-nvidia-legacy-96xx-glx:i386
+
+ -- Andreas Beckmann <debian@abeckmann.de> Fri, 17 Aug 2012 10:23:30 +0200
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx-ia32.docs nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx-ia32.docs
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx-ia32.docs 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx-ia32.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/README.alternatives
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx-ia32.install.in nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx-ia32.install.in
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx-ia32.install.in 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx-ia32.install.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-#usr/lib32/libGL.so.#VERSION# usr/lib32/nvidia/
-#usr/lib32/libGLcore.so.#VERSION#
-#usr/lib32/libnvidia-tls.so.#VERSION#
-#usr/lib32/tls/libnvidia-tls.so.#VERSION#
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx-ia32.links.in nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx-ia32.links.in
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx-ia32.links.in 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx-ia32.links.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-#usr/lib32/nvidia/libGL.so.#VERSION# usr/lib32/nvidia/libGL.so.1
-#usr/lib32/libGLcore.so.#VERSION# usr/lib32/libGLcore.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
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx-ia32.symbols nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx-ia32.symbols
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx-ia32.symbols 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx-ia32.symbols 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "libgl1-nvidia-glx.symbols.common"
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx.install.in nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx.install.in
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx.install.in 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx.install.in 2011-07-07 09:42:11.000000000 +0200
@@ -1,4 +1,4 @@
-#usr/lib/libGL.so.#VERSION# #LIBDIR#/#PRIVATE#/
+usr/lib/libGL.so.#VERSION# #LIBDIR#/#PRIVATE#/
usr/lib/libGLcore.so.#VERSION# #LIBDIR#/#PRIVATE#/
usr/lib/libnvidia-cfg.so.#VERSION# #LIBDIR#/#PRIVATE#/
usr/lib/libnvidia-tls.so.#VERSION# #LIBDIR#/#PRIVATE#/
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx.links.in nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx.links.in
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx.links.in 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx.links.in 2011-07-07 09:42:11.000000000 +0200
@@ -1,4 +1,4 @@
-##LIBDIR#/#PRIVATE#/libGL.so.#VERSION# #LIBDIR#/#PRIVATE#/libGL.so.1
+#LIBDIR#/#PRIVATE#/libGL.so.#VERSION# #LIBDIR#/#PRIVATE#/libGL.so.1
#LIBDIR#/#PRIVATE#/libGLcore.so.#VERSION# #LIBDIR#/#PRIVATE#/libGLcore.so.1
#LIBDIR#/#PRIVATE#/libnvidia-cfg.so.#VERSION# #LIBDIR#/#PRIVATE#/libnvidia-cfg.so.1
#LIBDIR#/#PRIVATE#/libnvidia-tls.so.#VERSION# #LIBDIR#/#PRIVATE#/libnvidia-tls.so.1
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx.lintian-overrides.in nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx.lintian-overrides.in
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/libgl1-nvidia-glx.lintian-overrides.in 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx.lintian-overrides.in 2012-05-23 14:34:25.000000000 +0200
@@ -14,7 +14,7 @@
# the free version for Debian's purposes. Therefore we use a special
# combination of shlibs files (for libGL.so.1) and symbols files (for all
# other libraries).
-#shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
+shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
# Some slave alternatives are placed there.
package-contains-empty-directory usr/lib*/nvidia/tls/
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/conftest.h nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/conftest.h
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/conftest.h 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/conftest.h 2012-09-19 12:59:58.000000000 +0200
@@ -1,4 +1,4 @@
-/* synchronized with conftest.sh from 302.11, 295.53, 173.14.34, 96.43.20, 71.86.15 */
+/* synchronized with conftest.sh from 304.48, 295.75, 173.14.35, 96.43.23, 71.86.15 */
#ifndef LINUX_VERSION_CODE
#include <linux/version.h>
@@ -212,6 +212,18 @@
#define NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT 6
#endif
+/* Implement conftest.sh function acpi_os_wait_events_complete */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,7)
+ #define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ #define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT 0
+ #else
+ #define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT 1
+ #endif
+#else
+ #undef NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT
+#endif
+
/* Implement conftest.sh function ioremap_cache */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
#define NV_IOREMAP_CACHE_PRESENT
@@ -340,3 +352,17 @@
#else
#undef NV_ASM_SYSTEM_H_PRESENT
#endif
+
+/* Check for linux/kconfig.h */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
+ #define NV_LINUX_KCONFIG_H_PRESENT
+#else
+ #undef NV_LINUX_SCREEN_INFO_H_PRESENT
+#endif
+
+/* Check for linux/screen_info.h */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+ #define NV_LINUX_SCREEN_INFO_H_PRESENT
+#else
+ #undef NV_LINUX_SCREEN_INFO_H_PRESENT
+#endif
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/debian/control.template.in nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/control.template.in
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/debian/control.template.in 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/control.template.in 2012-09-19 12:59:58.000000000 +0200
@@ -12,6 +12,7 @@
Provides: nvidia-kernel-#VERSION#
Depends: nvidia-kernel-common (>= 20110213)
Recommends: linux-image-#KVERS#
+Built-Using: ${built:using:kernel}, ${built:using:nvidia}
Description: NVIDIA binary kernel module for Linux #KVERS#
This package provides the non-free NVIDIA binary kernel module built for
the Debian Linux kernel package. This kernel module is required by the
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/debian/patches/kernel-3.4.patch nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/patches/kernel-3.4.patch
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/debian/patches/kernel-3.4.patch 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/patches/kernel-3.4.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-Author: Andreas Beckmann <debian@abeckmann.de>
-Author: Antonio Ospite <ospite@studenti.unina.it>
-Description: Make the kernel module build against kernels >= 3.4
- In newer kernels asm/system.h is not available anymore, its content has
- been scattered into other header files, to avoid circular dependencies,
- see https://lkml.org/lkml/2012/3/7/389 and
- https://lkml.org/lkml/2012/3/28/381
- .
- All the needed pieces are already brought in by other header files in
- this case, so just avoid including asm/system.h when compiling against
- newer kernels.
- .
- This patch has been tested against 2.6.32, 3.2, 3.3 and 3.4.0-rc1.
-Bug-Debian: http://bugs.debian.org/667719
-
---- a/nv-linux.h
-+++ b/nv-linux.h
-@@ -113,7 +113,9 @@
- #include <linux/timer.h>
-
- #include <asm/div64.h> /* do_div() */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
- #include <asm/system.h> /* cli, sli, save_flags */
-+#endif
- #include <asm/io.h> /* ioremap, virt_to_phys */
- #include <asm/uaccess.h> /* access_ok */
- #include <asm/page.h> /* PAGE_OFFSET */
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/debian/patches/series nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/patches/series
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/debian/patches/series 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/patches/series 2012-09-11 14:53:33.000000000 +0200
@@ -1,8 +1,7 @@
-patch-3.0-rt-nvidia.patch
+#patch-3.0-rt-nvidia.patch
use-nv-kernel.o.ARCH.patch
conditionally-include-linux_version.h.patch
avoid-ld.gold.patch
fix-typos.patch
linux3.patch
-kernel-3.4.patch
drop24support.patch
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/debian/rules nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/rules
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/module/debian/rules 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/rules 2012-09-19 12:59:58.000000000 +0200
@@ -63,6 +63,8 @@
$(MAKE) LINUXDIR=$(KSRC)
touch $@
+get_built_using ?= $(filter-out (=),$(shell dpkg-query -f='$${source:Package} (=$${source:Version})' -W $1))
+
binary: binary-arch binary-indep
binary-indep:
binary-arch: build-stamp
@@ -79,7 +81,9 @@
dh_compress
dh_fixperms
dh_installdeb
- dh_gencontrol -- -v`cat debian/VERSION`
+ dh_gencontrol -- -v`cat debian/VERSION` \
+ -V'built:using:kernel=$(call get_built_using,linux-headers-$(KVERS))' \
+ -V'built:using:nvidia=$(call get_built_using,$(shell dpkg-parsechangelog | sed -nr '/^Source:/s/Source: //p')-source)'
dh_md5sums
dh_builddeb --destdir=$(KPKG_DEST_DIR)
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/POTFILES.in nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/po/POTFILES.in
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/po/POTFILES.in 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/po/POTFILES.in 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] xserver-xorg-video-nvidia.templates
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/rules nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/rules
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/rules 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/rules 2012-09-19 12:59:58.000000000 +0200
@@ -40,11 +40,8 @@
$(patsubst debian/nvidia-alternative%,debian/nvidia-alternative$(legacy)%,\
$(patsubst debian/xserver-xorg-video-nvidia%,debian/xserver-xorg-video-nvidia$(legacy)%,\
$(RENAME_CONTROL))))))
-IA32_OVERRIDES = nvidia-vdpau-driver libcuda1
-GEN_IA32_OVERRIDES := $(foreach p,$(IA32_OVERRIDES),$(if $(wildcard debian/$p.lintian-overrides*),$p))
TEMPLATES := $(wildcard debian/*.in debian/module/debian/*.in debian/detect/*.in)
AUTOGEN += $(patsubst %.in,%,$(TEMPLATES))
-AUTOGEN += $(foreach pkg,$(GEN_IA32_OVERRIDES), debian/$(pkg)-ia32.lintian-overrides)
AUTOGEN += debian/module/debian/changelog
AUTOGEN += $(patsubst %.in,%,$(RENAMED_CONTROL))
AUTOKEEP = debian/watch
@@ -143,7 +140,6 @@
rm -fr kernel-source-tree
rm -f nvidia.ids nv-kernel.ids nv-readme.ids pci.ids.nvidia*
rm -f LICENSE.txt LICENSE.tmp copyright.tmp
- debconf-updatepo
override_dh_clean:
dh_clean
@@ -231,9 +227,6 @@
override_dh_install:
dh_install --list-missing
-override_dh_installdocs:
- dh_installdocs -A
-
override_dh_installchangelogs:
dh_installchangelogs debian/tmp/NVIDIA_Changelog
@@ -244,17 +237,13 @@
dh_bugfiles -A
override_dh_makeshlibs:
- DPKG_GENSYMBOLS_CHECK_LEVEL=0 dh_makeshlibs -Xvdpau/libvdpau_nvidia.so -Xtls/libnvidia-tls.so -- -c0
+ dh_makeshlibs -Xvdpau/libvdpau_nvidia.so -Xtls/libnvidia-tls.so
# Redirect shlibs for libGL.so.1 to libgl1-mesa-glx | libgl1.
test ! -f debian/libgl1-nvidia$(legacy)-glx/DEBIAN/shlibs || \
sed -i -e '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' debian/libgl1-nvidia$(legacy)-glx/DEBIAN/shlibs
- test ! -f debian/libgl1-nvidia$(legacy)-glx-ia32/DEBIAN/shlibs || \
- sed -i -e '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' debian/libgl1-nvidia$(legacy)-glx-ia32/DEBIAN/shlibs
# Remove libGL.so from symbols files in order not to override our special shlibs files.
test ! -f debian/libgl1-nvidia$(legacy)-glx/DEBIAN/symbols || \
sed -i -e '/^libGL\.so/,/^lib/{/^libGL\.so\|^ /d}' debian/libgl1-nvidia$(legacy)-glx/DEBIAN/symbols
- test ! -f debian/libgl1-nvidia$(legacy)-glx-ia32/DEBIAN/symbols || \
- sed -i -e '/^libGL\.so/,/^lib/{/^libGL\.so\|^ /d}' debian/libgl1-nvidia$(legacy)-glx-ia32/DEBIAN/symbols
override_dh_shlibdeps:
LD_LIBRARY_PATH=/$(libdir)/$(nvidia_private):$(LD_LIBRARY_PATH) dh_shlibdeps
@@ -281,6 +270,11 @@
# in a way other than unzipping of compressed files.
override_dh_strip:
+ifneq (squeeze,$(BACKPORT))
+override_dh_builddeb:
+ dh_builddeb -- -Zxz
+endif
+
############################################################################
# Generating control files
@@ -294,9 +288,6 @@
-e 's{#PRIVATE#}{$(nvidia_private)}g;' \
< $< > $@
-%-ia32.lintian-overrides: %.lintian-overrides
- sed -r -e '/^\[amd64\]: /d; s/^\[i386\]: //; s%$(libdir)%usr/lib32%g' $< > $@
-
debian/module/debian/changelog: debian/changelog
sed '1s/^nvidia-graphics-drivers/nvidia-kernel/g' $< > $@
@@ -355,13 +346,16 @@
############################################################################
+PASV ?= --pasv
+
.PHONY: get-orig-source
get-orig-source:
rm -rf get-orig-source || true
mkdir get-orig-source
- uscan --no-symlink --download-current-version --pasv \
+ ln -v ../.cache/*-$(version).run get-orig-source/ || true
+ uscan --no-symlink --download-current-version $(PASV) \
--watchfile debian/watch --destdir get-orig-source
- test `ls get-orig-source/* | wc -l` = 2 # we need exactly 2 downloaded files
+ test $$(ls get-orig-source/* | wc -l) = 2 # we need exactly 2 downloaded files
@set -e -x ; \
cd get-orig-source ; \
newversion=$$(ls *-x86-*.run | sed -e 's/.*-\([0-9.]*\)\(-.*\)\?\.run/\1/') ; \
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/rules.defs nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/rules.defs
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/rules.defs 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/rules.defs 2012-09-11 14:53:33.000000000 +0200
@@ -1,8 +1,8 @@
# If needed, set to the major part of the upstream version number.
NVIDIA_LEGACY = 96
#WATCH_VERSION =
-XORG_ABI_LIST = 10 8 6.0
-XORG_BOUND = (<< 2:1.10.99)
+XORG_ABI_LIST = 12 11 10 8 6.0
+XORG_BOUND = (<< 2:1.12.99)
NVIDIA_DIRNAME_X86 = NVIDIA-Linux-x86-${NVIDIA_RELEASE}-pkg0
NVIDIA_DIRNAME_X86_64 = NVIDIA-Linux-x86_64-${NVIDIA_RELEASE}-pkg2
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/xserver-xorg-video-nvidia.config nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/xserver-xorg-video-nvidia.config
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/xserver-xorg-video-nvidia.config 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/xserver-xorg-video-nvidia.config 2012-09-19 12:59:58.000000000 +0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+
+if ! grep -q nvidia /etc/X11/xorg.conf /etc/X11/xorg.conf.d/*.conf 2>/dev/null; then
+ db_input high nvidia-support/needs-xorg-conf-to-enable || true
+ db_go
+fi
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/xserver-xorg-video-nvidia.install.in nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/xserver-xorg-video-nvidia.install.in
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/xserver-xorg-video-nvidia.install.in 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/xserver-xorg-video-nvidia.install.in 2011-07-07 09:42:11.000000000 +0200
@@ -1,3 +1,3 @@
-#usr/X11R6/lib/modules/drivers/nvidia_drv.so usr/lib/#PRIVATE#/
+usr/X11R6/lib/modules/drivers/nvidia_drv.so usr/lib/#PRIVATE#/
usr/X11R6/lib/modules/extensions/libglx.so.#VERSION# usr/lib/#PRIVATE#/
nvidia.ids usr/lib/#PRIVATE#/
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/xserver-xorg-video-nvidia.lintian-overrides.in nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/xserver-xorg-video-nvidia.lintian-overrides.in
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/xserver-xorg-video-nvidia.lintian-overrides.in 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/xserver-xorg-video-nvidia.lintian-overrides.in 2012-09-19 12:59:58.000000000 +0200
@@ -1,6 +1,6 @@
# The NVIDIA license does not allow any form of modification.
binary-has-unneeded-section
-#embedded-library usr/lib/#PRIVATE#/nvidia_drv.so: libpng
+embedded-library usr/lib/#PRIVATE#/nvidia_drv.so: libpng
[amd64]: shlib-with-executable-stack
[i386]: shlib-with-non-pic-code
[i386]: shlib-without-PT_GNU_STACK-section
@@ -8,5 +8,5 @@
hardening-no-relro
hardening-no-stackprotector
-no-debconf-config
-postinst-uses-db-input
+# The templates come from nvidia-support.
+no-debconf-templates
diff -Nru --exclude '*.po*' --exclude '*.run' nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/xserver-xorg-video-nvidia.templates nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/xserver-xorg-video-nvidia.templates
--- nvidia-graphics-drivers-legacy-96xx-96.43.20/debian/xserver-xorg-video-nvidia.templates 2012-08-31 19:12:40.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/xserver-xorg-video-nvidia.templates 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-Template: nvidia/unsupported-legacy-96xx
-Type: error
-_Description: Nvidia legacy 96xx driver is no longer supported.
- Nvidia Corporation has not updated the legacy 96xx driver to support
- current X servers, so this driver is no longer usable. For graphics
- adapters that are not supported by a newer Nvidia driver generation,
- the best option is to use the free Nouveau driver.
- .
- To switch to the Nouveau driver, please uninstall all Nvidia driver
- packages, remove all Nvidia-specific configuration from
- /etc/X11/xorg.conf (and xorg.conf.d/), and *purge* the
- nvidia-kernel-common package - just removing it is insufficient.
debdiff --exclude '*.run' --exclude 'changelog' --exclude "nv-*.ids" --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude "supported*.list" --diffstat ...
diffstat for nvidia-graphics-drivers-legacy-173xx-173.14.35 nvidia-graphics-drivers-legacy-96xx-96.43.23
control | 40 ++++-----
control.models | 41 ++++-----
libgl1-nvidia-glx-ia32.NEWS | 4
libgl1-nvidia-glx.lintian-overrides.in | 2
module/debian/patches/drop24support.patch | 43 ++++++++++
module/debian/patches/nvidia-blacklist-vga-pmu-registers-195.diff | 30 ------
module/debian/patches/series | 2
module/debian/patches/use-nv-kernel.o.ARCH.patch | 2
nvidia-glx-ia32.postinst | 15 ---
nvidia-glx.postinst | 12 +-
nvidia-glx.postrm | 4
nvidia-glx.preinst | 4
rules.defs | 2
watch | 4
14 files changed, 100 insertions(+), 105 deletions(-)
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/control nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/control
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/control 2012-09-13 12:31:05.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/control 2012-09-19 12:59:58.000000000 +0200
@@ -1,4 +1,4 @@
-Source: nvidia-graphics-drivers-legacy-173xx
+Source: nvidia-graphics-drivers-legacy-96xx
Section: non-free/libs
Priority: optional
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel@lists.alioth.debian.org>
@@ -6,8 +6,8 @@
Russ Allbery <rra@debian.org>,
Andreas Beckmann <debian@abeckmann.de>,
DM-Upload-Allowed: yes
-Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/
Build-Depends:
debhelper (>= 9),
bzip2,
@@ -18,7 +18,7 @@
Homepage: http://www.nvidia.com
XS-Autobuild: yes
-Package: nvidia-glx-legacy-173xx
+Package: nvidia-glx-legacy-96xx
Section: non-free/x11
Architecture: i386 amd64
Pre-Depends:
@@ -57,7 +57,7 @@
See /usr/share/doc/nvidia-glx${nvidia:Legacy}/README.txt.gz
for a complete list of supported GPUs and PCI IDs.
-Package: xserver-xorg-video-nvidia-legacy-173xx
+Package: xserver-xorg-video-nvidia-legacy-96xx
Section: non-free/x11
Architecture: i386 amd64
Pre-Depends:
@@ -86,7 +86,7 @@
nvidia-glx-legacy-173xx (<< 173.14.30-2),
fglrx-driver (<< 1:11-6-~),
Replaces:
- nvidia-glx${nvidia:Legacy} (<< 173.14.30-2),
+ nvidia-glx${nvidia:Legacy} (<< 96.43.19-2),
Description: NVIDIA binary Xorg driver${nvidia:LegacyDesc}
.
These binary drivers provide optimized hardware acceleration of
@@ -103,7 +103,7 @@
See /usr/share/doc/nvidia-glx${nvidia:Legacy}/README.txt.gz
for a complete list of supported GPUs and PCI IDs.
-Package: nvidia-glx-legacy-173xx-ia32
+Package: nvidia-glx-legacy-96xx-ia32
Section: non-free/oldlibs
Priority: extra
Architecture: amd64
@@ -114,7 +114,7 @@
This is a dummy package to aid switching to
libgl1-nvidia${nvidia:Legacy}-glx-ia32.
-Package: libgl1-nvidia-legacy-173xx-glx
+Package: libgl1-nvidia-legacy-96xx-glx
Architecture: i386 amd64
Multi-Arch: same
Pre-Depends:
@@ -146,13 +146,13 @@
nvidia-glx-legacy-173xx (<< 173.14.30-2),
libgl1-nvidia-glx (<< 275.09.07-3),
libgl1-nvidia-legacy-71xx-glx (<< 71.86.14-3),
- libgl1-nvidia-legacy-96xx-glx (<< 96.43.19-2),
-# libgl1-nvidia-legacy-173xx-glx (<< 173.14.30-2),
+# libgl1-nvidia-legacy-96xx-glx (<< 96.43.19-2),
+ libgl1-nvidia-legacy-173xx-glx (<< 173.14.30-2),
fglrx-glx (<< 1:11-6-~),
ia32-libs (<< 20120701) [i386],
nvidia-settings (>= 302),
Replaces:
- nvidia-glx${nvidia:Legacy} (<< 173.14.27),
+ nvidia-glx${nvidia:Legacy} (<< 96.43.18),
libgl1-nvidia${nvidia:Legacy}-dev,
nvidia-glx${nvidia:Legacy}-dev,
Description: NVIDIA binary OpenGL libraries${nvidia:LegacyDesc}
@@ -164,7 +164,7 @@
or /usr/share/doc/libgl1-nvidia${nvidia:Legacy}-glx/README.txt.gz
for a complete list of supported GPUs and PCI IDs.
-Package: libgl1-nvidia-legacy-173xx-glx-ia32
+Package: libgl1-nvidia-legacy-96xx-glx-ia32
Section: non-free/oldlibs
Priority: extra
Architecture: amd64
@@ -182,12 +182,12 @@
nvidia-glx-ia32,
nvidia-glx-legacy-ia32,
nvidia-glx-legacy-71xx-ia32,
- nvidia-glx-legacy-96xx-ia32,
- nvidia-glx-legacy-173xx-ia32 (<< 173.14.27),
+ nvidia-glx-legacy-96xx-ia32 (<< 96.43.18),
+ nvidia-glx-legacy-173xx-ia32,
Breaks:
libgl1-nvidia${nvidia:Legacy}-glx (<< ${nvidia:Version}),
Replaces:
- nvidia-glx${nvidia:Legacy}-ia32 (<< 173.14.27),
+ nvidia-glx${nvidia:Legacy}-ia32 (<< 96.43.18),
Description: please switch to multiarch libgl1-nvidia${nvidia:Legacy}-glx:i386
.
This is an empty transitional package to aid switching to multiarch.
@@ -196,7 +196,7 @@
* dpkg --add-architecture i386 ; apt-get update
* apt-get install libgl1-nvidia${nvidia:Legacy}-glx:i386
-Package: nvidia-alternative-legacy-173xx
+Package: nvidia-alternative-legacy-96xx
Architecture: i386 amd64
Multi-Arch: foreign
Depends:
@@ -205,8 +205,8 @@
libglx-nvidia-alternatives (>= 275.09.07-4),
${misc:Depends}
Breaks:
- nvidia-glx${nvidia:Legacy} (<< 173.14.30-2),
- libgl1-nvidia${nvidia:Legacy}-glx (<< 173.14.30-2),
+ nvidia-glx${nvidia:Legacy} (<< 96.43.19-2),
+ libgl1-nvidia${nvidia:Legacy}-glx (<< 96.43.19-2),
Description: allows the selection of NVIDIA as GLX provider
.
In setups with several NVIDIA driver versions installed (e.g. current and
@@ -219,7 +219,7 @@
In order to install the NVIDIA driver and libraries, install the
nvidia-glx${nvidia:Legacy} package instead.
-Package: nvidia-kernel-legacy-173xx-dkms
+Package: nvidia-kernel-legacy-96xx-dkms
Section: non-free/kernel
Architecture: i386 amd64
Multi-Arch: foreign
@@ -256,7 +256,7 @@
See /usr/share/doc/nvidia-kernel${nvidia:Legacy}-dkms/README.txt.gz
for a complete list of supported GPUs and PCI IDs.
-Package: nvidia-kernel-legacy-173xx-source
+Package: nvidia-kernel-legacy-96xx-source
Section: non-free/kernel
Architecture: i386 amd64
Depends:
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/control.models nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/control.models
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/control.models 2010-07-11 05:16:50.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/control.models 2012-09-19 12:59:58.000000000 +0200
@@ -1,27 +1,24 @@
This legacy version is the last release that supports the following GPUs:
-GeForce FX 5100 [NV34], GeForce FX 5200 [NV34], GeForce FX 5200 Ultra [NV34],
-GeForce FX 5200LE [NV34], GeForce FX 5500 [NV34], GeForce FX 5600 [NV31],
-GeForce FX 5600 Ultra [NV31], GeForce FX 5600XT [NV31],
-GeForce FX 5700 [NV36.2], GeForce FX 5700 Ultra [NV36.1],
-GeForce FX 5700LE [NV36], GeForce FX 5700VE [NV36.4], GeForce FX 5800 [NV30],
-GeForce FX 5800 Ultra [NV30], GeForce FX 5900 [NV35],
-GeForce FX 5900 Ultra [NV35], GeForce FX 5900XT [NV35],
-GeForce FX 5900ZT [NV35], GeForce FX 5950 Ultra [NV38],
-GeForce FX Go5100 [NV34], GeForce FX Go5200 [NV34M],
-GeForce FX Go5200 32M/64M [NV34M], GeForce FX Go5200 64M [NV34M],
-GeForce FX Go5250 [NV34M], GeForce FX Go5300 [NV34GLM],
-GeForce FX Go5600 [NV31M], GeForce FX Go5650 [NV31M],
-GeForce FX Go5700 [NV36], GeForce PCX 4300 [NV18], GeForce PCX 5300 [NV37GL],
-GeForce PCX 5750 [NV36], GeForce PCX 5900 [NV35],
-GeForce 6800 Ultra [NV40] (only PCI ID 10DE:00F0), Quadro FX 330 [NV37GL],
-Quadro FX 500/600 PCI [NV34GL], Quadro FX 700 [NV35GL],
-Quadro FX 1000 [NV30GL], Quadro FX 1100 [NV36GL], Quadro FX 1300 [NV38GL],
-Quadro FX 2000 [NV30GL], Quadro FX 3000 [NV35GL], Quadro FX Go700 [NV31],
-Quadro FX Go1000 [NV36], Quadro NVS 280 PCI [NV34GL],
-Quadro NVS 280 PCI-E [NV37GL], NV31, NV31M, NV31M Pro, NV31GLM, NV31GLM Pro,
-NV34GL, NV36.5, NV36M Pro, NV36MAP, NV36GL.
+GeForce2 Go [NV11], GeForce2 MX Integrated Graphics [NVCrush11],
+GeForce2 MX/MX 400 [NV11], GeForce2 MX200 [NV11DDR], GeForce3 [NV20],
+GeForce3 Ti 200 [NV20], GeForce3 Ti 500 [NV20], GeForce4 410 Go 16M [NV17],
+GeForce4 420 Go [NV17], GeForce4 420 Go 32M [NV17], GeForce4 440 Go [NV17],
+GeForce4 440 Go 64M [NV17], GeForce4 448 Go [NV18M], GeForce4 460 Go [NV17],
+GeForce4 488 Go [NV18M], GeForce4 MX 420 [NV17],
+GeForce4 MX 420 AGP 8x [NV18], GeForce4 MX 440 [NV17],
+GeForce4 MX 440 AGP 8x [NV18], GeForce4 MX 440SE [NV17],
+GeForce4 MX 440SE AGP 8x [NV18], GeForce4 MX 460 [NV17],
+GeForce4 MX 4000 [NV18], GeForce4 MX - nForce GPU [NV18], GeForce4 Ti [NV25],
+GeForce4 Ti 4200 [NV25], GeForce4 Ti 4200 AGP 8x [NV28],
+GeForce4 Ti 4200 Go AGP 8x [NV28], GeForce4 Ti 4400 [NV25],
+GeForce4 Ti 4600 [NV25], GeForce4 Ti 4800 [NV28], GeForce4 Ti 4800 SE [NV28],
+Quadro DCC [NV20DCC], Quadro NVS [NV17GL], Quadro NVS 50 PCI [NV18GL],
+Quadro NVS 280 SD AGP 8x [NV18GL], Quadro2 MXR/EX/Go [NV11GL],
+Quadro4 380 XGL [NV18GL], Quadro4 500 GoGL [NV17GL],
+Quadro4 550 XGL [NV17GL], Quadro4 580 XGL [NV18GL], Quadro4 700 XGL [NV25GL],
+Quadro4 750 XGL [NV25GL], Quadro4 780 XGL [NV28GL], Quadro4 900 XGL [NV25GL],
+Quadro4 980 XGL [NV28GL], Quadro4 Go700 [NV28GLM], NV40GL.
There are several "more modern" GPUs supported by this package, too, but the
updated drivers in the newer legacy packages or the current nvidia-glx
package usually provide more features and better support.
-Look at the other legacy packages for older cards.
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/libgl1-nvidia-glx-ia32.NEWS nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx-ia32.NEWS
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/libgl1-nvidia-glx-ia32.NEWS 2012-09-13 12:31:05.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx-ia32.NEWS 2012-09-19 12:59:58.000000000 +0200
@@ -1,4 +1,4 @@
-nvidia-graphics-drivers-legacy-173xx (173.14.35-3) unstable; urgency=low
+nvidia-graphics-drivers-legacy-96xx (96.43.23-2) unstable; urgency=low
The *nvidia*-ia32 packages have been converted into empty dummy packages
to aid switching to multiarch packages and removing the obsolete ia32-libs
@@ -9,6 +9,6 @@
dpkg --add-architecture i386
apt-get update
- apt-get install libgl1-nvidia-legacy-173xx-glx:i386
+ apt-get install libgl1-nvidia-legacy-96xx-glx:i386
-- Andreas Beckmann <debian@abeckmann.de> Fri, 17 Aug 2012 10:23:30 +0200
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/libgl1-nvidia-glx.lintian-overrides.in nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx.lintian-overrides.in
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/libgl1-nvidia-glx.lintian-overrides.in 2012-05-22 10:51:54.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/libgl1-nvidia-glx.lintian-overrides.in 2012-05-23 14:34:25.000000000 +0200
@@ -3,7 +3,7 @@
shared-lib-without-dependency-information
[amd64]: shlib-with-executable-stack
[i386]: shlib-with-non-pic-code
-[i386]: shlib-without-PT_GNU_STACK-section
+shlib-without-PT_GNU_STACK-section
spelling-error-in-binary
shlib-calls-exit
hardening-no-fortify-functions
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/drop24support.patch nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/patches/drop24support.patch
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/drop24support.patch 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/patches/drop24support.patch 2012-05-23 14:34:25.000000000 +0200
@@ -0,0 +1,43 @@
+Index: b/Makefile.kbuild
+===================================================================
+--- a/Makefile.kbuild 2012-05-23 14:18:51.626083727 +0200
++++ b/Makefile.kbuild 2012-05-23 14:21:11.225207973 +0200
+@@ -139,11 +139,11 @@
+ # module extension. Handle these gracefully.
+ #
+
+-ifeq ($(PATCHLEVEL), 4)
++ifeq (xxx$(PATCHLEVEL), 4)
+ MODULE_OBJECT := $(MODULE_NAME).o
+ else
+ MODULE_OBJECT := $(MODULE_NAME).ko
+ endif
+
+ #
+ # NVIDIA specific CFLAGS and #define's. The remap_page_range check has become
+@@ -164,7 +164,7 @@
+ EXTRA_CFLAGS += -DDEBUG -g
+ endif
+
+-ifneq ($(PATCHLEVEL), 4)
++ifneq (xxx$(PATCHLEVEL), 4)
+ COMPILE_TESTS = \
+ remap_page_range \
+ remap_pfn_range \
+@@ -228,7 +228,7 @@
+ # More quirks for Linux 2.4 KBUILD, which doesn't link automatically.
+ #
+
+-ifeq ($(PATCHLEVEL), 4)
++ifeq (xxx$(PATCHLEVEL), 4)
+ $(obj)/$(MODULE_NAME).o: $($(MODULE_NAME)-objs)
+ $(LD) $(EXTRA_LDFLAGS) -r -o $@ $($(MODULE_NAME)-objs)
+ endif
+@@ -328,6 +328,6 @@
+ # includes dependencies automatically.
+ #
+
+-ifeq ($(PATCHLEVEL), 4)
++ifeq (xxx$(PATCHLEVEL), 4)
+ include $(KERNEL_SOURCES)/Rules.make
+ endif
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/nvidia-blacklist-vga-pmu-registers-195.diff nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/patches/nvidia-blacklist-vga-pmu-registers-195.diff
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/nvidia-blacklist-vga-pmu-registers-195.diff 2012-09-13 12:31:05.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/patches/nvidia-blacklist-vga-pmu-registers-195.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-Subject: CVE-2012-4225
- http://nvidia.custhelp.com/app/answers/detail/a_id/3140
-Origin: upstream, ftp://download.nvidia.com/XFree86/patches/security/2012-08-01/nvidia-blacklist-vga-pmu-registers-195.diff
-Bug-Debian: http://bugs.debian.org/684781
-
-diff -ur usr/src/nv/nv.h usr/src/nv/nv.h
---- usr/src/nv/nv.h 2012-08-02 18:19:37.000000000 -0700
-+++ usr/src/nv/nv.h 2012-08-02 18:19:37.000000000 -0700
-@@ -436,7 +436,20 @@
-
- #define IS_BLACKLISTED_REG_OFFSET(nv, offset, length) \
- ((IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1000, 0x1000, offset, length)) ||\
-- (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length)))
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x84000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x85000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x86000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x87000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x89000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0xa0000, 0x20000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x104000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x105000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x10a000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1c2000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1c3000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x618000, 0x2000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x627000, 0x1000, offset, length)) ||\
-+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length)))
-
- /* duplicated from nvos.h for external builds */
- #ifndef NVOS_AGP_CONFIG_DISABLE_AGP
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/series nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/patches/series
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/series 2012-09-13 12:31:05.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/patches/series 2012-09-11 14:53:33.000000000 +0200
@@ -1,7 +1,7 @@
-nvidia-blacklist-vga-pmu-registers-195.diff -p3
#patch-3.0-rt-nvidia.patch
use-nv-kernel.o.ARCH.patch
conditionally-include-linux_version.h.patch
avoid-ld.gold.patch
fix-typos.patch
linux3.patch
+drop24support.patch
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/use-nv-kernel.o.ARCH.patch nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/patches/use-nv-kernel.o.ARCH.patch
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/use-nv-kernel.o.ARCH.patch 2011-07-08 09:05:15.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/module/debian/patches/use-nv-kernel.o.ARCH.patch 2010-07-01 21:28:45.000000000 +0200
@@ -15,6 +15,6 @@
-CORE_OBJS := nv-kernel.o
+CORE_OBJS := nv-kernel.o$(NVARCH)
- RESMAN_GLUE_OBJS := nv.o nv-vm.o os-agp.o os-interface.o os-registry.o nv-i2c.o nvacpi.o
+ RESMAN_GLUE_OBJS := nv.o nv-vm.o os-agp.o os-interface.o os-registry.o nv-i2c.o
$(MODULE_NAME)-objs := $(CORE_OBJS) $(RESMAN_GLUE_OBJS)
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/nvidia-glx-ia32.postinst nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/nvidia-glx-ia32.postinst
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/nvidia-glx-ia32.postinst 2011-07-05 12:33:06.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/nvidia-glx-ia32.postinst 2011-07-05 13:40:46.000000000 +0200
@@ -13,21 +13,6 @@
fi
# <target: squeeze>
- # initially the diversions were erroneously registered to nvidia-glx-ia32
- if dpkg --compare-versions "$2" lt-nl 173.14.18-1 ; then
- dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
- /emul/ia32-linux/usr/lib/nvidia/libGL.so.ia32-libs \
- /emul/ia32-linux/usr/lib/libGL.so > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
- /emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
- /emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
- /emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
- /emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
- fi
- # </target: squeeze>
-
- # <target: squeeze>
# remove diversion created before the
# /emul/ia32-linux/usr/lib => /usr/lib32 transition
dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/nvidia-glx.postinst nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/nvidia-glx.postinst
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/nvidia-glx.postinst 2011-07-06 15:33:50.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/nvidia-glx.postinst 2011-07-07 08:35:32.000000000 +0200
@@ -15,8 +15,8 @@
fi
# <target: squeeze>
-dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 173.14.27~ -- "$@"
-dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 173.14.27~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 96.43.18~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 96.43.18~ -- "$@"
# </target: squeeze>
# <target: squeeze>
@@ -47,13 +47,13 @@
then
# <target: squeeze>
- if dpkg --compare-versions "$2" lt-nl 173.14.27 ; then
+ if dpkg --compare-versions "$2" lt-nl 96.43.18 ; then
update-rc.d $DPKG_MAINTSCRIPT_PACKAGE remove || true
fi
# </target: squeeze>
# <target: squeeze>
- if dpkg --compare-versions "$2" lt-nl 173.14.27 ; then
+ if dpkg --compare-versions "$2" lt-nl 96.43.18 ; then
if [ -f /etc/default/$DPKG_MAINTSCRIPT_PACKAGE.dpkg-new ]; then
rm -f /etc/default/$DPKG_MAINTSCRIPT_PACKAGE.dpkg-new
fi
@@ -61,7 +61,7 @@
# </target: squeeze>
# <target: squeeze>
- if true || dpkg --compare-versions "$2" lt-nl 173.14.25-2 ; then
+ if true || dpkg --compare-versions "$2" lt-nl 96.43.18 ; then
# remove obsolete diversions
undivert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so
undivert /usr/lib/nvidia/libGLcore.a.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.a
@@ -72,7 +72,7 @@
# <target: squeeze>
# remove libGL.so created before the trigger was moved to libgl1-nvidia*-glx
# will be recreated by the trigger
- if dpkg --compare-versions "$2" lt-nl 173.14.27 ; then
+ if dpkg --compare-versions "$2" lt-nl 96.43.18 ; then
rm -f /usr/lib/libGL.so
fi
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/nvidia-glx.postrm nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/nvidia-glx.postrm
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/nvidia-glx.postrm 2010-09-01 11:52:47.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/nvidia-glx.postrm 2010-09-03 03:18:50.000000000 +0200
@@ -3,8 +3,8 @@
# <target: squeeze>
-dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 173.14.27~ -- "$@"
-dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 173.14.27~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 96.43.18~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 96.43.18~ -- "$@"
# </target: squeeze>
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/nvidia-glx.preinst nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/nvidia-glx.preinst
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/nvidia-glx.preinst 2010-09-01 11:52:47.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/nvidia-glx.preinst 2010-09-03 03:18:50.000000000 +0200
@@ -3,8 +3,8 @@
# <target: squeeze>
-dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 173.14.27~ -- "$@"
-dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 173.14.27~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 96.43.18~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 96.43.18~ -- "$@"
# </target: squeeze>
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/rules.defs nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/rules.defs
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/rules.defs 2012-05-22 10:51:54.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/rules.defs 2012-09-11 14:53:33.000000000 +0200
@@ -1,5 +1,5 @@
# If needed, set to the major part of the upstream version number.
-NVIDIA_LEGACY = 173
+NVIDIA_LEGACY = 96
#WATCH_VERSION =
XORG_ABI_LIST = 12 11 10 8 6.0
XORG_BOUND = (<< 2:1.12.99)
diff -Nru --exclude '*.run' --exclude changelog --exclude 'nv-*.ids' --exclude end-of-life.ids --exclude libgl1-nvidia-glx.symbols.common.in --exclude 'supported*.list' nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/watch nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/watch
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/watch 2012-09-13 12:31:42.000000000 +0200
+++ nvidia-graphics-drivers-legacy-96xx-96.43.23/debian/watch 2012-09-19 13:01:09.000000000 +0200
@@ -1,5 +1,5 @@
# ftp://download.nvidia.com/XFree86/Linux-x86_64/190.36/NVIDIA-Linux-x86_64-190.36-pkg2.run
# ftp://download.nvidia.com/XFree86/Linux-x86_64/256.29/NVIDIA-Linux-x86_64-256.29.run
version=3
-ftp://download.nvidia.com/XFree86/Linux-x86/(173(?:\.[\d\.\-]+)?)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
-ftp://download.nvidia.com/XFree86/Linux-x86_64/(173(?:\.[\d\.\-]+)?)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run
+ftp://download.nvidia.com/XFree86/Linux-x86/(96(?:\.[\d\.\-]+)?)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
+ftp://download.nvidia.com/XFree86/Linux-x86_64/(96(?:\.[\d\.\-]+)?)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run
Reply to: