Package: nvidia-graphics-modules-i386 Severity: normal Tags: patch Hi,
I ported my patch to update nvidia-graphics-modules-amd64 to use current driver and kernel versions now also to nvidia-graphics-modules-i386 For more information please see the corresponding nvidia-graphics-modules-amd64 bug: http://bugs.debian.org/526236 Unlike the amd64 packages which I use on several machines I don't have any i386+nvidia system where I could test these. Andreas -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (800, 'testing'), (800, 'stable'), (600, 'unstable'), (130, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.28-1-amd64 (SMP w/4 CPU cores) Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash
Index: debian/control =================================================================== --- debian/control (.../trunk) (revision 892) +++ debian/control (.../branches/anbe) (revision 892) @@ -1,30 +1,27 @@ Source: nvidia-graphics-modules-i386 -Section: non-free/x11 +Section: non-free/kernel Priority: optional Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-de...@lists.alioth.debian.org> Uploaders: Randall Donald <rdon...@debian.org> -Build-Depends: linux-headers-2.6.26-1-amd64, linux-headers-2.6.26-1-686, linux-headers-2.6.26-1-686-bigmem, linux-headers-2.6.26-1-openvz-686, debhelper (>= 4.0.0), nvidia-kernel-source (>= 173.14.09), nvidia-kernel-source (<< 173.14.10) +Build-Depends: linux-headers-2.6.30-1-amd64, linux-headers-2.6.30-1-686, linux-headers-2.6.30-1-686-bigmem, debhelper (>= 4.0.0), nvidia-kernel-source (>= 185.18.14), nvidia-kernel-source (<< 185.18.15), module-assistant Standards-Version: 3.6.2 +Homepage: http://www.nvidia.com/ -Package: nvidia-kernel-2.6.26-1-686-bigmem +Package: nvidia-kernel-2.6.30-1-686-bigmem Architecture: i386 Description: NVIDIA binary kernel module -Package: nvidia-kernel-2.6.26-1-686 +Package: nvidia-kernel-2.6.30-1-686 Architecture: i386 Description: NVIDIA binary kernel module -Package: nvidia-kernel-2.6.26-1-amd64 +Package: nvidia-kernel-2.6.30-1-amd64 Architecture: i386 Description: NVIDIA binary kernel module -Package: nvidia-kernel-2.6.26-1-openvz-686 -Architecture: i386 -Description: NVIDIA binary kernel module - Package: nvidia-kernel-2.6-amd64 Architecture: i386 -Depends: nvidia-kernel-2.6.26-1-amd64, linux-image-2.6-amd64 +Depends: nvidia-kernel-2.6.30-1-amd64, linux-image-2.6-amd64 Description: NVIDIA binary kernel module for 2.6 series compiled for amd64 This is a metapackage to track the NVIDIA kernel module for the 2.6 kernel series. @@ -33,7 +30,7 @@ Package: nvidia-kernel-2.6-686 Architecture: i386 -Depends: nvidia-kernel-2.6.26-1-686, linux-image-2.6-686 +Depends: nvidia-kernel-2.6.30-1-686, linux-image-2.6-686 Description: NVIDIA binary kernel module for 2.6 series compiled for 686 This is a metapackage to track the NVIDIA kernel module for the 2.6 kernel series. @@ -42,18 +39,9 @@ Package: nvidia-kernel-2.6-686-bigmem Architecture: i386 -Depends: nvidia-kernel-2.6.26-1-686-bigmem, linux-image-2.6-686-bigmem +Depends: nvidia-kernel-2.6.30-1-686-bigmem, linux-image-2.6-686-bigmem Description: NVIDIA binary kernel module for 2.6 series compiled for bigmem This is a metapackage to track the NVIDIA kernel module for the 2.6 kernel series. . This package tracks the module compiled against bigmem headers. - -Package: nvidia-kernel-2.6-openvz-686 -Architecture: i386 -Depends: nvidia-kernel-2.6.26-1-openvz-686, linux-image-2.6-openvz-686 -Description: NVIDIA binary kernel module for 2.6 series compiled for openvz - This is a metapackage to track the NVIDIA kernel module for - the 2.6 kernel series. - . - This package tracks the module compiled against openvz headers. Index: debian/changelog =================================================================== --- debian/changelog (.../trunk) (revision 892) +++ debian/changelog (.../branches/anbe) (revision 892) @@ -1,3 +1,12 @@ +nvidia-graphics-modules-i386 (185.18.14+0+nmu1) unstable; urgency=low + + * Non-maintainer upload. + * Build for 2.6.30-1 + * Use nvidia-kernel-source 185.18.14-2 + * drop openvz flavour + + -- Andreas Beckmann <deb...@abeckmann.de> Mon, 13 Jul 2009 02:00:31 +0200 + nvidia-graphics-modules-i386 (173.14.09+3) unstable; urgency=medium * Fix Provides Index: debian/copyright =================================================================== --- debian/copyright (.../trunk) (revision 892) +++ debian/copyright (.../branches/anbe) (revision 892) @@ -4,7 +4,7 @@ It was downloaded from ftp://download.nvidia.com/XFree86/ -Upstream Author(s): NVIDIA <linux-b...@nvidia.com> +Upstream Author: NVIDIA <linux-b...@nvidia.com> Copyright: Index: debian/rules =================================================================== --- debian/rules (.../trunk) (revision 892) +++ debian/rules (.../branches/anbe) (revision 892) @@ -19,9 +19,9 @@ sed 's/^.*(\(.*\)).*$$/\1/' \ ) -version := 2.6.26-1 +version := 2.6.30-1 # amd64 must be last -flavours := 686 686-bigmem openvz-686 amd64 +flavours := 686 686-bigmem amd64 @@ -52,8 +52,10 @@ dh_installchangelogs dh_installdocs dh_install + dh_compress dh_fixperms dh_gencontrol + dh_md5sums dh_builddeb @@ -68,12 +70,12 @@ if [ "$$i" = "amd64" ]; then \ cp nv-kernel.o.x86_64 nv-kernel.o ; \ fi ;\ - DO_NOT_PATCH_NV=$(DO_NOT_PATCH_NV) KERNEL_DEPENDS=y MODVERS=$(revision) KSRC=/usr/src/linux-headers-$(version)-$$i KVERS=$(version)-$$i debian/rules binary_modules ; \ - KSRC=/usr/src/linux-headers-$(version)-$$i KVERS=$(version)-$$i debian/rules clean; \ + DO_NOT_PATCH_NV=$(DO_NOT_PATCH_NV) KERNEL_DEPENDS=y MODVERS=$(revision) KSRC=/usr/src/linux-headers-$(version)-$$i KVERS=$(version)-$$i KPKG_DEST_DIR=.. debian/rules binary_modules ; \ + KSRC=/usr/src/linux-headers-$(version)-$$i KVERS=$(version)-$$i HAVECONFIG=y debian/rules clean; \ done mv modules/*.deb . for p in *.deb; do \ - dpkg-distaddfile $$p "non-free/x11" optional; \ + dpkg-distaddfile $$p "non-free/kernel" optional; \ done mv *.deb .. Index: control.template =================================================================== --- control.template (.../trunk) (revision 892) +++ control.template (.../branches/anbe) (revision 892) @@ -1,13 +1,14 @@ Source: nvidia-graphics-modules-i386 -Section: non-free/x11 +Section: non-free/kernel Priority: optional Maintainer: Randall Donald <rdon...@debian.org> Build-Depends: debhelper (>> 3.0.0), make, libc6-dev Standards-Version: 3.6.0 +Homepage: http://www.nvidia.com/ Package: nvidia-kernel-#KVERS# Architecture: i386 amd64 -Provides: nvidia-kernel-173.14.09 +Provides: nvidia-kernel-185.18.14 Depends: nvidia-kernel-common (>= 20050829), linux-image-#KVERS# Description: NVIDIA binary kernel module for Linux #KVERS# These XFree86 4.0 binary drivers provide optimized hardware acceleration of