[pkg-nvidia-devel] r1203 - in /packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian: changelog control module/debian/rules nvidia-glx.lintian-overrides.in nvidia-kernel-dkms.dkms rules
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Tue Jun 29 12:13:34 UTC 2010
Author: anbe-guest
Date: Tue Jun 29 12:13:31 2010
New Revision: 1203
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1203
Log:
synchronize packaging with nvidia-graphics-drivers 195.36.24-4 (r1130)
Modified:
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/rules
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.lintian-overrides.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-kernel-dkms.dkms
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog?rev=1203&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog Tue Jun 29 12:13:31 2010
@@ -1,3 +1,13 @@
+nvidia-graphics-drivers-legacy-173xx (173.14.25-2.1) UNRELEASED; urgency=low
+
+ [ Andreas Beckmann ]
+ * synchronize packaging with nvidia-graphics-drivers 195.36.24-4
+ - nvidia-glx now provides xserver-xorg-video-6
+ - add Conflicts: nvidia-glx-legacy that was never really taken care of
+ - drop Conflicts: ccache, set CCACHE_DISABLE instead
+
+ -- Andreas Beckmann <debian at abeckmann.de> Tue, 29 Jun 2010 13:51:58 +0200
+
nvidia-graphics-drivers-legacy-173xx (173.14.25-2) unstable; urgency=low
[ Andreas Beckmann ]
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control?rev=1203&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control Tue Jun 29 12:13:31 2010
@@ -22,8 +22,10 @@
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
Breaks: xserver-xorg-core (<< 2:1.6)
+Provides: xserver-xorg-video-6
Conflicts:
nvidia-glx,
+ nvidia-glx-legacy,
nvidia-glx-legacy-71xx,
nvidia-glx-legacy-96xx,
fglrx-glx,
@@ -90,6 +92,7 @@
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
Conflicts:
nvidia-glx-ia32,
+ nvidia-glx-legacy-ia32,
nvidia-glx-legacy-71xx-ia32,
nvidia-glx-legacy-96xx-ia32,
Description: NVIDIA binary driver 32bit libs${nvidia:LegacyDesc}
@@ -146,6 +149,7 @@
Recommends: libgl1-mesa-dev | libgl-dev
Conflicts:
nvidia-glx,
+ nvidia-glx-legacy,
nvidia-glx-legacy-71xx,
nvidia-glx-legacy-96xx,
Description: NVIDIA binary Xorg driver development files${nvidia:LegacyDesc}
@@ -170,8 +174,7 @@
nvidia-kernel-dkms,
nvidia-kernel-legacy-71xx-dkms,
nvidia-kernel-legacy-96xx-dkms,
- binutils-gold (>> 2.20.51),
- ccache (<< 3.0~),
+ 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.
@@ -229,9 +232,7 @@
Depends: ${misc:Depends}, debhelper (>= 7.2.3~), 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),
- ccache (<< 3.0~),
+Conflicts: 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-173xx/trunk/debian/module/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/rules?rev=1203&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/rules (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/rules Tue Jun 29 12:13:31 2010
@@ -1,4 +1,8 @@
#!/usr/bin/make -f
+
+# Disable ccache, which causes strange build failures with the module.
+# See Bug#582748.
+export CCACHE_DISABLE := 1
CFLAGS = -Wall -g
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.lintian-overrides.in?rev=1203&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.lintian-overrides.in Tue Jun 29 12:13:31 2010
@@ -17,3 +17,8 @@
# Referenced by upstream documentation.
nvidia-glx#LEGACY#: script-with-language-extension usr/bin/nvidia-bug-report.sh
+
+# This package is a strange special case since it overrides standard
+# libraries and diverts them, so the package name won't ever be able to
+# match the library names it provides.
+nvidia-glx#LEGACY#: package-name-doesnt-match-sonames
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-kernel-dkms.dkms
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-kernel-dkms.dkms?rev=1203&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-kernel-dkms.dkms (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-kernel-dkms.dkms Tue Jun 29 12:13:31 2010
@@ -8,5 +8,6 @@
DEST_MODULE_LOCATION[0]="/updates/dkms/"
AUTOINSTALL=yes
-MAKE[0]="make -C . LINUXDIR=${kernel_source_dir} KVERREL=${kernelver}"
+MAKE[0]="env CCACHE_DISABLE=1 \
+ make -C . LINUXDIR=${kernel_source_dir} KVERREL=${kernelver}"
CLEAN="make -C . LINUXDIR=${kernel_source_dir} KVERREL=${kernelver} clean"
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules?rev=1203&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules Tue Jun 29 12:13:31 2010
@@ -144,6 +144,9 @@
override_dh_bugfiles:
dh_bugfiles -A
+override_dh_makeshlibs:
+ dh_makeshlibs -Xusr/lib/vdpau
+
override_dh_gencontrol:
dh_gencontrol -- -V'nvidia:Version=$(version)' -V'nvidia:Legacy=$(legacy)' \
-V'nvidia:LegacyDesc=$(if $(NVIDIA_LEGACY), ($(NVIDIA_LEGACY)xx legacy version))'
@@ -160,7 +163,6 @@
# Stripping the binary modules would constitute modifying the binary files
# in a way other than unzipping of compressed files.
override_dh_strip:
- # running dh_strip is not permitted by the NVIDIA license
# Generating control files
More information about the Pkg-nvidia-devel
mailing list