[pkg-nvidia-devel] r893 - /packages/nvidia-graphics-drivers/trunk/debian/
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Thu May 20 08:34:50 UTC 2010
Author: anbe-guest
Date: Thu May 20 08:34:40 2010
New Revision: 893
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=893
Log:
* make nvidia-libvdpau* transitional packages that pull libvdpau* instead,
no need to have a non-free variant of the wrapper library that uses a
different search path and would require additional compatibility symlinks
(closes: #581570, #561108, #570390, #578881, #581827, 581828)
Removed:
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-dev.install.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-dev.links
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.install.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.links.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.lintian-overrides
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.docs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.install.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.links.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.lintian-overrides
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.symbols.amd64
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.symbols.i386
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/control
packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides
packages/nvidia-graphics-drivers/trunk/debian/rules
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=893&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Thu May 20 08:34:40 2010
@@ -4,6 +4,10 @@
* add upstream patch NVIDIA_kernel-195.36.24-682377.diff to fix support for
more than one GPU with kernel 2.6.32 (closes: 566874)
* nvidia-glx: add Recommends: nvidia-vdpau-driver
+ * make nvidia-libvdpau* transitional packages that pull libvdpau* instead,
+ no need to have a non-free variant of the wrapper library that uses a
+ different search path and would require additional compatibility symlinks
+ (closes: #581570, #561108, #570390, #578881, #581827, 581828)
-- Andreas Beckmann <debian at abeckmann.de> Thu, 20 May 2010 09:52:43 +0200
Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=893&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Thu May 20 08:34:40 2010
@@ -129,69 +129,48 @@
installed via DKMS, install nvidia-kernel-dkms instead.
Package: nvidia-libvdpau1
-Section: non-free/libs
-Architecture: i386 amd64
-Depends: nvidia-vdpau-driver (>= ${nvidia:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-${nvidia:Version}
-Suggests:
- nvidia-kernel-source (>= ${nvidia:Version})
- | nvidia-kernel-dkms (>= ${nvidia:Version})
-Replaces: nvidia-glx (<< 180.51), nvidia-libvdpau
-Conflicts: nvidia-glx (<< 180.51), nvidia-libvdpau
-Description: NVIDIA vdpau libraries
- These libraries provide the Video Decode and Presentation API for Unix.
- They provide accelerated video playback (incl. H.264) for the supported
- graphics cards.
- .
- This package contains the VDPAU wrapper and trace libraries.
- .
- See /usr/share/doc/nvidia-vdpau-driver/README.txt.gz
- for more information.
+Section: non-free/oldlibs
+Architecture: i386 amd64
+Depends: nvidia-vdpau-driver (>= ${nvidia:Version}), libvdpau1,
+ ${misc:Depends}
+Description: NVIDIA vdpau libraries (transitional package)
+ These libraries provide the Video Decode and Presentation API for Unix.
+ They provide accelerated video playback (incl. H.264) for the supported
+ graphics cards.
+ .
+ This is a transitional dummy package depending on the free version of the
+ VDPAU wrapper and trace libraries.
Package: nvidia-libvdpau1-ia32
-Section: non-free/libs
-Architecture: amd64
-Pre-Depends: libc6-i386 (>= 2.9-18)
-Depends: nvidia-vdpau-driver-ia32 (>= ${nvidia:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-Recommends: nvidia-kernel-${nvidia:Version}
-Suggests:
- nvidia-kernel-source (>= ${nvidia:Version})
- | nvidia-kernel-dkms (>= ${nvidia:Version})
-Replaces: nvidia-glx-ia32 (<< 180.51), nvidia-libvdpau-ia32,
- nvidia-vdpau-driver-ia32 (<< 190.53-3)
-Conflicts: nvidia-glx-ia32 (<< 180.51), nvidia-libvdpau-ia32,
- nvidia-vdpau-driver-ia32 (<< 190.53-3)
-Description: NVIDIA vdpau 32-bit libraries
- These libraries provide the Video Decode and Presentation API for Unix.
- They provide accelerated video playback (incl. H.264) for the supported
- graphics cards.
- .
- This package contains the VDPAU wrapper and trace libraries (32-bit).
- .
- See /usr/share/doc/nvidia-vdpau-driver-ia32/README.txt.gz
- for more information.
+Section: non-free/oldlibs
+Architecture: amd64
+Depends: nvidia-vdpau-driver-ia32 (>= ${nvidia:Version}), lib32vdpau1,
+ ${misc:Depends}
+Description: NVIDIA vdpau 32-bit libraries (transitional package)
+ These libraries provide the Video Decode and Presentation API for Unix.
+ They provide accelerated video playback (incl. H.264) for the supported
+ graphics cards.
+ .
+ This is a transitional dummy package depending on the free version of the
+ VDPAU wrapper and trace libraries (32-bit).
Package: nvidia-libvdpau-dev
-Section: non-free/libdevel
-Architecture: i386 amd64
-Depends: nvidia-libvdpau1 (= ${binary:Version}), ${misc:Depends}
-Conflicts: nvidia-glx-dev (<< 180.51)
-Provides: nvidia-libvdpau1-dev
-Replaces: nvidia-libvdpau, nvidia-glx-dev (<< 180.51)
-Description: NVIDIA vdpau development files
+Section: non-free/oldlibs
+Architecture: i386 amd64
+Depends: libvdpau-dev, ${misc:Depends}
+Description: NVIDIA vdpau development files (transitional package)
The NVIDIA Video Decode and Presentation API for Unix (VDPAU) provides a
complete solution for decoding, post-processing, compositing, and displaying
compressed or uncompressed video streams.
.
- This package contains the VDPAU development files.
+ This is a transitional dummy package depending on the free version of the
+ VDPAU development files.
Package: nvidia-vdpau-driver
Section: non-free/libs
Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends},
- libvdpau1 | nvidia-libvdpau1
+ libvdpau1
Recommends: nvidia-kernel-${nvidia:Version}
Enhances: libvdpau1
Suggests:
@@ -216,7 +195,7 @@
Section: non-free/libs
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends},
- lib32vdpau1 | nvidia-libvdpau1-ia32
+ lib32vdpau1
Recommends: nvidia-kernel-${nvidia:Version}
Enhances: lib32vdpau1
Suggests:
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides?rev=893&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.lintian-overrides Thu May 20 08:34:40 2010
@@ -1,4 +1,5 @@
# The NVIDIA license does not allow any form of modification.
nvidia-vdpau-driver: binary-has-unneeded-section
+nvidia-vdpau-driver: shlib-with-executable-stack
nvidia-vdpau-driver: shlib-with-non-pic-code
nvidia-vdpau-driver: shlib-without-PT_GNU_STACK-section
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=893&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Thu May 20 08:34:40 2010
@@ -18,7 +18,6 @@
TEMPLATES := $(wildcard debian/*.in)
AUTOGEN += $(patsubst %.in,%,$(TEMPLATES))
AUTOGEN += debian/libcuda1-ia32.symbols
-AUTOGEN += debian/nvidia-libvdpau1-ia32.symbols
AUTOGEN += debian/module/debian/control.template
AUTOGEN += debian/module/debian/changelog
AUTOKEEP = debian/copyright
@@ -149,9 +148,6 @@
debian/module/debian/changelog: debian/changelog
sed 's/^nvidia-graphics-drivers/nvidia-kernel/g' $< > $@
-debian/nvidia-libvdpau1-ia32.symbols: debian/nvidia-libvdpau1.symbols.i386
- sed 's/nvidia-libvdpau1/nvidia-libvdpau1-ia32/g' $< > $@
-
debian/libcuda1-ia32.symbols: debian/libcuda1.symbols
sed 's/libcuda1/libcuda1-ia32/g' $< > $@
More information about the Pkg-nvidia-devel
mailing list