[pkg-nvidia-devel] r1470 - in /packages/nvidia-graphics-drivers-legacy-71xx/trunk: ./ debian/ debian/module/debian/
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Fri Sep 3 11:37:03 UTC 2010
Author: anbe-guest
Date: Fri Sep 3 11:37:01 2010
New Revision: 1470
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1470
Log:
synchronize packaging with nvidia-graphics-drivers-legacy-96xx 96.43.18-1 (r1469)
Added:
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/README.alternatives
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/README.alternatives
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/compat
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/compat
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/extract-pci-ids.sh
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/extract-pci-ids.sh
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-dev.links
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-dev.links
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-dev.postinst
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-dev.postinst
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-dev.prerm
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-dev.prerm
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx-ia32.docs
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx-ia32.docs
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx-ia32.install.in
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx-ia32.install.in
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx-ia32.links.in
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx-ia32.links.in
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx-ia32.postinst
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx-ia32.postinst
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx-ia32.prerm
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx-ia32.prerm
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.docs
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.docs
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.postinst
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.postinst
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.prerm
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.prerm
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/module/debian/compat
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/module/debian/compat
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/module/debian/control.template.in
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/module/debian/control.template.in
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/module/debian/genchanges
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/module/debian/genchanges
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.dirs
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.dirs
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.install.in
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.install.in
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.links.in
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.links.in
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.prerm
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.prerm
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/rules
- copied unchanged from r1469, packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules
Removed:
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx-ia32.dirs
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx-ia32.postrm
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx-ia32.preinst
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.dirs
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.postrm
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.preinst
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.triggers
Modified:
packages/nvidia-graphics-drivers-legacy-71xx/trunk/ (props changed)
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.install.in
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.links.in
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.docs
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.lintian-overrides.in
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postrm
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst
Propchange: packages/nvidia-graphics-drivers-legacy-71xx/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Sep 3 11:37:01 2010
@@ -1,0 +1,1 @@
+*.run
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog?rev=1470&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog Fri Sep 3 11:37:01 2010
@@ -3,7 +3,7 @@
[ Andreas Beckmann ]
* new upstream release
* add missing Build-Depends: libxext6, fixes FTBFS
- * synchronize packaging with nvidia-graphics-drivers-legacy-96xx 96.43.17-1
+ * synchronize packaging with nvidia-graphics-drivers-legacy-96xx 96.43.18-1
- new uploaders
- source format 3.0 (quilt)
- remove old cruft
@@ -30,13 +30,18 @@
- rename nvidia-glx-legacy-71xx-dev to libgl1-nvidia-legacy-71xx-dev
- add Provides/Conflicts for the new virtual packages nvidia-glx{,-ia32},
libgl1-nvidia-glx{,-ia32}, libgl1-nvidia-dev
+ - use alternatives for libGL.so.1, libGL.so, libglx.so and let the
+ lib{gl1,glx}-nvidia-alternatives{,-ia32} packages (not built from this
+ source package) handle the diversions
- add Conflicts: fglrx-driver, fglrx-glx, fglrx-glx-ia32
- - update to Standards-Version: 3.9.0
- - move diversions to /usr/lib{,32}/nvidia/diversions
+ - add Conflicts: with badly sorting obsolete packages
+ linux-{image,headers}-2.6.32-trunk-*
+ - update to Standards-Version: 3.9.1
+ - update to debhelper compat level 8
- drop LEGACY part from virtual package name nvidia-kernel-NVIDIAVERSION
- lots of small fixes and cleanup
- - extract nvidia.ids from nv-kernel.o
- * update nvidia.ids
+ - extract nv-kernel.ids from nv-kernel.o
+ * update nv-kernel.ids
* adjust version numbers in maintainer scripts
* only list the GPUs supported in this legacy series for the last time in
the long description, do not list models in the libgl1-nvidia* packages
@@ -68,7 +73,7 @@
nvidia-graphics-drivers-legacy-71xx (71.86.04-2) unstable; urgency=low
- * remove nvidia-glx from depends (closes: #474060)
+ * remove nvidia-glx from depends (closes: #474060)
-- Randall Donald <rdonald at debian.org> Sat, 05 Apr 2008 11:49:15 -0700
@@ -151,12 +156,12 @@
* put correct package name in removal diversions (closes: #372252)
* use dh_installmodules in kernel module
* apply cleanups from Andrew Vaughan <ajv-lists at netspace.net.au>
-
+
-- Randall Donald <rdonald at debian.org> Thu, 6 Jul 2006 18:10:50 -0700
nvidia-graphics-drivers-legacy (1.0.7174-4) unstable; urgency=low
- * add correct libglx.so diversion
+ * add correct libglx.so diversion
-- Randall Donald <rdonald at debian.org> Mon, 5 Jun 2006 07:31:34 -0700
@@ -164,9 +169,9 @@
* Add Replaces: nvidia-kernel-#KVERS# (<< 1.0.7664-0) to
the kernel modules. (closes: #354756)
- * THIS RELEASE IS STILL NOT 2.6.16 COMPATIBLE
+ * THIS RELEASE IS STILL NOT 2.6.16 COMPATIBLE
(Sorry I thought I should get out an xorg7 compatible version asap)
- * Change to Xorg7 file layout.
+ * Change to Xorg7 file layout.
* Provide xserver-xorg-video (closes:#364935)
* depend on x11-common. (closes: #362235)
* current strip is failling on in nvidia libs, so temporarily take out
@@ -176,7 +181,7 @@
nvidia-graphics-drivers-legacy (1.0.7174-2) unstable; urgency=low
- * Correct diversions.
+ * Correct diversions.
-- Randall Donald <rdonald at debian.org> Fri, 13 Jan 2006 20:20:30 -0800
@@ -218,7 +223,7 @@
* update NEWS files again.
* add Xorg 6.8 to the descriptions to cut down on confusion.
* add reference to linux- kernel packages in README.Debian
- * nvidia-xconfig will be in a separate package.
+ * nvidia-xconfig will be in a separate package.
-- Randall Donald <rdonald at debian.org> Sat, 10 Dec 2005 18:33:37 -0800
@@ -291,8 +296,8 @@
nvidia-graphics-drivers (1.0.7664-2) experimental; urgency=low
- * downgrade the libc6 change back to the version in unstable.
- (closes: #315313)
+ * downgrade the libc6 change back to the version in unstable.
+ (closes: #315313)
-- Randall Donald <rdonald at debian.org> Tue, 21 Jun 2005 14:07:42 -0700
@@ -301,7 +306,7 @@
* The "Commander Cool Drew Hess" release.
* New upstream. (Thanks to Harald Dunkel for initial work)
* uploaded to experimental due to needing GLIBC_2.3.3
- and legacy support for some GPU's has been removed.
+ and legacy support for some GPU's has been removed.
* Add news item about legacy support.
* LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2Pro,
@@ -320,13 +325,13 @@
nvidia-graphics-drivers (1.0.7174-3) unstable; urgency=low
- * reinclude nvidia docs
+ * reinclude nvidia docs
-- Randall Donald <rdonald at debian.org> Thu, 7 Apr 2005 02:39:50 -0700
nvidia-graphics-drivers (1.0.7174-2) unstable; urgency=low
- * use -pkg2 (renamed to pkg0) for lib32 files in nvidia-glx-ia32 package
+ * use -pkg2 (renamed to pkg0) for lib32 files in nvidia-glx-ia32 package
(closes: #257375)
-- Randall Donald <rdonald at debian.org> Tue, 5 Apr 2005 15:10:03 -0700
@@ -334,7 +339,7 @@
nvidia-graphics-drivers (1.0.7174-1) unstable; urgency=low
* New upstream.
- * add nvidia-glx-ia32 package for amd64 (closes: #257375)
+ * add nvidia-glx-ia32 package for amd64 (closes: #257375)
-- Randall Donald <rdonald at debian.org> Fri, 1 Apr 2005 14:54:17 -0800
@@ -351,20 +356,20 @@
minion.de. Thanks to Drew Hess <dhess at bothan.net>
(closes: #280224, #281640, #287226)
* updated minion patches from 16 Feb 2005
- * urgency high to get back in to sarge asap.
+ * urgency high to get back in to sarge asap.
-- Randall Donald <rdonald at debian.org> Fri, 18 Feb 2005 15:31:00 -0800
nvidia-graphics-drivers (1.0.6629+1-1) unstable; urgency=low
- * change version to allow for new .orig
+ * change version to allow for new .orig
-- Randall Donald <rdonald at debian.org> Fri, 12 Nov 2004 11:06:00 -0800
nvidia-graphics-drivers (1.0.6629-2) unstable; urgency=low
* Add amd64 support based on work from
- Markus Benning <me at w3r3wolf.de> and
+ Markus Benning <me at w3r3wolf.de> and
Harald Dunkel <harald.dunkel at t-online.de>
Thanks guys.
@@ -379,7 +384,7 @@
nvidia-graphics-drivers (1.0.6111-2) unstable; urgency=low
- * Provide patches for kernels 2.6.9 and 2.6.10
+ * Provide patches for kernels 2.6.9 and 2.6.10
-- Randall Donald <rdonald at debian.org> Mon, 25 Oct 2004 16:40:05 -0700
@@ -401,7 +406,7 @@
nvidia-graphics-drivers (1.0.6106-3) unstable; urgency=low
* Remove libglx.so.version symlink cleaning now that it is an actual file
- again.
+ again.
-- Randall Donald <rdonald at debian.org> Wed, 30 Jun 2004 22:00:09 -0700
@@ -416,25 +421,25 @@
nvidia-graphics-drivers (1.0.6106-1) unstable; urgency=low
* New upstream.
- fixed GL library symbols (closes: #242525)
+ - fixed GL library symbols (closes: #242525)
* new nvidia-settings package.
* remolded TLS handling for new libnvidia-tls.so
- * sysfs support now builtin, both dpatches disabled.
+ * sysfs support now builtin, both dpatches disabled.
-- Randall Donald <rdonald at debian.org> Wed, 30 Jun 2004 11:35:08 -0700
nvidia-graphics-drivers (1.0.5336-12) unstable; urgency=low
* Include newer sysfs patch by Martin Schlemmer <azarah at gentoo.org> which
- should now create udev nodes.
- (closes: #248451)
+ should now create udev nodes.
+ (closes: #248451)
-- Randall Donald <rdonald at debian.org> Tue, 29 Jun 2004 23:46:22 -0700
nvidia-graphics-drivers (1.0.5336-11) unstable; urgency=low
* Correct nvidia-glx.shlibs. (closes: #249194)
- * New init script from Arthur de Jong <adejong at debian.org>.
+ * New init script from Arthur de Jong <adejong at debian.org>.
(closes: #243308, #252569)
-- Randall Donald <rdonald at debian.org> Tue, 8 Jun 2004 19:04:42 -0700
@@ -449,13 +454,13 @@
nvidia-graphics-drivers (1.0.5336-9) unstable; urgency=low
* use corrected 02_pcialias patch from Juergen Kreileder <jk at blackdown.de>
-
+
-- Randall Donald <rdonald at debian.org> Fri, 30 Apr 2004 19:38:57 -0700
nvidia-graphics-drivers (1.0.5336-8) unstable; urgency=low
* Allow for presence of 01_sysfs fuzz in 02_pcialias. (closes: #246773)
- * Document in n-k-s.README.Debian about IGNORE_PCI_CLASS_DISPLAY
+ * Document in n-k-s.README.Debian about IGNORE_PCI_CLASS_DISPLAY
(closes: #246775)
-- Randall Donald <rdonald at debian.org> Fri, 30 Apr 2004 18:52:47 -0700
@@ -480,7 +485,7 @@
* Provide patch for sysfs. (closes: #236714, #234150)
* depend on dpatch for above patch.
* fix typo in clean target for SYSSRC. (closes: #237793)
- * modify debian.binary/rules for patching and Makefile existance.
+ * modify debian.binary/rules for patching and Makefile existance.
-- Randall Donald <rdonald at debian.org> Fri, 19 Mar 2004 14:39:56 -0800
@@ -490,20 +495,20 @@
* Make GL depends more X 4.3 friendly. (closes: #188189)
* pass KPKG_EXTRAV_ARG in for proper 2.6 EXTRAVERSIONing
* version kernel-package at >=8.082.
- * add root_cmd. (closes: #162323)
+ * add root_cmd. (closes: #162323)
-- Randall Donald <rdonald at debian.org> Sat, 21 Feb 2004 15:04:42 -0800
nvidia-graphics-drivers (1.0.5336-4) unstable; urgency=low
- * Add glext.h to nvidia-glx-dev. (closes: #231169)
+ * Add glext.h to nvidia-glx-dev. (closes: #231169)
* Add Makefile to clean target in nvidia-kernel-source rules file.
-- Randall Donald <rdonald at debian.org> Wed, 4 Feb 2004 16:03:42 -0800
nvidia-graphics-drivers (1.0.5336-3) unstable; urgency=low
- * Depend on libc6-dev for KBUILD building. (closes: #230307)
+ * Depend on libc6-dev for KBUILD building. (closes: #230307)
-- Randall Donald <rdonald at debian.org> Sat, 31 Jan 2004 14:26:02 -0800
@@ -511,7 +516,7 @@
* Bypass NVIDIA's select_makefile (closes: #230307)
* Remove patch from nvidia-kernel-source Depends and add sed.
- * Remove dangling libglx.so.VERSION symlink.
+ * Remove dangling libglx.so.VERSION symlink.
-- Randall Donald <rdonald at debian.org> Fri, 30 Jan 2004 14:54:32 -0800
@@ -523,15 +528,15 @@
* remove 2.6 patch as it is now provided upstream.
* create a makefile selector and change the patchlevel detection to be based
on KERNEL_VERSION_CODE.
- * switch back to Makefile.kbuild for 2.6.x.
- * remove no longer needed apm patch. (closes: #228487)
+ * switch back to Makefile.kbuild for 2.6.x.
+ * remove no longer needed apm patch. (closes: #228487)
* reflect 2.6 changes in nvidia-kernel-source.README.Debian.
-- Randall Donald <rdonald at debian.org> Tue, 27 Jan 2004 00:01:32 -0800
nvidia-graphics-drivers (1.0.5328-4) unstable; urgency=low
- * Provide fixed .la files. (closes: #228677)
+ * Provide fixed .la files. (closes: #228677)
-- Randall Donald <rdonald at debian.org> Mon, 19 Jan 2004 23:05:20 -0800
@@ -564,11 +569,11 @@
nvidia-graphics-drivers (1.0.4496-10) unstable; urgency=low
- * TLS problems related to installation of TLS libs on 2.4 systems.
+ * TLS problems related to installation of TLS libs on 2.4 systems.
Solution: provide a debconf note and set a default based on runtime
- detection of a TLS/2.6 system. Hopefully this will solve most of the
+ detection of a TLS/2.6 system. Hopefully this will solve most of the
tls bugs.
- * Add note about nvidia-kernel-source in nvidia-glx description.
+ * Add note about nvidia-kernel-source in nvidia-glx description.
(closes: #220038)
-- Randall Donald <rdonald at debian.org> Wed, 19 Nov 2003 13:17:50 -0800
@@ -576,14 +581,14 @@
nvidia-graphics-drivers (1.0.4496-9) unstable; urgency=low
* Change nvidia-kernel-source.README.Debian.in to reflect 2.6 makefile
- change. (closes: #219003)
+ change. (closes: #219003)
* Note the difference in KSRC for 2.6 headers (closes: #220452)
-- Randall Donald <rdonald at debian.org> Mon, 17 Nov 2003 20:47:20 -0800
nvidia-graphics-drivers (1.0.4496-8) unstable; urgency=low
- * Correctly install tls libglx.
+ * Correctly install tls libglx.
-- Randall Donald <rdonald at debian.org> Sat, 1 Nov 2003 12:46:04 -0800
@@ -598,18 +603,18 @@
* use Makefile.nvidia instead of Makefile.kbuild so the 2.6 support
can use kernel-headers. Manual patching still required.
README.Debian changed to instruct this change.
- (closes: #208535, #203369)
+ (closes: #208535, #203369)
* remove wget build-dep from kernel module (closes: #212742)
* install kernel module to /lib/modules/KVERS/nvidia. (closes: #207290)
- * re-fix GCC detection from compile.h (closes: #205871)
-
+ * re-fix GCC detection from compile.h (closes: #205871)
+
-- Randall Donald <rdonald at debian.org> Mon, 6 Oct 2003 21:41:13 -0700
nvidia-graphics-drivers (1.0.4496-5) unstable; urgency=low
- * Add symlink instruction to nvidia-kernel-source.README.Debian
- * Fix patchlevel version detection.
-
+ * Add symlink instruction to nvidia-kernel-source.README.Debian
+ * Fix patchlevel version detection.
+
-- Randall Donald <rdonald at debian.org> Tue, 23 Sep 2003 01:21:29 -0700
nvidia-graphics-drivers (1.0.4496-4) unstable; urgency=low
@@ -617,7 +622,7 @@
* Add Provides: nvidia-kernel-src to nvidia-kernel-source (closes: #211713)
* Upload new diversions and 2.6 support to unstable packages.
* change == to = in kernel rules file.
-
+
-- Randall Donald <rdonald at debian.org> Mon, 22 Sep 2003 15:34:32 -0700
nvidia-graphics-drivers (1.0.4496-3) experimental; urgency=low
@@ -633,10 +638,10 @@
* Fix part of gcc 3.3.1 detection that I missed last time. (closes: #205871)
* Update nvidia-kernel-source.README.Debian to reflect 2.4.21-4-k7.
* Add preliminary 2.6 support. See README.Debian for details (closes: #203369, #193379)
- * Include CONFIG_APM_MODULE patch file in nvidia-kernel-source.
+ * Include CONFIG_APM_MODULE patch file in nvidia-kernel-source.
* Upload to experimental due to diversion changes and preliminary 2.6
- support
- * Incorporate the NMU by martin f. krafft <madduck at debian.org>
+ support
+ * Incorporate the NMU by martin f. krafft <madduck at debian.org>
-- Randall Donald <rdonald at debian.org> Tue, 26 Aug 2003 14:42:57 -0700
@@ -648,18 +653,18 @@
also be a symlink to the same file. Removed the -a, now it works just
fine.
Closes: Bug#206445, Bug#206449
-
+
-- martin f. krafft <madduck at debian.org> Tue, 26 Aug 2003 08:50:46 +0200
nvidia-graphics-drivers (1.0.4496-2) unstable; urgency=low
- * Add email from NVIDIA to copyright file.
+ * Add email from NVIDIA to copyright file.
-- Randall Donald <rdonald at debian.org> Thu, 31 Jul 2003 15:18:25 -0700
nvidia-graphics-drivers (1.0.4496-1) unstable; urgency=low
- * New upstream.
+ * New upstream.
* include shlibs file.
* Re-split nvidia-glx-dev by request.
@@ -678,7 +683,7 @@
<david at eelf.ddts.net> (closes: #192112)
* Lose the version number in modules directory. (closes: #199509)
* Use automation of versioning based on patches by Marcello Magallon
- <mmagallo at debian.org>. Thanks. (closes: #192312, #192311)
+ <mmagallo at debian.org>. Thanks. (closes: #192312, #192311)
-- Randall Donald <rdonald at debian.org> Fri, 9 May 2003 14:51:15 -0700
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control?rev=1470&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/control Fri Sep 3 11:37:01 2010
@@ -7,13 +7,13 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/
Build-Depends:
- debhelper (>= 7.4.16~),
+ debhelper (>= 8),
bzip2,
dkms (>= 2.1.1.1),
libxext6,
quilt,
ia32-libs (>= 20090804) [amd64],
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://www.nvidia.com
Package: nvidia-glx-legacy-71xx
@@ -21,6 +21,7 @@
Pre-Depends: dpkg (>= 1.15.7.2)
Depends:
libgl1-nvidia${nvidia:Legacy}-glx (= ${binary:Version}),
+ libglx-nvidia-alternatives,
nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
${shlibs:Depends}, ${misc:Depends}
Suggests: nvidia-settings,
@@ -93,6 +94,7 @@
Section: non-free/libs
Architecture: i386 amd64
Depends:
+ libgl1-nvidia-alternatives,
${shlibs:Depends}, ${misc:Depends}
Recommends:
nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
@@ -123,6 +125,7 @@
Architecture: amd64
Pre-Depends: libc6-i386 (>= 2.9-18)
Depends:
+ libgl1-nvidia-alternatives-ia32,
${shlibs:Depends}, ${misc:Depends}
Recommends:
nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
@@ -188,7 +191,14 @@
nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
Conflicts:
nvidia-kernel-dkms,
- binutils-gold (>> 2.20.51)
+ linux-headers-2.6.32-trunk-486 [i386], linux-image-2.6.32-trunk-486 [i386],
+ linux-headers-2.6.32-trunk-686 [i386], linux-image-2.6.32-trunk-686 [i386],
+ linux-headers-2.6.32-trunk-686-bigmem [i386], linux-image-2.6.32-trunk-686-bigmem [i386],
+ linux-headers-2.6.32-trunk-amd64, linux-image-2.6.32-trunk-amd64,
+ linux-headers-2.6.32-trunk-vserver-686 [i386], linux-image-2.6.32-trunk-vserver-686 [i386],
+ linux-headers-2.6.32-trunk-vserver-686-bigmem [i386], linux-image-2.6.32-trunk-vserver-686-bigmem [i386],
+ linux-headers-2.6.32-trunk-vserver-amd64 [amd64], linux-image-2.6.32-trunk-vserver-amd64 [amd64],
+ binutils-gold (>> 2.20.51),
Description: NVIDIA binary kernel module DKMS source${nvidia:LegacyDesc}
This package builds the NVIDIA Xorg binary kernel module needed by
nvidia-glx${nvidia:Legacy}, using DKMS.
@@ -209,10 +219,18 @@
Package: nvidia-kernel-legacy-71xx-source
Section: non-free/kernel
Architecture: i386 amd64
-Depends: ${misc:Depends}, debhelper (>= 7.2.3~), make, quilt (>= 0.46-7~)
+Depends: ${misc:Depends}, debhelper (>= 8), make, quilt (>= 0.46-7~)
Recommends: module-assistant | kernel-package,
nvidia-glx${nvidia:Legacy} (>= ${nvidia:Version}), nvidia-kernel-common
-Conflicts: binutils-gold (>> 2.20.51)
+Conflicts:
+ linux-headers-2.6.32-trunk-486 [i386], linux-image-2.6.32-trunk-486 [i386],
+ linux-headers-2.6.32-trunk-686 [i386], linux-image-2.6.32-trunk-686 [i386],
+ linux-headers-2.6.32-trunk-686-bigmem [i386], linux-image-2.6.32-trunk-686-bigmem [i386],
+ linux-headers-2.6.32-trunk-amd64, linux-image-2.6.32-trunk-amd64,
+ linux-headers-2.6.32-trunk-vserver-686 [i386], linux-image-2.6.32-trunk-vserver-686 [i386],
+ linux-headers-2.6.32-trunk-vserver-686-bigmem [i386], linux-image-2.6.32-trunk-vserver-686-bigmem [i386],
+ linux-headers-2.6.32-trunk-vserver-amd64 [amd64], linux-image-2.6.32-trunk-vserver-amd64 [amd64],
+ binutils-gold (>> 2.20.51),
Description: NVIDIA binary kernel module source${nvidia:LegacyDesc}
This package provides the source for the NVIDIA Xorg binary kernel module
needed by nvidia-glx${nvidia:Legacy} in a form suitable
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.install.in?rev=1470&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.install.in (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.install.in Fri Sep 3 11:37:01 2010
@@ -1,4 +1,4 @@
-usr/lib/libGL.so.#VERSION#
+usr/lib/libGL.so.#VERSION# usr/lib/nvidia/
usr/lib/libGLcore.so.#VERSION#
usr/lib/libnvidia-tls.so.#VERSION#
usr/lib/tls/libnvidia-tls.so.#VERSION#
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.links.in?rev=1470&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.links.in (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-glx.links.in Fri Sep 3 11:37:01 2010
@@ -1,4 +1,4 @@
-usr/lib/libGL.so.#VERSION# usr/lib/libGL.so.1
+usr/lib/nvidia/libGL.so.#VERSION# usr/lib/nvidia/libGL.so.1
usr/lib/libGLcore.so.#VERSION# usr/lib/libGLcore.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
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.docs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.docs?rev=1470&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.docs (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.docs Fri Sep 3 11:37:01 2010
@@ -1,1 +1,2 @@
+debian/README.alternatives
debian/tmp/usr/share/doc/README.txt
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.lintian-overrides.in?rev=1470&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.lintian-overrides.in Fri Sep 3 11:37:01 2010
@@ -4,8 +4,8 @@
#!amd64#nvidia-glx#LEGACY#: shlib-with-non-pic-code
#!amd64#nvidia-glx#LEGACY#: shlib-without-PT_GNU_STACK-section
-# The diversions are placed here.
-nvidia-glx#LEGACY#: package-contains-empty-directory usr/lib/nvidia/diversions/
+# The alternatives are placed here.
+nvidia-glx#LEGACY#: package-contains-empty-directory usr/lib/xorg/modules/extensions/
# Referenced by upstream documentation.
nvidia-glx#LEGACY#: script-with-language-extension usr/bin/nvidia-bug-report.sh
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst?rev=1470&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst Fri Sep 3 11:37:01 2010
@@ -10,6 +10,7 @@
# </target: squeeze>
+# <target: squeeze>
# $1=original $2=diverted
undivert()
{
@@ -18,9 +19,11 @@
dpkg-divert --remove --rename --package ${old_diverter} \
--divert "$2" "$1"
}
+# </target: squeeze>
-case "$1" in
- configure)
+
+if [ "$1" = "configure" ]
+then
# <target: squeeze>
# also do this on new installations, we might take over nvidia-glx-legacy
@@ -65,8 +68,9 @@
dpkg-trigger /usr/lib/libGL.so
# </target: squeeze>
- ;;
-esac
+ update-alternatives --install /usr/lib/xorg/modules/extensions/libglx.so libglx.so /usr/lib/nvidia/libglx.so 42
+
+fi
#DEBHELPER#
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postrm?rev=1470&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postrm (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postrm Fri Sep 3 11:37:01 2010
@@ -1,8 +1,6 @@
#!/bin/sh
set -e
-
-#DIVERT_QUIET="--quiet"
# <target: squeeze>
dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx-legacy 71.86.14~ nvidia-glx-legacy -- "$@"
@@ -12,47 +10,6 @@
# </target: squeeze>
-# Rationale:
-#
-# Remove our diversions at the remove stage, since even if we have
-# configuration files left, we want to put back everything we moved. Do not
-# try to do this again on purge since remove will have already been called.
-#
-# In the abort-install case, we may have gotten far enough to create our
-# diversions in our preinst, so back out of them.
-#
-# Remove /usr/lib/libGL.so only if we still own a diversion of it, since the
-# link may have been created by our trigger in postinst or later.
-#
-# Leave all of our diversions alone during upgrades or aborted upgrades, since
-# we're staying installed in all cases and the diversions are still correct.
-#
-# It's not clear what to do on disappear, but for now leave everything alone
-# and assume that our overwriting package will have logic to take over the
-# diversions and doesn't want us messing with them.
-
-
-case "$1" in
- remove|abort-install)
-
- # work around dpkg-divert bug #581544: useless errors on not writable destination if source does not exist
- if [ -d /usr/lib/nvidia ] && [ ! -d /usr/lib/xorg/modules/extensions ]; then
- mkdir -p /usr/lib/xorg/modules/extensions
- fi
-
- dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/diversions/libglx.so \
- /usr/lib/xorg/modules/extensions/libglx.so
-
- rmdir /usr/lib/nvidia/diversions /usr/lib/nvidia 2>/dev/null || true
-
- # work around dpkg-divert bug #581544: useless errors on not writable destination if source does not exist
- rmdir /usr/lib/xorg/modules/extensions /usr/lib/xorg/modules /usr/lib/xorg 2>/dev/null || true
-
- ;;
-esac
-
-
#DEBHELPER#
exit 0
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst?rev=1470&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst Fri Sep 3 11:37:01 2010
@@ -1,13 +1,6 @@
#!/bin/sh
set -e
-
-#DIVERT_QUIET="--quiet"
-
-exists()
-{
- test -e "$1" || test -L "$1"
-}
# <target: squeeze>
dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx-legacy 71.86.14~ nvidia-glx-legacy -- "$@"
@@ -17,57 +10,6 @@
# </target: squeeze>
-case "$1" in
- install|upgrade)
-
- # the destination directory for the diversions
- test -d /usr/lib/nvidia/diversions || \
- mkdir -p /usr/lib/nvidia/diversions || true
-
- # <target: squeeze>
- # update the diversion
- # also do this on new installations, we might take over nvidia-glx-legacy
- if dpkg --compare-versions "$2" lt 71.86.14
- then
- file_orig="/usr/lib/xorg/modules/extensions/libglx.so"
- file_old_divert="/usr/lib/nvidia/libglx.so.xlibmesa"
- file_new_divert="/usr/lib/nvidia/diversions/libglx.so"
- old_diverter="`dpkg-divert --listpackage $file_orig`"
-
- if [ -n "$old_diverter" ]
- then
- # avoid dpkg-divert --add --rename in upgrade scenarios,
- # it might rename *our* existing file -- see dpkg bug #588077
-
- dpkg-divert --remove --package $old_diverter --divert \
- "$file_old_divert" \
- "$file_orig"
- if exists "$file_old_divert"
- then
- echo "Moving $file_old_divert to $file_new_divert"
- mv "$file_old_divert" "$file_new_divert"
- fi
- dpkg-divert --add --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- "$file_new_divert" \
- "$file_orig"
- fi
- if exists "$file_old_divert"
- then
- echo "ERROR: $file_old_divert does still exist. Aborting."
- exit 1
- fi
- fi
- # </target: squeeze>
-
- # make new diversions
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/diversions/libglx.so \
- /usr/lib/xorg/modules/extensions/libglx.so
-
- ;;
-esac
-
-
#DEBHELPER#
exit 0
More information about the pkg-nvidia-devel
mailing list