[pkg-nvidia-devel] r579 - in /packages/nvidia-graphics-drivers-legacy-173xx/trunk: debian.binary/ debian/
rdonald at users.alioth.debian.org
rdonald at users.alioth.debian.org
Mon Aug 3 22:30:42 UTC 2009
Author: rdonald
Date: Mon Aug 3 22:30:41 2009
New Revision: 579
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=579
Log:
Beckmann patch1
Removed:
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/changelog
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.links
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.links.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.preinst
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-ia32.links
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-ia32.override
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.docs
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.examples
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.init
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.links
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.override
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.postrm
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-kernel-legacy-173xx-source.README.Debian
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-kernel-legacy-173xx-source.docs
Modified:
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/control.template
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/rules
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.README.Debian
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.shlibs
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-kernel-legacy-173xx-source.README.Debian.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/control.template
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/control.template?rev=579&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/control.template (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/control.template Mon Aug 3 22:30:41 2009
@@ -1,5 +1,5 @@
Source: nvidia-kernel-legacy-173xx
-Section: non-free/x11
+Section: non-free/kernel
Priority: optional
Maintainer: Randall Donald <rdonald at debian.org>
Build-Depends: debhelper (>> 3.0.0), make, libc6-dev
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/rules?rev=579&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/rules Mon Aug 3 22:30:41 2009
@@ -32,6 +32,12 @@
dh_testroot
dh_prep
+
+ifneq (,$(wildcard makefile))
+ @echo "ERROR: unclean build directory from older version found, please clean first:"
+ @echo " module-assistant clean nvidia-legacy-173xx"
+ @exit 1
+endif
# Build the modules
$(MAKE) -C . LINUXDIR=$(KSRC) KVERREL=$(KVERS)
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=579&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog Mon Aug 3 22:30:41 2009
@@ -1,8 +1,37 @@
+nvidia-graphics-drivers-legacy-173xx (173.14.20-1.0anbe0) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ [ Andreas Beckmann ]
+ * do not ship generated files in the source package
+ * nvidia-kernel-legacy-173xx-source: recommend module-assistant
+ * drop vdpau support, not available in legacy-173xx
+ * shlibs cleanup
+ - update Build-Depends to include all needed libraries
+ - add Conflicts with the new library packages libcuda1 etc. from
+ nvidia-graphics-drivers
+ - let the shlibs system generate all dependencies
+ - debian/nvidia-glx-legacy-173xx-ia32.shlibs: new file
+ * switch to dh_lintian
+ * update lintian overrides
+ * debian/nvidia-glx-legacy-173xx-dev.links.in: removed, contained only
+ dangling symlinks
+ * really put 32 and 64 bit versions of nv-kernel.o in the source package
+ * nvidia-kernel-legacy-173xx-source: abort module compilation with helpful
+ error message if build directory was not cleaned after old package build
+ * debian/nvidia-glx.README.Debian:
+ - update references
+ - drop outdated section about header installation
+ * debian/nvidia-kernel-legacy-173xx-source.README.Debian.in: fix typo
+ * use Section: non-free/kernel for source and modules
+ * debian/watch: new dummy file, website is not parsable
+
+ -- Andreas Beckmann <debian at abeckmann.de> Thu, 23 Jul 2009 11:35:11 +0200
+
nvidia-graphics-drivers-legacy-173xx (173.14.20-1) unstable; urgency=low
* New Upstream (pre-release for 2.6.30 support)
- * Note ia32 support has not been transitioned in this release.
- * conftest.sh patch from Lennart Sorensen <lsorense at csclub.uwaterloo.ca>
+ * conftest.sh, patches.h patch from Lennart Sorensen <lsorense at csclub.uwaterloo.ca>
-- Randall Donald <rdonald at debian.org> Sat, 18 Jul 2009 18:27:17 -0700
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control.in?rev=579&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control.in Mon Aug 3 22:30:41 2009
@@ -3,19 +3,22 @@
Priority: optional
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
Uploaders: Randall Donald <rdonald at debian.org>
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx
-Build-Depends: debhelper (>> 4.0.0), sed (>> 3.0), libxext6, bzip2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx
+Build-Depends: debhelper (>= 6.0.7~), sed (>> 3.0), libxext6, bzip2,
+ libc6-dev-i386 [amd64], lib32gcc1 [amd64], lib32z1 [amd64],
+ ia32-libs (<< 3) [amd64] | ia32-libxext6 [amd64],
Standards-Version: 3.6.2
-
+Homepage: http://www.nvidia.com
Package: nvidia-glx-legacy-173xx-ia32
Architecture: amd64
-Depends: nvidia-kernel-legacy-173xx-#VERSION#, libc6, ia32-libs, ${shlibs:Depends}
+#Pre-Depends: libc6-i386 (>= 2.9-18)
+Depends: nvidia-kernel-legacy-173xx-#VERSION#, ${shlibs:Depends}, ${misc:Depends}
Suggests: nvidia-kernel-legacy-173xx-source (>= #VERSION#)
-Conflicts: nvidia-glx-src
+Conflicts: nvidia-glx-src, libcuda1-ia32
Replaces: nvidia-glx-src
-Description: NVIDIA binary Xorg driver (173xx legacy version)
+Description: NVIDIA binary Xorg driver (173xx legacy version)
These binary drivers provide optimized hardware acceleration of
OpenGL applications via a direct-rendering X Server. AGP, TV-out and
flat panel displays are also supported.
@@ -65,9 +68,10 @@
Package: nvidia-glx-legacy-173xx
Architecture: i386 amd64
-Depends: nvidia-kernel-legacy-173xx-#VERSION#, x11-common (>= 1:7.0.0), ${shlibs:Depends}
+Depends: nvidia-kernel-legacy-173xx-#VERSION#, x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}
Suggests: nvidia-kernel-legacy-173xx-source (>= #VERSION#)
-Conflicts: nvidia-glx, nvidia-glx-legacy-71xx, nvidia-glx-legacy-96xx, nvidia-glx-legacy-dev
+Conflicts: nvidia-glx, nvidia-glx-legacy-71xx, nvidia-glx-legacy-96xx, nvidia-glx-legacy-dev ,
+ libcuda1
Replaces: nvidia-glx-src, nvidia-glx-legacy
Description: NVIDIA binary Xorg driver
These binary drivers provide optimized hardware
@@ -122,9 +126,10 @@
Package: nvidia-glx-legacy-173xx-dev
Architecture: i386 amd64
-Depends: nvidia-glx-legacy-173xx (>= #VERSION#)
+Depends: nvidia-glx-legacy-173xx (>= #VERSION#), ${misc:Depends}
Provides: libgl-dev
-Conflicts: nvidia-glx (>= #NEXTVER#), libgl-dev, mesa-common-dev, nvidia-glx-dev, nvidia-glx-legacy-71xx-dev, nvidia-glx-legacy-96xx-dev
+Conflicts: nvidia-glx (>= #NEXTVER#), libgl-dev, mesa-common-dev, nvidia-glx-dev, nvidia-glx-legacy-71xx-dev, nvidia-glx-legacy-96xx-dev,
+ libcuda1-dev
Replaces: libgl-dev
Description: NVIDIA binary Xorg driver development files (173xx legacy version)
This package contains the NVIDIA binary Xorg driver
@@ -134,9 +139,10 @@
at http://www.nvidia.com/ .
Package: nvidia-kernel-legacy-173xx-source
+Section: non-free/kernel
Architecture: i386 amd64
-Depends: debhelper (>> 5.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0)
-Recommends: nvidia-glx-legacy-173xx (>= #VERSION#), kernel-package (>= 8.082), devscripts
+Depends: debhelper (>> 5.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0), ${misc:Depends}
+Recommends: nvidia-glx-legacy-173xx (>= #VERSION#), kernel-package (>= 8.082), module-assistant, devscripts
Description: NVIDIA binary kernel module source
This package builds the NVIDIA Xorg binary kernel module
needed by nvidia-glx-legacy-173xx. The drivers provide optimized
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.README.Debian
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.README.Debian?rev=579&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.README.Debian (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.README.Debian Mon Aug 3 22:30:41 2009
@@ -56,19 +56,10 @@
In Section "Device"
Change Driver "nv" to Driver "nvidia"
- See /usr/share/doc/nvidia-glx/README.gz and
- /usr/share/doc/nvidia-glx/examples/XF86Config.sample.gz
+ See /usr/share/doc/nvidia-glx-legacy-173xx/README.txt.gz and
+ /usr/share/doc/nvidia-glx-legacy-173xx/examples/XF86Config.sample.gz
for descriptions of all supported options.
- Appendix F: CONFIGURING AGP is an important section.
-
-
-Note about OpenGL headers: The header files are not installed to
-/usr/include/GL but to /usr/share/doc/nvidia-glx-dev/include/GL.
-This allows use of and not overwriting of the
-preinstalled headers (e.g. xlibmesa-dev). If you wish to use the NVIDIA
-supplied headers (e.g. you require NVIDIA GL extensions) you must copy them to
-/usr/include/GL yourself or include /usr/share/doc/nvidia-glx-dev/include in
-your includes path when compiling.
+ Chapter 12: Configuring AGP is an important section.
Also note all users using GLX must be in group video. (i.e. adduser <user>
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.shlibs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.shlibs?rev=579&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.shlibs (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.shlibs Mon Aug 3 22:30:41 2009
@@ -1,5 +1,5 @@
libGL 1 libgl1-mesa-glx | libgl1
-libGLcore 1 libgl1-mesa-glx | libgl1
+libGLcore 1 nvidia-glx-legacy-173xx
libXvMCNVIDIA_dynamic 1 nvidia-glx-legacy-173xx
libnvidia-tls 1 nvidia-glx-legacy-173xx
libcuda 1 nvidia-glx-legacy-173xx
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-kernel-legacy-173xx-source.README.Debian.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-kernel-legacy-173xx-source.README.Debian.in?rev=579&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-kernel-legacy-173xx-source.README.Debian.in (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-kernel-legacy-173xx-source.README.Debian.in Mon Aug 3 22:30:41 2009
@@ -15,7 +15,7 @@
There are TWO ways to build the nvidia-kernel package. Which one depends on
your situation with your kernel.
- METHOD #1: You are running a Debian suppiled kernel or built a
+ METHOD #1: You are running a Debian supplied kernel or built a
linux-headers package along with your own self-built kernel.
METHOD #2: You are running your own self-built kernel built from kernel
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=579&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules Mon Aug 3 22:30:41 2009
@@ -28,15 +28,17 @@
dirname_x86_64:=$(shell sh debian/upstream_info DIRNAME_X86_64)
LEGACY=-legacy-173xx
-AUTOGEN=debian/nvidia-kernel$(LEGACY)-source.README.Debian debian/control \
-debian/copyright debian/nvidia-glx$(LEGACY).links debian/nvidia-glx$(LEGACY)-dev.links \
+
+AUTOKEEP=debian/control debian/copyright
+AUTOCLEAN=debian/nvidia-kernel$(LEGACY)-source.README.Debian \
+debian/nvidia-glx$(LEGACY).links \
debian/nvidia-glx$(LEGACY).override debian/nvidia-glx$(LEGACY).docs debian/nvidia-glx$(LEGACY).examples \
debian/nvidia-glx$(LEGACY).postrm debian/nvidia-glx$(LEGACY).init \
debian/nvidia-glx$(LEGACY)-ia32.override debian/nvidia-glx$(LEGACY)-ia32.links \
-debian/nvidia-kernel$(LEGACY)-source.docs debian/nvidia-glx$(LEGACY)-dev.preinst
-
-
-
+debian/nvidia-kernel$(LEGACY)-source.docs debian/nvidia-glx$(LEGACY)-dev.preinst \
+debian.binary/changelog
+
+AUTOGEN=$(AUTOKEEP) $(AUTOCLEAN)
CFLAGS = -Wall -g
@@ -70,9 +72,6 @@
# done; \
fi
- sed 's/^nvidia-graphics-drivers$(LEGACY)/nvidia-kernel$(LEGACY)/g' debian/changelog > debian.binary/changelog
-
-
touch configure-stamp
.PHONY: build
@@ -86,7 +85,7 @@
build-kernel:
.PHONY: build-kernel-stamp
-build-kernel-stamp:
+build-kernel-stamp: debian.binary/changelog
dh_testroot
dh_testdir
@@ -114,8 +113,9 @@
rm $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/makefile
# We want both 32 and 64 bit versions of nv-kernel.o
- cp $(CURDIR)/$(dirname_x86_64)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/nv-kernel.o.x86_64
- mv $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/nv-kernel.o.i386
+ cp $(CURDIR)/$(dirname_x86)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/nv-kernel.o.i386
+ cp $(CURDIR)/$(dirname_x86_64)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/nv-kernel.o.x86_64
+ rm -f $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/nv-kernel.o
# and then make Makefile.kbuild actually use our names
sed -i -e 's/nv-kernel.o$$/nv-kernel.o$$(NVARCH)/' $(CURDIR)/debian/temp/modules/nvidia-kernel$(LEGACY)/Makefile.kbuild
@@ -133,13 +133,15 @@
touch build-kernel-stamp
.PHONY: clean
-clean:
+clean: version-clean
dh_testdir
dh_testroot
rm -f build-stamp build-kernel-stamp configure-stamp
dh_clean
rm -fr $(dirname_x86) $(dirname_x86_64) nvidia-kernel$(LEGACY).tar.bz2
+
+ $(MAKE) -f debian/rules $(AUTOKEEP)
.PHONY: install
@@ -166,11 +168,6 @@
$(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/include/cuda
install -m 0644 $(dirname)/usr/include/cuda/cudaGL.h \
$(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/include/cuda
-
- -install -m 0644 $(dirname)/usr/include/vdpau/vdpau.h \
- $(CURDIR)/debian/nvidia-glx-dev/usr/include/vdpau
- -install -m 0644 $(dirname)/usr/include/vdpau/vdpau_x11.h \
- $(CURDIR)/debian/nvidia-glx-dev/usr/include/vdpau
install -m 0644 $(dirname)/usr/include/GL/glx.h \
$(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/include/GL
@@ -183,12 +180,6 @@
$(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
install -m 0644 $(dirname)/usr/lib/libcuda.so.${version} \
$(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
- -install -m 0644 $(dirname)/usr/lib/libvdpau_nvidia.so.${version} \
- $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
- -install -m 0644 $(dirname)/usr/lib/libvdpau.so.${version} \
- $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
- -install -m 0644 $(dirname)/usr/lib/libvdpau_trace.so.${version} \
- $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
sed "s/__GENERATED_BY__/Debian nvidia-graphics-drivers$(LEGACY)/" $(dirname)/usr/lib/libGL.la | sed "s/__LIBGL_PATH__/\/usr\/lib/" > $(CURDIR)/debian/nvidia-glx$(LEGACY)-dev/usr/lib/libGL.la
# install -m 0644 $(dirname)/usr/lib/libGL.la $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/libGL.la
@@ -213,22 +204,12 @@
install $(dirname)/usr/bin/tls_test $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/nvidia
install $(dirname)/usr/bin/tls_test_dso.so $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib/nvidia
- install -d $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/share/lintian/overrides
- install -m 0644 debian/nvidia-glx$(LEGACY).override \
- $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/share/lintian/overrides/nvidia-glx$(LEGACY)
-
if [ "$(DEB_BUILD_ARCH)" = "amd64" ] ; then \
install $(dirname)/usr/lib32/libGLcore.so.${version} \
$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
install $(dirname)/usr/lib32/libGL.so.${version} \
$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
install $(dirname)/usr/lib32/libcuda.so.${version} \
- $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
- -install $(dirname)/usr/lib32/libvdpau.so.${version} \
- $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
- -install $(dirname)/usr/lib32/libvdpau_nvidia.so.${version} \
- $(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
- -install $(dirname)/usr/lib32/libvdpau_trace.so.${version} \
$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
install $(dirname)/usr/lib32/libnvidia-tls.so.${version} \
$(CURDIR)/debian/nvidia-glx$(LEGACY)-ia32/emul/ia32-linux/usr/lib ; \
@@ -247,7 +228,8 @@
install $(CURDIR)/script $(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/share/bug/nvidia-glx$(LEGACY)
- dh_install
+ dh_install -s
+ dh_lintian
# Must not depend on anything. This is to be called by
@@ -276,16 +258,15 @@
dh_fixperms
# dh_perl
# dh_python
- dh_makeshlibs
+ dh_makeshlibs -s
dh_installdeb
- dh_shlibdeps -Xia32 -Xtls -l$(CURDIR)/debian/nvidia-glx$(LEGACY)/usr/lib
- # quickhack! remove me :-/
- perl -pi.bak -e 's/,\s+nvidia-glx$(LEGACY)-ia32//;' $(CURDIR)/debian/nvidia-glx$(LEGACY).substvars
+ dh_shlibdeps
dh_gencontrol -s
dh_md5sums
dh_builddeb -s
+# Generating control files
%: %.in debian/upstream_info
perl -p \
-e 's{#BASE_VERSION#}{$(base_version)}g;' \
@@ -297,6 +278,9 @@
-e 's{#FILENAME#}{$(filename)}g;' \
-e 's{#URL#}{$(url)}g' \
< $< > $@
+
+debian.binary/changelog: debian/changelog
+ sed 's/^nvidia-graphics-drivers$(LEGACY)/nvidia-kernel$(LEGACY)/g' $< > $@
# Build architecture dependant packages using the common target.
@@ -309,5 +293,7 @@
.PHONY: version-clean
version-clean:
- rm -f ${AUTOGEN} || true
-
+ rm -f ${AUTOCLEAN} || true
+
+.PHONY: autogen
+autogen: ${AUTOGEN}
More information about the Pkg-nvidia-devel
mailing list