Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package nvidia-graphics-drivers-legacy-173xx
All changes from nvidia-graphics-drivers that recently migrated to
testing (or are at least unblocked) and are applicable to the legacy
drivers as well have been merged into 173.14.35-4 to apply the fixes and
keep the packaging in sync:
* Synchronize packaging with nvidia-graphics-drivers 304.37-1:
- 3.6_kernel.patch: New patch to fix compilation with Linux 3.6, taken
from rpmfusion.
* Adjust 3.6_kernel.patch for a different filename in legacy-173xx.
(this trivial patch is no longer in n-g-d since it was fixed in newer
upstream releases)
* Synchronize packaging with nvidia-graphics-drivers 304.48-2:
- libgl1-nvidia-legacy-173xx-glx-ia32: readd
Depends: libgl1-nvidia-alternatives-ia32 to prevent apt from removing
libgl1-nvidia-alternatives-ia32 (which would remove the diversions)
while the old (pre-transitional) libgl1-nvidia-legacy-173xx-glx-ia32 is
still installed.
- get-orig-source: Fix caching for legacy drivers.
- bug-control: Report version info about revived
libgl1-nvidia-legacy-96xx-glx-ia32.
- Upgrade nvidia-settings relationship from Suggests to Recommends and use
a substvar for the name of the compatible nvidia-settings package.
- There is no need to exclude squeeze-backports from using xz compression.
* Use nvidia-settings-legacy-173xx as the name of the compatible
nvidia-settings package.
* Synchronize packaging with nvidia-graphics-drivers 304.60-1:
- libgl1-nvidia-legacy-173xx-glx:i386: Breaks: ia32-libs (<< 1:0),
versioning was fixed.
- Fix missing legacy substitution.
- conftest.h:
- Implement checks for linux/efi.h and linux/nvmap.h (310.14).
- Implement new conftest.sh functions outer_flush_all, nvmap_support,
and efi_enabled (310.14).
* Synchronize packaging with nvidia-graphics-drivers 304.60-2:
- build-module-packages.sh: Build modules only for the variant (current or
legacy-abcxx) that shipped the script.
* Synchronize packaging with nvidia-graphics-drivers 304.64-1:
- conftest.h: Implement new conftest.sh function set_memory_array_uc.
- build-module-packages.sh: Build modules only for the variant (current or
legacy-abcxx) that shipped the script.
* Synchronize packaging with nvidia-graphics-drivers 304.64-2:
- Always use the upstream changelog from the x86_64 release to avoid minor
differences causing multiarch conflicts.
(all changes up to here were unblocked (#688698) and migrated with 304.64-3)
* Synchronize packaging with nvidia-graphics-drivers 304.64-4:
- kernel-3.7.patch: New patch to fix compilation with Linux 3.7 (which
replaced VM_RESERVED by VM_DONTEXPAND | VM_DONTDUMP).
* Adjust kernel-3.7.patch for a different filename in legacy-173xx.
(this has been unblocked: #697838)
* Synchronize packaging with nvidia-graphics-drivers 304.64-5:
- Fix debian/module/debian/kernel-version to cope with
$KSRC/linux/version.h being moved to
$KSRC/include/generated/uapi/linux/version.h in Linux 3.7.
This is the only change not yet in nvidia-graphics-drivers/sid, (so far
only in experimental). A trivial followup to kernel-3.7.patch. #696570
The kernel-version script is only needed by the nvidia-kernel-source
package which builds the module packages with module-assistant.
Andreas
unblock nvidia-graphics-drivers-legacy-173xx/173.14.35-4
diffstat for nvidia-graphics-drivers-legacy-173xx-173.14.35 nvidia-graphics-drivers-legacy-173xx-173.14.35
bug-control.in | 2 -
build-module-packages.sh | 19 ------------
build-module-packages.sh.in | 19 ++++++++++++
changelog | 49 +++++++++++++++++++++++++++++++++
control | 9 +++---
module/conftest.h | 37 +++++++++++++++++++++++-
module/debian/kernel-version | 16 ++++++----
module/debian/patches/3.6_kernel.patch | 21 ++++++++++++++
module/debian/patches/kernel-3.7.patch | 22 ++++++++++++++
module/debian/patches/series | 2 +
rules | 13 +++++---
rules.defs | 2 +
12 files changed, 174 insertions(+), 37 deletions(-)
diff -Nru nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/bug-control.in nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/bug-control.in
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/bug-control.in 2012-09-13 12:31:05.000000000 +0200
+++ nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/bug-control.in 2013-01-15 15:30:58.000000000 +0100
@@ -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 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
+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-legacy-96xx-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 nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/build-module-packages.sh nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/build-module-packages.sh
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/build-module-packages.sh 2011-05-07 17:40:42.000000000 +0200
+++ nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/build-module-packages.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-set -e
-
-test -x /usr/bin/module-assistant || apt-get install module-assistant
-
-cd /usr/src
-
-kernels="$(ls -d1 linux-headers* | grep -v common | sed -e s/linux-headers-//)"
-modules="$(ls -d1 nvidia*.tar.bz2 | sed -e s/.tar.bz2//)"
-
-module-assistant clean $modules
-module-assistant build --text-mode --force --kvers-list "$kernels" $modules
-
-ls -l *.deb
-for m in $modules ; do
- for k in $kernels ; do
- echo "* ${m}-${k}:"
- ls -l ${m}-${k}_*.deb
- done
-done
diff -Nru nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/build-module-packages.sh.in nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/build-module-packages.sh.in
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/build-module-packages.sh.in 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/build-module-packages.sh.in 2013-01-15 15:30:58.000000000 +0100
@@ -0,0 +1,19 @@
+set -e
+
+test -x /usr/bin/module-assistant || apt-get install module-assistant
+
+cd /usr/src
+
+kernels="$(ls -d1 /lib/modules/*/build 2>/dev/null | cut -d/ -f4)"
+modules=nvidia-kernel#LEGACY#
+
+module-assistant clean $modules
+module-assistant build --text-mode --force --kvers-list "$kernels" $modules
+
+ls -l *.deb
+for m in $modules ; do
+ for k in $kernels ; do
+ echo "* ${m} ${k}:"
+ ls -l ${m}-${k}_*.deb
+ done
+done
diff -Nru nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/changelog nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/changelog
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/changelog 2012-09-13 12:31:13.000000000 +0200
+++ nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/changelog 2013-01-15 15:31:07.000000000 +0100
@@ -1,3 +1,52 @@
+nvidia-graphics-drivers-legacy-173xx (173.14.35-4) unstable; urgency=low
+
+ * Synchronize packaging with nvidia-graphics-drivers 304.37-1:
+ - 3.6_kernel.patch: New patch to fix compilation with Linux 3.6, taken
+ from rpmfusion.
+ * Adjust 3.6_kernel.patch for a different filename in legacy-173xx.
+ * Synchronize packaging with nvidia-graphics-drivers 304.48-2:
+ - libgl1-nvidia-legacy-173xx-glx-ia32: readd
+ Depends: libgl1-nvidia-alternatives-ia32 to prevent apt from removing
+ libgl1-nvidia-alternatives-ia32 (which would remove the diversions)
+ while the old (pre-transitional) libgl1-nvidia-legacy-173xx-glx-ia32 is
+ still installed.
+ - get-orig-source: Fix caching for legacy drivers.
+ - bug-control: Report version info about revived
+ libgl1-nvidia-legacy-96xx-glx-ia32.
+ - Upgrade nvidia-settings relationship from Suggests to Recommends and use
+ a substvar for the name of the compatible nvidia-settings package.
+ - There is no need to exclude squeeze-backports from using xz compression.
+ * Use nvidia-settings-legacy-173xx as the name of the compatible
+ nvidia-settings package.
+ * Synchronize packaging with nvidia-graphics-drivers 304.60-1:
+ - libgl1-nvidia-legacy-173xx-glx:i386: Breaks: ia32-libs (<< 1:0),
+ versioning was fixed.
+ - Fix missing legacy substitution.
+ - conftest.h:
+ - Implement checks for linux/efi.h and linux/nvmap.h (310.14).
+ - Implement new conftest.sh functions outer_flush_all, nvmap_support,
+ and efi_enabled (310.14).
+ * Synchronize packaging with nvidia-graphics-drivers 304.60-2:
+ - build-module-packages.sh: Build modules only for the variant (current or
+ legacy-abcxx) that shipped the script.
+ * Synchronize packaging with nvidia-graphics-drivers 304.64-1:
+ - conftest.h: Implement new conftest.sh function set_memory_array_uc.
+ - build-module-packages.sh: Build modules only for the variant (current or
+ legacy-abcxx) that shipped the script.
+ * Synchronize packaging with nvidia-graphics-drivers 304.64-2:
+ - Always use the upstream changelog from the x86_64 release to avoid minor
+ differences causing multiarch conflicts.
+ * Synchronize packaging with nvidia-graphics-drivers 304.64-4:
+ - kernel-3.7.patch: New patch to fix compilation with Linux 3.7 (which
+ replaced VM_RESERVED by VM_DONTEXPAND | VM_DONTDUMP).
+ * Adjust kernel-3.7.patch for a different filename in legacy-173xx.
+ * Synchronize packaging with nvidia-graphics-drivers 304.64-5:
+ - Fix debian/module/debian/kernel-version to cope with
+ $KSRC/linux/version.h being moved to
+ $KSRC/include/generated/uapi/linux/version.h in Linux 3.7.
+
+ -- Andreas Beckmann <deb...@abeckmann.de> Tue, 15 Jan 2013 15:26:13 +0100
+
nvidia-graphics-drivers-legacy-173xx (173.14.35-3) unstable; urgency=low
* 173.14.35 was promoted to release status without further changes.
diff -Nru nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/control nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/control
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/control 2012-09-13 12:31:05.000000000 +0200
+++ nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/control 2013-01-15 15:30:58.000000000 +0100
@@ -33,9 +33,9 @@
nvidia-support,
${shlibs:Depends}, ${misc:Depends}
Recommends:
+ ${nvidia-settings},
libgl1-nvidia${nvidia:Legacy}-glx-i386 [amd64],
Suggests:
- nvidia-settings-legacy-173xx,
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
Provides:
@@ -71,8 +71,8 @@
Recommends:
nvidia-kernel${nvidia:Legacy}-dkms (= ${binary:Version})
| nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
+ ${nvidia-settings},
Suggests:
- nvidia-settings-legacy-173xx,
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
Provides:
@@ -136,7 +136,7 @@
Conflicts:
libgl1-nvidia${nvidia:Legacy}-dev,
nvidia-glx${nvidia:Legacy}-dev,
- libgl1-nvidia-glx-ia32 [i386],
+ libgl1-nvidia${nvidia:Legacy}-glx-ia32 [i386],
Breaks:
libgl1-nvidia${nvidia:Legacy}-glx-ia32 (<< ${nvidia:Version}) [amd64],
nvidia-glx (<< 275.09.07-3),
@@ -149,7 +149,7 @@
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],
+ ia32-libs (<< 1:0) [i386],
nvidia-settings (>= 302),
Replaces:
nvidia-glx${nvidia:Legacy} (<< 173.14.27),
@@ -172,6 +172,7 @@
libc6-i386 (>= 2.9-18),
nvidia-installer-cleanup,
Depends:
+ libgl1-nvidia-alternatives-ia32,
${shlibs:Depends}, ${misc:Depends}
Recommends:
libgl1-nvidia${nvidia:Legacy}-glx-i386,
diff -Nru nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/conftest.h nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/conftest.h
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/conftest.h 2012-09-13 12:31:05.000000000 +0200
+++ nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/conftest.h 2013-01-15 15:30:58.000000000 +0100
@@ -1,4 +1,4 @@
-/* synchronized with conftest.sh from 304.48, 295.75, 173.14.35, 96.43.23, 71.86.15 */
+/* synchronized with conftest.sh from 310.14, 304.64, 295.75, 173.14.36, 96.43.23, 71.86.15 */
#ifndef LINUX_VERSION_CODE
#include <linux/version.h>
@@ -24,6 +24,13 @@
#undef NV_SET_MEMORY_UC_PRESENT
#endif
+/* Implement conftest.sh function set_memory_array_uc */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
+ #define NV_SET_MEMORY_ARRAY_UC_PRESENT
+#else
+ #undef NV_SET_MEMORY_ARRAY_UC_PRESENT
+#endif
+
/* Implement conftest.sh function set_pages_uc */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
#define NV_SET_PAGES_UC_PRESENT
@@ -31,6 +38,10 @@
#undef NV_SET_PAGES_UC_PRESENT
#endif
+/* Implement conftest.sh function outer_flush_all */
+// ARM only
+ #undef NV_OUTER_FLUSH_ALL_PRESENT
+
/* Implement conftest.sh function change_page_attr */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) && \
LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
@@ -189,6 +200,10 @@
/* nv-xen.h does not exist */
#undef HAVE_NV_XEN
+/* Implement conftest.sh function nvmap_support */
+/* nv-android.h does not exist */
+#undef HAVE_NV_ANDROID
+
/* Implement conftest.sh function acpi_evaluate_integer */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,19)
#define NV_ACPI_EVALUATE_INTEGER_PRESENT
@@ -304,6 +319,13 @@
#undef NV_FILE_OPERATIONS_HAS_COMPAT_IOCTL
#endif
+/* Implement conftest.sh function efi_enabled */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1)
+ #define NV_EFI_ENABLED_PRESENT
+#else
+ #undef NV_EFI_ENABLED_PRESENT
+#endif
+
/* Implement conftest.sh function sg_init_table */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
#define NV_SG_INIT_TABLE_PRESENT
@@ -353,11 +375,18 @@
#undef NV_ASM_SYSTEM_H_PRESENT
#endif
+/* Check for linux/efi.h */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,33)
+ #define NV_LINUX_EFI_H_PRESENT
+#else
+ #undef NV_LINUX_EFI_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
+ #undef NV_LINUX_KCONFIG_H_PRESENT
#endif
/* Check for linux/screen_info.h */
@@ -366,3 +395,7 @@
#else
#undef NV_LINUX_SCREEN_INFO_H_PRESENT
#endif
+
+/* Check for linux/nvmap.h */
+// does not (yet) exist in kernel source
+ #undef NV_LINUX_NVMAP_H_PRESENT
diff -Nru nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/kernel-version nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/kernel-version
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/kernel-version 2012-02-16 03:18:01.000000000 +0100
+++ nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/kernel-version 2013-01-15 15:30:58.000000000 +0100
@@ -5,14 +5,18 @@
# found, print nothing and exit quietly.
my $ksrc = shift;
-unless ($ksrc && open (VERSION, "$ksrc/include/linux/version.h")) {
+unless ($ksrc && (-f "$ksrc/include/linux/version.h" || -f "$ksrc/include/generated/uapi/linux/version.h")) {
exit 0;
}
-my $found;
-my $line = <VERSION>;
-if ($line =~ /"(.+)"/) {
- print "$1\n";
- $found = 1;
+my $found = 0;
+my $line;
+if (open (VERSION, "$ksrc/include/linux/version.h")) {
+ if ($line = <VERSION>) {
+ if ($line =~ /"(.+)"/) {
+ print "$1\n";
+ $found = 1;
+ }
+ }
}
exit 0 if $found;
if (open (VERSION, "$ksrc/include/generated/utsrelease.h")) {
diff -Nru nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/3.6_kernel.patch nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/3.6_kernel.patch
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/3.6_kernel.patch 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/3.6_kernel.patch 2013-01-15 15:30:58.000000000 +0100
@@ -0,0 +1,21 @@
+From: Leigh Scott <leigh123li...@googlemail.com>
+Subject: fix compilation with linux kernel 3.6
+ (adjusted for 173xx legacy)
+Origin: vendor, http://cvs.rpmfusion.org/viewvc/rpms/nvidia-kmod/devel/3.6_kernel.patch?revision=1.2&root=nonfree&view=markup
+Bug: http://www.nvnews.net/vbulletin/showthread.php?t=187620
+Bug-Debian: http://bugs.debian.org/684486
+
+--- a/nvacpi.c
++++ b/nvacpi.c
+@@ -300,7 +300,11 @@ static int nv_acpi_remove(struct acpi_de
+ if (pNvAcpiObject->notify_handler_installed)
+ {
+ // no status returned for this function
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
++ acpi_os_wait_events_complete();
++#else
+ acpi_os_wait_events_complete(NULL);
++#endif
+
+ // remove event notifier
+ status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
diff -Nru nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/kernel-3.7.patch nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/kernel-3.7.patch
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/kernel-3.7.patch 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/kernel-3.7.patch 2013-01-15 15:30:58.000000000 +0100
@@ -0,0 +1,22 @@
+Author: Andreas Beckmann <deb...@abeckmann.de>
+Description: fix building against kernel 3.7
+ The VM_RESERVED flag was removed in kernel 3.7:
+ http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commit;h=314e51b9851b4f4e8ab302243ff5a6fc6147f379
+Bug-Debian: http://bugs.debian.org/697061
+
+--- a/nv.c
++++ b/nv.c
+@@ -2607,6 +2607,13 @@
+ NV_PRINT_AT(NV_DBG_MEMINFO, at);
+ nv_vm_list_page_count(&at->page_table[i], pages);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++// VM_RESERVED was replaced by VM_DONTEXPAND | VM_DONTDUMP in Linux 3.7
++# ifndef VM_RESERVED
++# define VM_RESERVED (VM_DONTEXPAND | VM_DONTDUMP)
++# endif
++#endif
++
+ /* prevent the swapper from swapping it out */
+ /* mark the memory i/o so the buffers aren't dumped on core dumps */
+ vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
diff -Nru nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/module/debian/patches/series nvidia-graphics-drivers-legacy-173xx-173.14.35/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-173xx-173.14.35/debian/module/debian/patches/series 2013-01-15 15:30:58.000000000 +0100
@@ -5,3 +5,5 @@
avoid-ld.gold.patch
fix-typos.patch
linux3.patch
+3.6_kernel.patch
+kernel-3.7.patch
diff -Nru nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/rules nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/rules
--- nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/rules 2012-09-13 12:31:05.000000000 +0200
+++ nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/rules 2013-01-15 15:30:58.000000000 +0100
@@ -15,6 +15,7 @@
XORG_BOUND ?=
MULTIARCH ?=
BACKPORT ?=
+NVIDIA_SETTINGS ?= nvidia-settings
version = $(NVIDIA_RELEASE)
legacy = $(if $(NVIDIA_LEGACY),-legacy-$(NVIDIA_LEGACY)xx)
legacy_description = $(if $(NVIDIA_LEGACY), ($(NVIDIA_LEGACY)xx legacy version))
@@ -81,8 +82,8 @@
test -f NVIDIA-Linux-amd64/README.txt || \
mv NVIDIA-Linux-amd64/usr/share/doc/README.txt NVIDIA-Linux-amd64/README.txt 2>/dev/null || \
mv NVIDIA-Linux-amd64/usr/share/doc/README NVIDIA-Linux-amd64/README.txt
- test -f NVIDIA-Linux/NVIDIA_Changelog || \
- mv NVIDIA-Linux/usr/share/doc/NVIDIA_Changelog NVIDIA-Linux/
+ test -f NVIDIA-Linux-amd64/NVIDIA_Changelog || \
+ mv NVIDIA-Linux-amd64/usr/share/doc/NVIDIA_Changelog NVIDIA-Linux-amd64/
test -d NVIDIA-Linux-i386/kernel || \
mv NVIDIA-Linux-i386/usr/src/nv NVIDIA-Linux-i386/kernel
test -d NVIDIA-Linux-amd64/kernel || \
@@ -157,6 +158,8 @@
install-into-tmp:
# "Install" into debian/tmp.
cp -al NVIDIA-Linux/ debian/tmp
+ rm -f debian/tmp/NVIDIA_Changelog
+ cp -al NVIDIA-Linux-amd64/NVIDIA_Changelog debian/tmp/
# Create xorg.conf.sample
test ! -f debian/tmp/usr/share/doc/XF86Config.sample || \
@@ -255,6 +258,7 @@
-V'nvidia:Legacy=$(legacy)' \
-V'nvidia:LegacyDesc=$(legacy_description)' \
-V'nvidia:Perfkit=$(perfkit)' \
+ -V'nvidia-settings=$(NVIDIA_SETTINGS)' \
-Vnvidia:Models="`cat debian/control.models`"
# Do not run dh_strip here. The NVIDIA license says:
@@ -270,10 +274,8 @@
# in a way other than unzipping of compressed files.
override_dh_strip:
-ifneq (squeeze,$(BACKPORT))
override_dh_builddeb:
dh_builddeb -- -Zxz
-endif
############################################################################
@@ -352,7 +354,8 @@
get-orig-source:
rm -rf get-orig-source || true
mkdir get-orig-source
- ln -v ../.cache/*-$(version).run get-orig-source/ || true
+ ln -v ../.cache/*-$(version).run get-orig-source/ 2>/dev/null || true
+ ln -v ../.cache/*-$(version)-*.run get-orig-source/ 2>/dev/null || 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
diff -Nru nvidia-graphics-drivers-legacy-173xx-173.14.35/debian/rules.defs nvidia-graphics-drivers-legacy-173xx-173.14.35/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-173xx-173.14.35/debian/rules.defs 2013-01-15 15:30:58.000000000 +0100
@@ -1,6 +1,8 @@
# If needed, set to the major part of the upstream version number.
NVIDIA_LEGACY = 173
#WATCH_VERSION =
+NVIDIA_SETTINGS = nvidia-settings-legacy-173xx
+
XORG_ABI_LIST = 12 11 10 8 6.0
XORG_BOUND = (<< 2:1.12.99)
