[pkg-nvidia-devel] r814 - in /packages/nvidia-graphics-drivers/trunk: debian.binary/rules debian/changelog debian/control debian/rules
rra at users.alioth.debian.org
rra at users.alioth.debian.org
Sun Apr 25 03:51:58 UTC 2010
Author: rra
Date: Sun Apr 25 03:51:56 2010
New Revision: 814
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=814
Log:
General improvements to nvidia-kernel-source
[ Andreas Beckmann ]
* do not ship empty directory in module package
* debian.binary/rules, debian.binary/install.template: use dh_install to
install the module
* debian.binary/rules: fix clean target if debian/control is missing and
cleanup ancient code
* update debian.binary/control.template using the copy from
nvidia-graphics-modules-i386
* include a copy of the NVIDIA changelog in the module packages built from
nvidia-kernel-source
* install the changelog from the nvidia-kernel-source package, too, if
building via nvidia-graphics-modules-*
* nvidia-kernel-source: bump debhelper dependency to 7 to match module
packaging templates
Modified:
packages/nvidia-graphics-drivers/trunk/debian.binary/rules
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/control
packages/nvidia-graphics-drivers/trunk/debian/rules
Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/rules?rev=814&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/rules Sun Apr 25 03:51:56 2010
@@ -23,8 +23,8 @@
include /usr/share/modass/include/common-rules.make
configure:
- sed 's/#KVERS#/$(KVERS)/g' debian/control.template > $(CURDIR)/debian/control
- sed 's/#KVERS#/$(KVERS)/g' debian/dirs.template > $(CURDIR)/debian/dirs
+ sed 's/#KVERS#/$(KVERS)/g' debian/control.template > debian/control
+ sed 's/#KVERS#/$(KVERS)/g' debian/install.template > debian/install
binary-modules: configure
dh_testroot
@@ -43,11 +43,9 @@
# Install the modules
dh_installdirs
- install -m 0644 $(CURDIR)/nvidia.ko $(CURDIR)/debian/nvidia-kernel-$(KVERS)/lib/modules/$(KVERS)/nvidia/nvidia.ko ; \
-
- dh_installdocs
- dh_installmodules
- dh_installchangelogs
+ dh_install
+ dh_installdocs $(wildcard debian/changelog.nvidia-kernel-source*)
+ dh_installchangelogs NVIDIA_Changelog
dh_installmodules
dh_strip
dh_compress
@@ -59,24 +57,18 @@
dh_prep
clean:
+ test -f debian/control || cp debian/control.template debian/control
dh_testdir
- if [ -f $(CURDIR)/debian/control.template ]; then \
- cp $(CURDIR)/debian/control.template $(CURDIR)/debian/control; \
- fi
-
dh_testroot
rm -f build-stamp configure-stamp
- $(MAKE) clean SYSSRC=$(KSRC) -C $(CURDIR)/$(dirname) -f Makefile $(KPKG_EXTRAV_ARG)
+ $(MAKE) -C . -f Makefile SYSSRC=$(KSRC) $(KPKG_EXTRAV_ARG) clean
- -rm $(CURDIR)/$(dirname)/gcc-check
- -rm $(CURDIR)/$(dirname)/cc-sanity-check
-
dh_quilt_unpatch
dh_clean
- -rm $(CURDIR)/debian/control
- -rm $(CURDIR)/debian/dirs
+ rm -f debian/install
+ rm -f debian/control
binary_modules: binary-modules
@@ -91,7 +83,8 @@
# the kdist_clean target is called by make-kpkg modules_clean. It is
# responsible for cleaning up any changes that have been made by the
# other kdist_commands (except for the .deb files created).
-kdist_clean: configure
+kdist_clean:
+ test -f debian/control || cp debian/control.template debian/control
dh_testdir
$(MAKE) -C . LINUXDIR=$(KSRC) KVERREL=$(KVERS) clean
dh_quilt_unpatch || quilt --quiltrc /dev/null pop -af
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=814&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Apr 25 03:51:56 2010
@@ -1,15 +1,24 @@
nvidia-graphics-drivers (190.53-5) UNRELEASED; urgency=low
- * Replace control.template for the module build with the version from
- nvidia-graphics-modules-i386 190.53+1.
- - Tighten dependency on nvidia-kernel-common.
- - Set maintainer to the maintenance team, move Randall to uploaders,
- and add myself.
- - Update to debhelper 7.
- - Update standards version to 3.8.4.
- - Add Homepage.
- - Improve long description.
-
+ [ Russ Allbery ]
+ * Tighten dependency on nvidia-kernel-common in the control file for
+ generated kernel module packages.
+
+ [ Andreas Beckmann ]
+ * do not ship empty directory in module package
+ * debian.binary/rules, debian.binary/install.template: use dh_install to
+ install the module
+ * debian.binary/rules: fix clean target if debian/control is missing and
+ cleanup ancient code
+ * update debian.binary/control.template using the copy from
+ nvidia-graphics-modules-i386
+ * include a copy of the NVIDIA changelog in the module packages built from
+ nvidia-kernel-source
+ * install the changelog from the nvidia-kernel-source package, too, if
+ building via nvidia-graphics-modules-*
+ * nvidia-kernel-source: bump debhelper dependency to 7 to match module
+ packaging templates
+
-- Russ Allbery <rra at debian.org> Sat, 24 Apr 2010 20:35:20 -0700
nvidia-graphics-drivers (190.53-4) unstable; urgency=high
Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=814&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Sun Apr 25 03:51:56 2010
@@ -168,7 +168,7 @@
Package: nvidia-kernel-source
Section: non-free/kernel
Architecture: i386 amd64
-Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), quilt (>= 0.46-7~),
+Depends: debhelper (>= 7), make, sed (>> 3.0), quilt (>= 0.46-7~),
module-assistant, ${misc:Depends}
Recommends: nvidia-glx (>= ${nvidia:Version}), kernel-package (>= 8.082), devscripts
Conflicts: nvidia-kernel-src
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=814&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Apr 25 03:51:56 2010
@@ -118,6 +118,7 @@
# chmod 775 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/patches
cp $(CURDIR)/$(dirname)/usr/src/nv/* $(CURDIR)/debian/temp/modules/nvidia-kernel/
+ cp -a $(CURDIR)/$(dirname)/usr/share/doc/NVIDIA_Changelog $(CURDIR)/debian/temp/modules/nvidia-kernel/
# We don't want these makefiles that don't work with kbuild
rm $(CURDIR)/debian/temp/modules/nvidia-kernel/makefile
More information about the Pkg-nvidia-devel
mailing list