[pkg-nvidia-devel] r829 - /packages/nvidia-graphics-drivers/trunk/debian/
rra at users.alioth.debian.org
rra at users.alioth.debian.org
Sun Apr 25 04:42:19 UTC 2010
Author: rra
Date: Sun Apr 25 04:41:46 2010
New Revision: 829
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=829
Log:
Switch to dh_install
[ Andreas Beckmann ]
* debian/rules, debian/*.install.in: use dh_install instead of manual
installation
* debian/*.dirs: remove or minimize
Removed:
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.dirs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.lintian-overrides
packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.dirs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-dev.dirs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.dirs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1.dirs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver-ia32.dirs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.dirs
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.dirs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.dirs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.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=829&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Apr 25 04:41:46 2010
@@ -73,6 +73,9 @@
in etch or later), the file is provided by libgl1-mesa-swx11-dev which
conflicts with nvidia-glx
* remove empty maintainer script nvidia-glx-dev.preinst.in
+ * debian/rules, debian/*.install.in: use dh_install instead of manual
+ installation
+ * debian/*.dirs: remove or minimize
-- Russ Allbery <rra at debian.org> Sat, 24 Apr 2010 20:35:20 -0700
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.dirs?rev=829&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.dirs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.dirs Sun Apr 25 04:41:46 2010
@@ -1,2 +1,1 @@
usr/lib32/nvidia
-usr/lib32/tls
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.dirs?rev=829&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.dirs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.dirs Sun Apr 25 04:41:46 2010
@@ -1,10 +1,1 @@
-usr/bin
-usr/lib
-usr/share/lintian/overrides
-usr/lib/xorg/modules/drivers
-usr/lib/xorg/modules/extensions
-usr/lib/tls
usr/lib/nvidia
-etc
-etc/default
-etc/init.d
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides?rev=829&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides Sun Apr 25 04:41:46 2010
@@ -10,6 +10,9 @@
# programs don't pick up the wrong libGL by mistake.
nvidia-glx: diversion-for-unknown-file
+# The diversions are placed there.
+nvidia-glx: package-contains-empty-directory usr/lib/nvidia/
+
# Packages built against the NVIDIA libGL should declare dependencies on
# the free version for Debian's purposes.
nvidia-glx: shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=829&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Apr 25 04:41:46 2010
@@ -27,19 +27,29 @@
AUTOGEN = $(AUTOKEEP) $(AUTOCLEAN)
AUTOKEEP = debian/copyright
AUTOCLEAN = \
+debian/nvidia-glx.install \
+debian/nvidia-glx.links \
+debian/nvidia-glx.init \
+debian/nvidia-glx.postrm \
+debian/nvidia-glx-ia32.install \
+debian/nvidia-glx-ia32.links \
+debian/nvidia-glx-dev.install \
debian/nvidia-kernel-source.README.Debian \
-debian/nvidia-glx.links \
+debian/libcuda1.install \
+debian/libcuda1.links \
+debian/libcuda1-ia32.install \
+debian/libcuda1-ia32.links \
+debian/libcuda1-ia32.symbols \
+debian/nvidia-libvdpau-dev.install \
+debian/nvidia-libvdpau1.install \
debian/nvidia-libvdpau1.links \
-debian/nvidia-glx.postrm debian/nvidia-glx.init \
-debian/nvidia-glx-ia32.links \
+debian/nvidia-libvdpau1-ia32.install \
debian/nvidia-libvdpau1-ia32.links \
-debian/libcuda1.install \
-debian/libcuda1-ia32.install \
-debian/libcuda1.links debian/libcuda1-ia32.links \
-debian/libcuda1-ia32.symbols \
debian/nvidia-libvdpau1-ia32.symbols \
+debian/nvidia-vdpau-driver.install \
+debian/nvidia-vdpau-driver.links \
+debian/nvidia-vdpau-driver-ia32.install \
debian/nvidia-vdpau-driver-ia32.links \
-debian/nvidia-vdpau-driver.links \
debian.binary/control.template \
debian.binary/changelog
@@ -123,78 +133,6 @@
dh_testroot
dh_prep
dh_installdirs
-
- install -m 0644 $(CURDIR)/nvidia-kernel.tar.bz2 $(CURDIR)/debian/nvidia-kernel-source/usr/src
-
-
- install $(dirname)/usr/X11R6/lib/modules/drivers/nvidia_drv.so \
- $(CURDIR)/debian/nvidia-glx/usr/lib/xorg/modules/drivers
-
-
-
- install -m 0644 $(dirname)/usr/X11R6/lib/libXvMCNVIDIA.a $(CURDIR)/debian/nvidia-glx-dev/usr/lib/libXvMCNVIDIA.a;
- install $(dirname)/usr/X11R6/lib/libXvMCNVIDIA.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/libXvMCNVIDIA.so.${version};
-
-
-
-
- install -m 0644 $(dirname)/usr/include/GL/gl.h \
- $(CURDIR)/debian/nvidia-glx-dev/usr/include/GL
- install -m 0644 $(dirname)/usr/include/GL/glext.h \
- $(CURDIR)/debian/nvidia-glx-dev/usr/include/GL
-
- install -m 0644 $(dirname)/usr/include/vdpau/vdpau.h \
- $(CURDIR)/debian/nvidia-libvdpau-dev/usr/include/vdpau
- install -m 0644 $(dirname)/usr/include/vdpau/vdpau_x11.h \
- $(CURDIR)/debian/nvidia-libvdpau-dev/usr/include/vdpau
-
- install -m 0644 $(dirname)/usr/include/GL/glx.h \
- $(CURDIR)/debian/nvidia-glx-dev/usr/include/GL
- install -m 0644 $(dirname)/usr/include/GL/glxext.h \
- $(CURDIR)/debian/nvidia-glx-dev/usr/include/GL
-
- install $(dirname)/usr/lib/libGL.so.${version} \
- $(CURDIR)/debian/nvidia-glx/usr/lib
- install $(dirname)/usr/lib/libGLcore.so.${version} \
- $(CURDIR)/debian/nvidia-glx/usr/lib
- install $(dirname)/usr/lib/vdpau/libvdpau_nvidia.so.${version} \
- $(CURDIR)/debian/nvidia-vdpau-driver/usr/lib/vdpau
- install $(dirname)/usr/lib/libvdpau.so.${version} \
- $(CURDIR)/debian/nvidia-libvdpau1/usr/lib
- install $(dirname)/usr/lib/vdpau/libvdpau_trace.so.${version} \
- $(CURDIR)/debian/nvidia-libvdpau1/usr/lib/vdpau
-
- # TLS (nvidia-tls new for 6106)
- #install $(dirname)/usr/lib/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/
- install $(dirname)/usr/lib/tls/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/
-
- #install $(dirname)/usr/lib/tls/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/nvidia
- install $(dirname)/usr/lib/tls/libnvidia-tls.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/tls/
-
- install $(dirname)/usr/lib/libnvidia-cfg.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/
-
-
- install $(dirname)/usr/X11R6/lib/modules/extensions/libglx.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/xorg/modules/extensions/
-
- if [ "$(DEB_BUILD_ARCH)" = "amd64" ] ; then \
- install -D $(dirname)/usr/lib32/libGLcore.so.${version} \
- $(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
- install -D $(dirname)/usr/lib32/libGL.so.${version} \
- $(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
- install -D $(dirname)/usr/lib32/libvdpau.so.${version} \
- $(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32 ; \
- install -D $(dirname)/usr/lib32/vdpau/libvdpau_nvidia.so.${version} \
- $(CURDIR)/debian/nvidia-vdpau-driver-ia32/usr/lib32/vdpau ; \
- install -D $(dirname)/usr/lib32/vdpau/libvdpau_trace.so.${version} \
- $(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32/vdpau ; \
- install -D $(dirname)/usr/lib32/libnvidia-tls.so.${version} \
- $(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
- install -D $(dirname)/usr/lib32/tls/libnvidia-tls.so.${version} \
- $(CURDIR)/debian/nvidia-glx-ia32/usr/lib32/tls ; \
- fi
-
- install $(dirname)/usr/bin/nvidia-bug-report.sh $(CURDIR)/debian/nvidia-glx/usr/bin/
-
dh_install -s
dh_lintian
dh_bugfiles
More information about the Pkg-nvidia-devel
mailing list