Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock packages nvidia-graphics-drivers, nvidia-settings,
nvidia-graphics-modules
304.84 is a new upstream release (the only way we can get upstream
bugfixes for the blob) that fixes an issue with logging into KDE a
second time after logging out but not restarting X. So far this has
been reported three times in the BTS.
Along this I added some documentation and license updates:
- use License: GPL-2.0 from current dh_make template
- add missing copyright/license to the nvidia-detect script
- put my patches into the public domain, they get applied to the kernel
module source, so GPL is not appropriate
I just noticed debian/nvidia-cuda-proxy.* got added, too, but the
nvidia-cuda-proxy is not in ebian/control, so this is just a bit noise.
Annotated changelog entry:
new upstream:
* New upstream legacy 304xx branch release 304.84 (2013-03-04).
- Improved compatibility with recent Linux kernels.
- Fixed a bug that could lead to rendering corruption after an X
server generation (i.e., leaving an X server running after all
of its clients have exited). (Closes: #700121, #696839, #702918)
- Fixed a bug that could cause the X server to crash when performing
an RandR 1.0 rotation (e.g., `xrandr --orientation left`) after
unplugging the last connected monitor.
- Added support for X.org xserver ABI 14 (xorg-server 1.14).
- Fixed font rendering performance and corruption problems on X servers with
backported support for the new glyph cache functionality added to Pixman
0.27.
- Fixed a potential X server crash during initialization, when a
graphics card with a TV connector has no TV connected.
- Added a new X configuration option, "UseHotplugEvents", to allow the
suppression of RandR events when adding or removing non-DisplayPort
displays. See the "X Config Options" appendix of the README for details.
* Add xorg-video-abi-14 as alternative dependency.
* kernel-3.7.patch: Remove, fixed upstream.
fix for nvidia-kernel-source, the corresponding fix for
nvidia-kernel-dkms was already in 304.64-4, and this change is already
in nvidia-graphics-drivers-legacy-* in wheezy:
* 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.
(Closes: #696570)
documentation and similar:
* nvidia-vdpau-driver: Move to Section: non-free/video. (See #700666)
* README.alternatives: Document to run
'dpkg-reconfigure glx-alternative-nvidia'
after running 'update-alternatives --config nvidia'. (See #702782)
* README.Debian: Add information about reporting upstream bugs to NVIDIA.
* Update my email address and remove DMUA.
missing copyright:
* Add copyright information to the nvidia-detect script originally written
by Filipus Klutiero for the wiki page.
drop cruft:
* patch-3.0-rt-nvidia.patch: Remove, disabled since 304.30-2.
relicense:
* Put my patches into the public domain, they get applied to the kernel
module source that is under a non-free license from NVIDIA.
nvidia-graphics-modules is just a rebuild against the new driver.
nvidia-settings has some upstream changes, so better keep the version in
sync.
These three packages should go into testing together. I won't mind
giving them a bit more time than the usual 10 days in unstable.
Andreas
unblock nvidia-graphics-drivers/304.84-1
unblock nvidia-support/304.84-1
unblock nvidia-graphics-modules/304.84+1
diffstat for nvidia-graphics-drivers-304.64 nvidia-graphics-drivers-304.84
README.alternatives | 3 +
changelog | 38 +++++++++++++++++
control | 4 -
copyright | 51 +++++++++++++++---------
detect/nvidia-detect.in | 18 ++++++++
module/conftest.h | 2
module/debian/kernel-version | 16 ++++---
module/debian/patches/kernel-3.7.patch | 22 ----------
module/debian/patches/patch-3.0-rt-nvidia.patch | 51 ------------------------
module/debian/patches/series | 2
nvidia-cuda-proxy.dirs | 1
nvidia-cuda-proxy.install | 2
nvidia-cuda-proxy.lintian-overrides | 3 +
nvidia-cuda-proxy.manpages | 1
nvidia-glx.README.Debian.in | 16 +++++++
rules.defs | 4 -
16 files changed, 129 insertions(+), 105 deletions(-)
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/README.alternatives nvidia-graphics-drivers-304.84/debian/README.alternatives
--- nvidia-graphics-drivers-304.64/debian/README.alternatives 2011-07-07 16:54:47.000000000 +0200
+++ nvidia-graphics-drivers-304.84/debian/README.alternatives 2013-03-12 15:06:20.000000000 +0100
@@ -4,7 +4,10 @@
To switch between the current and legacy NVIDIA drivers, use
update-alternatives --config nvidia
+ dpkg-reconfigure glx-alternative-nvidia
+(The second command ensures the changes are propagated to the glx
+alternative.)
To switch between the GLX implementation from MESA, NVIDIA and AMD(fglrx),
use
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/changelog nvidia-graphics-drivers-304.84/debian/changelog
--- nvidia-graphics-drivers-304.64/debian/changelog 2013-01-08 13:13:08.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/changelog 2013-03-15 11:34:34.000000000 +0100
@@ -1,3 +1,41 @@
+nvidia-graphics-drivers (304.84-1) unstable; urgency=low
+
+ * New upstream legacy 304xx branch release 304.84 (2013-03-04).
+ - Improved compatibility with recent Linux kernels.
+ - Fixed a bug that could lead to rendering corruption after an X
+ server generation (i.e., leaving an X server running after all
+ of its clients have exited). (Closes: #700121, #696839, #702918)
+ - Fixed a bug that could cause the X server to crash when performing
+ an RandR 1.0 rotation (e.g., `xrandr --orientation left`) after
+ unplugging the last connected monitor.
+ - Added support for X.org xserver ABI 14 (xorg-server 1.14).
+ - Fixed font rendering performance and corruption problems on X servers with
+ backported support for the new glyph cache functionality added to Pixman
+ 0.27.
+ - Fixed a potential X server crash during initialization, when a
+ graphics card with a TV connector has no TV connected.
+ - Added a new X configuration option, "UseHotplugEvents", to allow the
+ suppression of RandR events when adding or removing non-DisplayPort
+ displays. See the "X Config Options" appendix of the README for details.
+ * Add xorg-video-abi-14 as alternative dependency.
+ * kernel-3.7.patch: Remove, fixed upstream.
+ * 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.
+ (Closes: #696570)
+ * nvidia-vdpau-driver: Move to Section: non-free/video. (See #700666)
+ * README.alternatives: Document to run
+ 'dpkg-reconfigure glx-alternative-nvidia'
+ after running 'update-alternatives --config nvidia'. (See #702782)
+ * README.Debian: Add information about reporting upstream bugs to NVIDIA.
+ * Add copyright information to the nvidia-detect script originally written
+ by Filipus Klutiero for the wiki page.
+ * patch-3.0-rt-nvidia.patch: Remove, disabled since 304.30-2.
+ * Put my patches into the public domain, they get applied to the kernel
+ module source that is under a non-free license from NVIDIA.
+ * Update my email address and remove DMUA.
+
+ -- Andreas Beckmann <a...@debian.org> Fri, 15 Mar 2013 11:23:39 +0100
+
nvidia-graphics-drivers (304.64-4) unstable; urgency=low
* nvidia-detect: Fix detection of Debian 7.0 (wheezy). (Closes: #697282)
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/control nvidia-graphics-drivers-304.84/debian/control
--- nvidia-graphics-drivers-304.64/debian/control 2012-12-20 20:02:36.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/control 2013-03-15 11:34:34.000000000 +0100
@@ -4,8 +4,7 @@
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-de...@lists.alioth.debian.org>
Uploaders:
Russ Allbery <r...@debian.org>,
- Andreas Beckmann <deb...@abeckmann.de>,
-DM-Upload-Allowed: yes
+ Andreas Beckmann <a...@debian.org>,
Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/
Build-Depends:
@@ -320,6 +319,7 @@
for a complete list of supported GPUs and PCI IDs.
Package: nvidia-vdpau-driver
+Section: non-free/video
Architecture: i386 amd64
Multi-Arch: same
Pre-Depends:
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/copyright nvidia-graphics-drivers-304.84/debian/copyright
--- nvidia-graphics-drivers-304.64/debian/copyright 2012-03-23 14:37:21.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/copyright 2013-03-15 11:34:34.000000000 +0100
@@ -18,30 +18,43 @@
Files: debian/*
Copyright: 2001-2010 Randall Donald <rdon...@debian.org>
- 2009-2012 Andreas Beckmann <deb...@abeckmann.de>
+ 2009-2013 Andreas Beckmann <a...@debian.org>
2010 Russ Allbery <r...@debian.org>
Based on packages by Christopher Cheney.
-License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
+License: GPL-2.0+
+
+Files: debian/detect/nvidia-detect.in
+Copyright: © 2008-2011 Filipus Klutiero <chea...@gmail.com>
+ © 2011-2013 Andreas Beckmann <a...@debian.org>
+License: GPL-2.0+
+
+Files: debian/modules/debian/patches/*
+Copyright: no copyright notice, see License
+License: anbe-public-domain
+ The authors hereby relinquish any claim to any copyright that they may
+ have in this work, whether granted under contract or by operation of law
+ or international treaty, and hereby commit to the public, at large, that
+ they shall not, at any time in the future, seek to enforce any copyright
+ in this work against any person or entity, or prevent any person or
+ entity from copying, publishing, distributing or creating derivative
+ works of this work.
+
+License: GPL-2.0+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
.
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE. See the GNU General Public License for more
- details.
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
.
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
.
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
License: NVIDIA-graphics-drivers
License For Customer Use of NVIDIA Software
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/detect/nvidia-detect.in nvidia-graphics-drivers-304.84/debian/detect/nvidia-detect.in
--- nvidia-graphics-drivers-304.64/debian/detect/nvidia-detect.in 2013-01-08 13:13:08.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/detect/nvidia-detect.in 2013-03-15 11:34:33.000000000 +0100
@@ -1,5 +1,22 @@
#!/bin/bash
# Based on http://wiki.debian.org/NvidiaGraphicsDrivers?action=AttachFile&do=view&target=nvidia-versions.sh
+#
+# Copyright © 2008-2011 Filipus Klutiero <chea...@gmail.com>
+# Copyright © 2011-2013 Andreas Beckmann <a...@debian.org>
+#
+# This package is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This package is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+#
if [ "$1" = "--help" ]; then
echo "Usage: nvidia-detect [PCIID]"
@@ -89,6 +106,7 @@
if [[ ${#VERSIONS[*]} == 0 ]]; then
echo "Uh oh. Your card is not supported by any driver version up to $LATEST."
echo "A newer driver may add support for your card."
+ echo "Newer driver releases may be available in backports."
exit 0;
fi
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/module/conftest.h nvidia-graphics-drivers-304.84/debian/module/conftest.h
--- nvidia-graphics-drivers-304.64/debian/module/conftest.h 2012-11-07 10:14:56.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/module/conftest.h 2013-03-15 11:34:34.000000000 +0100
@@ -1,4 +1,4 @@
-/* synchronized with conftest.sh from 310.14, 304.64, 295.75, 173.14.36, 96.43.23, 71.86.15 */
+/* synchronized with conftest.sh from 313.26, 310.40, 304.84, 295.75, 173.14.37, 96.43.23, 71.86.15 */
#ifndef LINUX_VERSION_CODE
#include <linux/version.h>
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/module/debian/kernel-version nvidia-graphics-drivers-304.84/debian/module/debian/kernel-version
--- nvidia-graphics-drivers-304.64/debian/module/debian/kernel-version 2012-02-15 21:37:52.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/module/debian/kernel-version 2013-03-15 11:34:34.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 --exclude '*.run' nvidia-graphics-drivers-304.64/debian/module/debian/patches/kernel-3.7.patch nvidia-graphics-drivers-304.84/debian/module/debian/patches/kernel-3.7.patch
--- nvidia-graphics-drivers-304.64/debian/module/debian/patches/kernel-3.7.patch 2013-01-08 13:13:08.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/module/debian/patches/kernel-3.7.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-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
-
---- nvidia-304.64.orig/nv-mmap.c 2012-10-30 17:58:25.000000000 +0000
-+++ nvidia-304.64/nv-mmap.c 2013-01-08 10:13:20.152603291 +0000
-@@ -463,6 +463,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
-+
- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
-
- #if defined(VM_DRIVER_PAGES)
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/module/debian/patches/patch-3.0-rt-nvidia.patch nvidia-graphics-drivers-304.84/debian/module/debian/patches/patch-3.0-rt-nvidia.patch
--- nvidia-graphics-drivers-304.64/debian/module/debian/patches/patch-3.0-rt-nvidia.patch 2012-04-04 13:29:03.000000000 +0200
+++ nvidia-graphics-drivers-304.84/debian/module/debian/patches/patch-3.0-rt-nvidia.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,51 +0,0 @@
-Description: add support for RT kernel
- Fixes
- FATAL: modpost: GPL-incompatible module nvidia.ko uses GPL-only symbol
- 'migrate_enable'
-Origin: vendor, http://aur.archlinux.org/packages.php?ID=12132
-Bug: http://www.nvnews.net/vbulletin/showthread.php?t=165238
-Bug-Debian: http://bugs.debian.org/641654
-Forwarded: no
-Last-Update: 2012-04-04
-
---- a/nv-linux.h 2011-10-26 13:35:32.866579965 +0200
-+++ b/nv-linux.h 2011-10-26 13:35:47.265117607 +0200
-@@ -265,17 +265,17 @@
- #endif
- #endif
-
--#if defined(CONFIG_PREEMPT_RT)
--typedef atomic_spinlock_t nv_spinlock_t;
--#define NV_SPIN_LOCK_INIT(lock) atomic_spin_lock_init(lock)
--#define NV_SPIN_LOCK_IRQ(lock) atomic_spin_lock_irq(lock)
--#define NV_SPIN_UNLOCK_IRQ(lock) atomic_spin_unlock_irq(lock)
--#define NV_SPIN_LOCK_IRQSAVE(lock,flags) atomic_spin_lock_irqsave(lock,flags)
-+#if defined(CONFIG_PREEMPT_RT_FULL)
-+typedef raw_spinlock_t nv_spinlock_t;
-+#define NV_SPIN_LOCK_INIT(lock) raw_spin_lock_init(lock)
-+#define NV_SPIN_LOCK_IRQ(lock) raw_spin_lock_irq(lock)
-+#define NV_SPIN_UNLOCK_IRQ(lock) raw_spin_unlock_irq(lock)
-+#define NV_SPIN_LOCK_IRQSAVE(lock,flags) raw_spin_lock_irqsave(lock,flags)
- #define NV_SPIN_UNLOCK_IRQRESTORE(lock,flags) \
-- atomic_spin_unlock_irqrestore(lock,flags)
--#define NV_SPIN_LOCK(lock) atomic_spin_lock(lock)
--#define NV_SPIN_UNLOCK(lock) atomic_spin_unlock(lock)
--#define NV_SPIN_UNLOCK_WAIT(lock) atomic_spin_unlock_wait(lock)
-+ raw_spin_unlock_irqrestore(lock,flags)
-+#define NV_SPIN_LOCK(lock) raw_spin_lock(lock)
-+#define NV_SPIN_UNLOCK(lock) raw_spin_unlock(lock)
-+#define NV_SPIN_UNLOCK_WAIT(lock) raw_spin_unlock_wait(lock)
- #else
- typedef spinlock_t nv_spinlock_t;
- #define NV_SPIN_LOCK_INIT(lock) spin_lock_init(lock)
-@@ -852,8 +852,8 @@
- return ret;
- }
-
--#if defined(CONFIG_PREEMPT_RT)
--#define NV_INIT_MUTEX(mutex) semaphore_init(mutex)
-+#if defined(CONFIG_PREEMPT_RT_FULL)
-+#define NV_INIT_MUTEX(mutex) sema_init(mutex,1)
- #else
- #if !defined(__SEMAPHORE_INITIALIZER) && defined(__COMPAT_SEMAPHORE_INITIALIZER)
- #define __SEMAPHORE_INITIALIZER __COMPAT_SEMAPHORE_INITIALIZER
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/module/debian/patches/series nvidia-graphics-drivers-304.84/debian/module/debian/patches/series
--- nvidia-graphics-drivers-304.64/debian/module/debian/patches/series 2013-01-08 13:13:08.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/module/debian/patches/series 2013-03-15 11:34:33.000000000 +0100
@@ -1,7 +1,5 @@
-#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.7.patch
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/nvidia-cuda-proxy.dirs nvidia-graphics-drivers-304.84/debian/nvidia-cuda-proxy.dirs
--- nvidia-graphics-drivers-304.64/debian/nvidia-cuda-proxy.dirs 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/nvidia-cuda-proxy.dirs 2013-03-15 11:34:34.000000000 +0100
@@ -0,0 +1 @@
+var/log/nvidia-proxy
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/nvidia-cuda-proxy.install nvidia-graphics-drivers-304.84/debian/nvidia-cuda-proxy.install
--- nvidia-graphics-drivers-304.64/debian/nvidia-cuda-proxy.install 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/nvidia-cuda-proxy.install 2013-03-15 11:34:34.000000000 +0100
@@ -0,0 +1,2 @@
+nvidia-cuda-proxy-control usr/bin/
+nvidia-cuda-proxy-server usr/sbin/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/nvidia-cuda-proxy.lintian-overrides nvidia-graphics-drivers-304.84/debian/nvidia-cuda-proxy.lintian-overrides
--- nvidia-graphics-drivers-304.64/debian/nvidia-cuda-proxy.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/nvidia-cuda-proxy.lintian-overrides 2013-03-15 11:34:34.000000000 +0100
@@ -0,0 +1,3 @@
+# The NVIDIA license does not allow any form of modification.
+hardening-no-fortify-functions
+hardening-no-relro
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/nvidia-cuda-proxy.manpages nvidia-graphics-drivers-304.84/debian/nvidia-cuda-proxy.manpages
--- nvidia-graphics-drivers-304.64/debian/nvidia-cuda-proxy.manpages 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/nvidia-cuda-proxy.manpages 2013-03-15 11:34:34.000000000 +0100
@@ -0,0 +1 @@
+debian/tmp/nvidia-cuda-proxy-control.1.gz
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/nvidia-glx.README.Debian.in nvidia-graphics-drivers-304.84/debian/nvidia-glx.README.Debian.in
--- nvidia-graphics-drivers-304.64/debian/nvidia-glx.README.Debian.in 2012-02-15 21:37:53.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/nvidia-glx.README.Debian.in 2013-03-15 11:34:34.000000000 +0100
@@ -44,6 +44,22 @@
for descriptions of all supported NVIDIA driver specific options.
+NOTES ABOUT REPORTING BUGS TO NVIDIA:
+-----------------------------------------------------------------------
+
+The NVIDIA graphics driver is a non-free closed-source product. Therefore
+the package maintainers are limited to fixing bugs in the packaging.
+Bugs in the the "graphics functionality" like graphical distortions,
+performance regressions, hardware support, ... can only be fixed upstream
+and should be reported directly to NVIDIA because this includes collecting
+system information (with the nvidia-bug-report.sh script that is included
+in the nvidia-glx#LEGACY# package) on the affected system.
+NVIDIA's bug reporting instructions can be found here:
+ https://devtalk.nvidia.com/default/topic/522835/linux/if-you-have-a-problem-please-read-this-first/
+You may additionally report the problem in the distribution's bug tracker,
+but please include a link the related thread(s) in the NVIDIA forum.
+
+
NOTES ABOUT 'EQ overflowing. The server is probably stuck in an infinite loop.'
-----------------------------------------------------------------------
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.64/debian/rules.defs nvidia-graphics-drivers-304.84/debian/rules.defs
--- nvidia-graphics-drivers-304.64/debian/rules.defs 2012-11-07 10:14:56.000000000 +0100
+++ nvidia-graphics-drivers-304.84/debian/rules.defs 2013-03-15 11:34:34.000000000 +0100
@@ -2,8 +2,8 @@
#NVIDIA_LEGACY =
WATCH_VERSION = 304
-XORG_ABI_LIST = 13 12 11 10 8 6.0
-XORG_BOUND = (<< 2:1.13.99)
+XORG_ABI_LIST = 14 13 12 11 10 8 6.0
+XORG_BOUND = (<< 2:1.14.99)
NVIDIA_DIRNAME_X86 = NVIDIA-Linux-x86-${NVIDIA_RELEASE}
NVIDIA_DIRNAME_X86_64 = NVIDIA-Linux-x86_64-${NVIDIA_RELEASE}
diffstat for nvidia-settings-304.64 nvidia-settings-304.84
debian/changelog | 7 +++++++
debian/control | 3 +--
debian/copyright | 2 +-
doc/version.mk | 2 +-
samples/version.mk | 2 +-
src/gtk+-2.x/ctkcolorcorrection.c | 19 ++++++++++---------
src/gtk+-2.x/ctkcolorcorrection.h | 4 +---
src/gtk+-2.x/ctkcolorcorrectionpage.c | 5 ++---
src/gtk+-2.x/ctkcolorcorrectionpage.h | 3 +--
src/gtk+-2.x/ctkdisplaydevice.c | 1 -
src/gtk+-2.x/ctkdisplaydevice.h | 1 -
src/gtk+-2.x/ctkmultisample.c | 2 +-
src/gtk+-2.x/ctkwindow.c | 5 ++---
src/libXNVCtrl/libXNVCtrl.a |binary
src/version.mk | 2 +-
version.mk | 2 +-
16 files changed, 30 insertions(+), 30 deletions(-)
diff -Nru nvidia-settings-304.64/debian/changelog nvidia-settings-304.84/debian/changelog
--- nvidia-settings-304.64/debian/changelog 2012-11-07 11:02:15.000000000 +0100
+++ nvidia-settings-304.84/debian/changelog 2013-03-10 16:00:54.000000000 +0100
@@ -1,3 +1,10 @@
+nvidia-settings (304.84-1) unstable; urgency=low
+
+ * New upstream release 304.84.
+ * Update my email address and drop DMUA.
+
+ -- Andreas Beckmann <a...@debian.org> Sun, 10 Mar 2013 16:00:54 +0100
+
nvidia-settings (304.64-1) unstable; urgency=low
* New upstream release 304.64.
diff -Nru nvidia-settings-304.64/debian/control nvidia-settings-304.84/debian/control
--- nvidia-settings-304.64/debian/control 2012-07-31 17:24:52.000000000 +0200
+++ nvidia-settings-304.84/debian/control 2013-03-10 15:58:40.000000000 +0100
@@ -3,9 +3,8 @@
Priority: optional
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-de...@lists.alioth.debian.org>
Uploaders: Fathi Boudra <f...@debian.org>,
- Andreas Beckmann <deb...@abeckmann.de>,
+ Andreas Beckmann <a...@debian.org>,
Russ Allbery <r...@debian.org>
-DM-Upload-Allowed: yes
Build-Depends:
debhelper (>= 9),
m4,
diff -Nru nvidia-settings-304.64/debian/copyright nvidia-settings-304.84/debian/copyright
--- nvidia-settings-304.64/debian/copyright 2012-05-09 13:04:41.000000000 +0200
+++ nvidia-settings-304.84/debian/copyright 2013-03-10 15:58:42.000000000 +0100
@@ -86,7 +86,7 @@
Files: debian/*
Copyright: © 2004-2010 Randall Donald <rdon...@debian.org>
© 2009-2010 Fathi Boudra <f...@debian.org>
- © 2011-2012 Andreas Beckmann <deb...@abeckmann.de>
+ © 2011-2013 Andreas Beckmann <a...@debian.org>
License: GPL-2
License: GPL-2
diff -Nru nvidia-settings-304.64/doc/version.mk nvidia-settings-304.84/doc/version.mk
--- nvidia-settings-304.64/doc/version.mk 2012-10-30 20:22:52.000000000 +0100
+++ nvidia-settings-304.84/doc/version.mk 2013-02-27 15:09:06.000000000 +0100
@@ -1 +1 @@
-NVIDIA_VERSION = 304.64
+NVIDIA_VERSION = 304.84
diff -Nru nvidia-settings-304.64/samples/version.mk nvidia-settings-304.84/samples/version.mk
--- nvidia-settings-304.64/samples/version.mk 2012-10-30 20:22:52.000000000 +0100
+++ nvidia-settings-304.84/samples/version.mk 2013-02-27 15:09:06.000000000 +0100
@@ -1 +1 @@
-NVIDIA_VERSION = 304.64
+NVIDIA_VERSION = 304.84
diff -Nru nvidia-settings-304.64/src/gtk+-2.x/ctkcolorcorrection.c nvidia-settings-304.84/src/gtk+-2.x/ctkcolorcorrection.c
--- nvidia-settings-304.64/src/gtk+-2.x/ctkcolorcorrection.c 2012-10-30 20:22:52.000000000 +0100
+++ nvidia-settings-304.84/src/gtk+-2.x/ctkcolorcorrection.c 2013-02-27 15:09:06.000000000 +0100
@@ -1008,18 +1008,19 @@
} /* do_confirm_countdown() */
-GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *table,
- const gchar *title,
- gboolean randr)
+GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *table)
{
GtkTextIter i;
GtkTextBuffer *b;
-
+ const gchar *title = "X Server Color Correction";
+
b = gtk_text_buffer_new(table);
gtk_text_buffer_get_iter_at_offset(b, &i, 0);
- ctk_color_correction_tab_help(b, &i, title, randr);
+ ctk_help_title(b, &i, "%s Help", title);
+
+ ctk_color_correction_tab_help(b, &i, title, FALSE /* randr */);
ctk_help_heading(b, &i, "Reset Hardware Defaults");
ctk_help_para(b, &i, __resest_button_help);
@@ -1034,12 +1035,12 @@
const gchar *title,
gboolean randr)
{
- ctk_help_title(b, i, "%s Help", title);
+ ctk_help_heading(b, i, "Color Correction");
- ctk_help_heading(b, i, "Active Color Channel");
+ ctk_help_term(b, i, "Active Color Channel");
ctk_help_para(b, i, __active_color_help);
- ctk_help_heading(b, i, "Brightness, Contrast and Gamma");
+ ctk_help_term(b, i, "Brightness, Contrast and Gamma");
ctk_help_para(b, i, "The Brightness, Contrast and Gamma sliders "
"allow you to adjust the brightness, contrast, "
"or gamma values for the selected color channel(s). This "
@@ -1066,6 +1067,6 @@
"to manipulate the X screen's gamma ramps", title);
}
- ctk_help_heading(b, i, "Confirm Current Changes");
+ ctk_help_term(b, i, "Confirm Current Changes");
ctk_help_para(b, i, __confirm_button_help);
}
diff -Nru nvidia-settings-304.64/src/gtk+-2.x/ctkcolorcorrection.h nvidia-settings-304.84/src/gtk+-2.x/ctkcolorcorrection.h
--- nvidia-settings-304.64/src/gtk+-2.x/ctkcolorcorrection.h 2012-10-30 20:22:53.000000000 +0100
+++ nvidia-settings-304.84/src/gtk+-2.x/ctkcolorcorrection.h 2013-02-27 15:09:07.000000000 +0100
@@ -79,9 +79,7 @@
GtkWidget* ctk_color_correction_new (NvCtrlAttributeHandle *,
CtkConfig *, ParsedAttribute *,
CtkEvent *);
-GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *,
- const gchar *title,
- gboolean randr);
+GtkTextBuffer *ctk_color_correction_create_help(GtkTextTagTable *);
void ctk_color_correction_tab_help(GtkTextBuffer *b, GtkTextIter *i,
const gchar *title,
gboolean randr);
diff -Nru nvidia-settings-304.64/src/gtk+-2.x/ctkcolorcorrectionpage.c nvidia-settings-304.84/src/gtk+-2.x/ctkcolorcorrectionpage.c
--- nvidia-settings-304.64/src/gtk+-2.x/ctkcolorcorrectionpage.c 2012-10-30 20:22:52.000000000 +0100
+++ nvidia-settings-304.84/src/gtk+-2.x/ctkcolorcorrectionpage.c 2013-02-27 15:09:06.000000000 +0100
@@ -123,8 +123,7 @@
}
-GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *table,
- const gchar *title)
+GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *table)
{
- return ctk_color_correction_create_help(table, title, FALSE /* randr */);
+ return ctk_color_correction_create_help(table);
}
diff -Nru nvidia-settings-304.64/src/gtk+-2.x/ctkcolorcorrectionpage.h nvidia-settings-304.84/src/gtk+-2.x/ctkcolorcorrectionpage.h
--- nvidia-settings-304.64/src/gtk+-2.x/ctkcolorcorrectionpage.h 2012-10-30 20:22:53.000000000 +0100
+++ nvidia-settings-304.84/src/gtk+-2.x/ctkcolorcorrectionpage.h 2013-02-27 15:09:07.000000000 +0100
@@ -79,8 +79,7 @@
GtkWidget* ctk_color_correction_page_new (NvCtrlAttributeHandle *,
CtkConfig *, ParsedAttribute *,
CtkEvent *);
-GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *,
- const gchar *title);
+GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *);
G_END_DECLS
diff -Nru nvidia-settings-304.64/src/gtk+-2.x/ctkdisplaydevice.c nvidia-settings-304.84/src/gtk+-2.x/ctkdisplaydevice.c
--- nvidia-settings-304.64/src/gtk+-2.x/ctkdisplaydevice.c 2012-10-30 20:22:52.000000000 +0100
+++ nvidia-settings-304.84/src/gtk+-2.x/ctkdisplaydevice.c 2013-02-27 15:09:06.000000000 +0100
@@ -897,7 +897,6 @@
if (ctk_color_correction == NULL) {
return;
}
- ctk_object->color_correction_tab = ctk_color_correction;
ctk_object->color_correction_available = TRUE;
box = gtk_hbox_new(FALSE, 0);
diff -Nru nvidia-settings-304.64/src/gtk+-2.x/ctkdisplaydevice.h nvidia-settings-304.84/src/gtk+-2.x/ctkdisplaydevice.h
--- nvidia-settings-304.64/src/gtk+-2.x/ctkdisplaydevice.h 2012-10-30 20:22:53.000000000 +0100
+++ nvidia-settings-304.84/src/gtk+-2.x/ctkdisplaydevice.h 2013-02-27 15:09:07.000000000 +0100
@@ -71,7 +71,6 @@
GtkWidget *edid;
GtkWidget *dithering_controls;
GtkWidget *color_controls;
- GtkWidget *color_correction_tab;
gboolean color_correction_available;
diff -Nru nvidia-settings-304.64/src/gtk+-2.x/ctkmultisample.c nvidia-settings-304.84/src/gtk+-2.x/ctkmultisample.c
--- nvidia-settings-304.64/src/gtk+-2.x/ctkmultisample.c 2012-10-30 20:22:52.000000000 +0100
+++ nvidia-settings-304.84/src/gtk+-2.x/ctkmultisample.c 2013-02-27 15:09:06.000000000 +0100
@@ -372,7 +372,7 @@
for (i = 0; i < ctk_multisample->fsaa_translation_table_size; i++)
ctk_multisample->active_attributes |=
- (1 << (__FSAA+ctk_multisample->fsaa_translation_table[i]));
+ (__FSAA << ctk_multisample->fsaa_translation_table[i]);
/* FXAA Option button */
diff -Nru nvidia-settings-304.64/src/gtk+-2.x/ctkwindow.c nvidia-settings-304.84/src/gtk+-2.x/ctkwindow.c
--- nvidia-settings-304.64/src/gtk+-2.x/ctkwindow.c 2012-10-30 20:22:52.000000000 +0100
+++ nvidia-settings-304.84/src/gtk+-2.x/ctkwindow.c 2013-02-27 15:09:06.000000000 +0100
@@ -687,10 +687,9 @@
ctk_window->attribute_list,
ctk_event);
if (child) {
- const char *title = "X Server Color Correction";
- help = ctk_color_correction_page_create_help(tag_table, title);
+ help = ctk_color_correction_page_create_help(tag_table);
add_page(child, help, ctk_window, &iter, NULL,
- title, NULL, NULL, NULL);
+ "X Server Color Correction", NULL, NULL, NULL);
}
}
Binary files /tmp/j6osCHtl0I/nvidia-settings-304.64/src/libXNVCtrl/libXNVCtrl.a and /tmp/Es0c4OqooJ/nvidia-settings-304.84/src/libXNVCtrl/libXNVCtrl.a differ
diff -Nru nvidia-settings-304.64/src/version.mk nvidia-settings-304.84/src/version.mk
--- nvidia-settings-304.64/src/version.mk 2012-10-30 20:22:52.000000000 +0100
+++ nvidia-settings-304.84/src/version.mk 2013-02-27 15:09:06.000000000 +0100
@@ -1 +1 @@
-NVIDIA_VERSION = 304.64
+NVIDIA_VERSION = 304.84
diff -Nru nvidia-settings-304.64/version.mk nvidia-settings-304.84/version.mk
--- nvidia-settings-304.64/version.mk 2012-10-30 20:22:52.000000000 +0100
+++ nvidia-settings-304.84/version.mk 2013-02-27 15:09:06.000000000 +0100
@@ -1 +1 @@
-NVIDIA_VERSION = 304.64
+NVIDIA_VERSION = 304.84
diffstat for nvidia-graphics-modules-304.64+1 nvidia-graphics-modules-304.84+1
changelog | 7 +++++++
control | 11 +++++------
control.md5sum | 6 +++---
control.source | 3 +--
copyright | 2 +-
5 files changed, 17 insertions(+), 12 deletions(-)
diff -Nru nvidia-graphics-modules-304.64+1/debian/changelog nvidia-graphics-modules-304.84+1/debian/changelog
--- nvidia-graphics-modules-304.64+1/debian/changelog 2012-11-08 20:07:37.000000000 +0100
+++ nvidia-graphics-modules-304.84+1/debian/changelog 2013-03-16 14:47:35.000000000 +0100
@@ -1,3 +1,10 @@
+nvidia-graphics-modules (304.84+1) unstable; urgency=low
+
+ * Use nvidia-kernel-source 304.84.
+ * Update my email address and remove DMUA.
+
+ -- Andreas Beckmann <a...@debian.org> Sat, 16 Mar 2013 14:45:12 +0100
+
nvidia-graphics-modules (304.64+1) unstable; urgency=low
* Use nvidia-kernel-source 304.64.
diff -Nru nvidia-graphics-modules-304.64+1/debian/control nvidia-graphics-modules-304.84+1/debian/control
--- nvidia-graphics-modules-304.64+1/debian/control 2012-11-08 20:07:37.000000000 +0100
+++ nvidia-graphics-modules-304.84+1/debian/control 2013-03-16 14:47:35.000000000 +0100
@@ -4,11 +4,10 @@
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-de...@lists.alioth.debian.org>
Uploaders:
Russ Allbery <r...@debian.org>,
- Andreas Beckmann <deb...@abeckmann.de>,
-DM-Upload-Allowed: yes
+ Andreas Beckmann <a...@debian.org>,
Build-Depends: debhelper (>= 8),
linux-headers-3.2.0-4-amd64 [i386 amd64], linux-headers-3.2.0-4-486 [i386], linux-headers-3.2.0-4-686-pae [i386],
- nvidia-kernel-source (>= 304.64), nvidia-kernel-source (<< 304.64.0~),
+ nvidia-kernel-source (>= 304.84), nvidia-kernel-source (<< 304.84.0~),
Standards-Version: 3.9.3
Homepage: http://www.nvidia.com/
Vcs-Git: git://git.debian.org/git/pkg-nvidia/nvidia-graphics-modules.git
@@ -17,7 +16,7 @@
Package: nvidia-kernel-amd64
Architecture: i386 amd64
-Depends: ${misc:Depends}, nvidia-kernel-3.2.0-4-amd64 (>= 304.64)
+Depends: ${misc:Depends}, nvidia-kernel-3.2.0-4-amd64 (>= 304.84)
Breaks: nvidia-kernel-2.6-amd64 (<< 295)
Replaces: nvidia-kernel-2.6-amd64 (<< 295)
Description: NVIDIA kernel module for Linux (amd64 flavor)
@@ -45,7 +44,7 @@
Package: nvidia-kernel-486
Architecture: i386
-Depends: ${misc:Depends}, nvidia-kernel-3.2.0-4-486 (>= 304.64)
+Depends: ${misc:Depends}, nvidia-kernel-3.2.0-4-486 (>= 304.84)
Breaks: nvidia-kernel-2.6-486 (<< 295)
Replaces: nvidia-kernel-2.6-486 (<< 295)
Description: NVIDIA kernel module for Linux (486 flavor)
@@ -73,7 +72,7 @@
Package: nvidia-kernel-686-pae
Architecture: i386
-Depends: ${misc:Depends}, nvidia-kernel-3.2.0-4-686-pae (>= 304.64)
+Depends: ${misc:Depends}, nvidia-kernel-3.2.0-4-686-pae (>= 304.84)
Breaks: nvidia-kernel-2.6-686-pae (<< 295)
Replaces: nvidia-kernel-2.6-686-pae (<< 295)
Description: NVIDIA kernel module for Linux (686-pae flavor)
diff -Nru nvidia-graphics-modules-304.64+1/debian/control.md5sum nvidia-graphics-modules-304.84+1/debian/control.md5sum
--- nvidia-graphics-modules-304.64+1/debian/control.md5sum 2012-11-08 20:07:37.000000000 +0100
+++ nvidia-graphics-modules-304.84+1/debian/control.md5sum 2013-03-16 14:47:35.000000000 +0100
@@ -1,6 +1,6 @@
-d8be4465c3146f1957ca259160b8c036 debian/control
-d1d71a255d2fc8e281b325feb948db80 debian/control.source
+e184bc47531b1a16be6db8d997b7e7b3 debian/control
+74ea8851c11c68068eb126a0581cd61b debian/control.source
8dce140a73e725f1cd59a7aef8ecc83d debian/control.flavor
737e968161571039c186e1855b948ef6 debian/rules
f55dbcf51f647cd76be27c83effbc5ca debian/rules.defs
-#UPSTREAM_VERSION=304.64#
+#UPSTREAM_VERSION=304.84#
diff -Nru nvidia-graphics-modules-304.64+1/debian/control.source nvidia-graphics-modules-304.84+1/debian/control.source
--- nvidia-graphics-modules-304.64+1/debian/control.source 2012-11-08 20:07:37.000000000 +0100
+++ nvidia-graphics-modules-304.84+1/debian/control.source 2013-03-16 14:47:35.000000000 +0100
@@ -4,8 +4,7 @@
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-de...@lists.alioth.debian.org>
Uploaders:
Russ Allbery <r...@debian.org>,
- Andreas Beckmann <deb...@abeckmann.de>,
-DM-Upload-Allowed: yes
+ Andreas Beckmann <a...@debian.org>,
Build-Depends: debhelper (>= 8),
#LINUX_HEADERS#
#SOURCE_PKG# (>= #UPSTREAM_VERSION##SOURCE_MIN_REV#), #SOURCE_PKG# (<< #UPSTREAM_VERSION##SOURCE_MAX_SUFFIX#),
diff -Nru nvidia-graphics-modules-304.64+1/debian/copyright nvidia-graphics-modules-304.84+1/debian/copyright
--- nvidia-graphics-modules-304.64+1/debian/copyright 2012-11-08 20:07:37.000000000 +0100
+++ nvidia-graphics-modules-304.84+1/debian/copyright 2013-03-16 14:47:35.000000000 +0100
@@ -16,7 +16,7 @@
Files: *
Copyright: 2003 Randall Donald <rdon...@debian.org>
- 2010-2012 Andreas Beckmann <deb...@abeckmann.de>
+ © 2010-2013 Andreas Beckmann <a...@debian.org>
2010 Russ Allbery <r...@debian.org>
Based on packages by Christopher Cheney.
License: GPL-2+
