Package: nvidia-kernel-common
Version: 20051028+1-0.1
Severity: normal
Tags: patch
Hi,
The following is the diff for my upcoming nvidia-kernel-common 20051028+1+nmu2
NMU.
diff -Nru nvidia-kernel-common-20051028+1/debian/changelog
nvidia-kernel-common-20051028+1+nmu2/debian/changelog
--- nvidia-kernel-common-20051028+1/debian/changelog 2007-09-07
01:09:28.000000000 +0300
+++ nvidia-kernel-common-20051028+1+nmu2/debian/changelog 2008-07-22
16:02:50.000000000 +0300
@@ -1,3 +1,16 @@
+nvidia-kernel-common (20051028+1+nmu2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Added LSB init script headers (closes: #479243)
+ * Moved debhelper to Build-Depends, because it is used in clean
+ * Use debian/rules target binary-indep instead of binary-arch
+ * Updated debhelper level
+ * Updated standards version
+ * Removed traces of modutils and devfs support (closes: #441412, #421406)
+ * Removed redundant README.Debian
+
+ -- Peter Eisentraut <[EMAIL PROTECTED]> Tue, 22 Jul 2008 00:00:00 +0000
+
nvidia-kernel-common (20051028+1-0.1) unstable; urgency=high
* Non-maintainer upload by testing security team.
diff -Nru nvidia-kernel-common-20051028+1/debian/compat
nvidia-kernel-common-20051028+1+nmu2/debian/compat
--- nvidia-kernel-common-20051028+1/debian/compat 1970-01-01
02:00:00.000000000 +0200
+++ nvidia-kernel-common-20051028+1+nmu2/debian/compat 2008-07-22
14:27:51.000000000 +0300
@@ -0,0 +1 @@
+7
diff -Nru nvidia-kernel-common-20051028+1/debian/control
nvidia-kernel-common-20051028+1+nmu2/debian/control
--- nvidia-kernel-common-20051028+1/debian/control 2005-08-30
01:32:37.000000000 +0300
+++ nvidia-kernel-common-20051028+1+nmu2/debian/control 2008-07-22
14:43:12.000000000 +0300
@@ -2,14 +2,13 @@
Section: contrib/x11
Priority: optional
Maintainer: Randall Donald <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>> 3.0.0)
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.8.0
Package: nvidia-kernel-common
Architecture: all
-Depends: modutils | module-init-tools
+Depends: module-init-tools
Recommends: nvidia-kernel-source | nvidia-kernel
Description: NVIDIA binary kernel module common files
- This package contains files shared between nvidia module
+ This package contains files shared between NVIDIA module
packages.
-
diff -Nru nvidia-kernel-common-20051028+1/debian/dirs
nvidia-kernel-common-20051028+1+nmu2/debian/dirs
--- nvidia-kernel-common-20051028+1/debian/dirs 2003-12-14 03:09:57.000000000
+0200
+++ nvidia-kernel-common-20051028+1+nmu2/debian/dirs 1970-01-01
02:00:00.000000000 +0200
@@ -1,5 +0,0 @@
-etc/devfs/conf.d
-etc/devfs/devices.d
-etc/modutils
-etc/modprobe.d
-usr/share/nvidia-kernel-common
diff -Nru
nvidia-kernel-common-20051028+1/debian/nvidia-kernel-common.nvidia-kernel.init
nvidia-kernel-common-20051028+1+nmu2/debian/nvidia-kernel-common.nvidia-kernel.init
---
nvidia-kernel-common-20051028+1/debian/nvidia-kernel-common.nvidia-kernel.init
2005-10-29 05:48:05.000000000 +0300
+++
nvidia-kernel-common-20051028+1+nmu2/debian/nvidia-kernel-common.nvidia-kernel.init
2008-07-22 14:20:35.000000000 +0300
@@ -1,5 +1,15 @@
#!/bin/sh
+### BEGIN INIT INFO
+# Provides: nvidia-kernel
+# Required-Start: mountdevsubfs
+# Required-Stop:
+# Should-Start: udev devfsd
+# Default-Start: 2 3 4 5
+# Default-Stop:
+# Short-Description: create NVIDIA device nodes
+### END INIT INFO
+
PATH=/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin
# How many cards?
diff -Nru nvidia-kernel-common-20051028+1/debian/postinst
nvidia-kernel-common-20051028+1+nmu2/debian/postinst
--- nvidia-kernel-common-20051028+1/debian/postinst 2004-08-05
23:40:31.000000000 +0300
+++ nvidia-kernel-common-20051028+1+nmu2/debian/postinst 1970-01-01
02:00:00.000000000 +0200
@@ -1,49 +0,0 @@
-#! /bin/sh
-# postinst script for nvidia-kernel
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-#
-# quoting from the policy:
-# Any necessary prompting should almost always be confined to the
-# post-installation script, and should be protected with a conditional
-# so that unnecessary prompting doesn't happen if a package's
-# installation fails and the `postinst' is called with `abort-upgrade',
-# `abort-remove' or `abort-deconfigure'.
-
-
-
-rm -f /etc/modutils/nvidia-kernel-nkc-devfs 2> /dev/null || true
-if [ -c /dev/.devfsd ] ; then
- ln -s /usr/share/nvidia-kernel-common/nvidia-kernel.modules.devfs
/etc/modutils/nvidia-kernel-nkc-devfs
-fi
-
-
-if [ -x /sbin/update-modules ]; then
- update-modules >/dev/null
-fi
-if [ -x /usr/sbin/update-devfsd ] ; then
- /usr/sbin/update-devfsd
-fi
-
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff -Nru nvidia-kernel-common-20051028+1/debian/postrm
nvidia-kernel-common-20051028+1+nmu2/debian/postrm
--- nvidia-kernel-common-20051028+1/debian/postrm 2003-12-14
03:24:58.000000000 +0200
+++ nvidia-kernel-common-20051028+1+nmu2/debian/postrm 1970-01-01
02:00:00.000000000 +0200
@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-
-
-if [ -x /sbin/update-modules ]; then
- update-modules >/dev/null
-fi
-
-#DEBHELPER#
-
-exit 0
diff -Nru nvidia-kernel-common-20051028+1/debian/prerm
nvidia-kernel-common-20051028+1+nmu2/debian/prerm
--- nvidia-kernel-common-20051028+1/debian/prerm 2003-12-14
03:25:09.000000000 +0200
+++ nvidia-kernel-common-20051028+1+nmu2/debian/prerm 1970-01-01
02:00:00.000000000 +0200
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-rm -f /etc/modutils/nvidia-kernel-nkc-devfs 2> /dev/null || true
-
-update-modules
-
-
-#DEBHELPER#
-
-exit 0
diff -Nru nvidia-kernel-common-20051028+1/debian/README.Debian
nvidia-kernel-common-20051028+1+nmu2/debian/README.Debian
--- nvidia-kernel-common-20051028+1/debian/README.Debian 2003-05-08
07:02:12.000000000 +0300
+++ nvidia-kernel-common-20051028+1+nmu2/debian/README.Debian 1970-01-01
02:00:00.000000000 +0200
@@ -1,7 +0,0 @@
-nvidia-kernel-common for Debian
-----------------------------
-
-These files are shared among multiple concurent kernel modules installations
-
-
- -- Randall Donald <[EMAIL PROTECTED]>, Sat, 24 Aug 2002 23:20:00 -0700
diff -Nru nvidia-kernel-common-20051028+1/debian/rules
nvidia-kernel-common-20051028+1+nmu2/debian/rules
--- nvidia-kernel-common-20051028+1/debian/rules 2005-10-25
22:45:32.000000000 +0300
+++ nvidia-kernel-common-20051028+1+nmu2/debian/rules 2008-07-22
14:53:09.000000000 +0300
@@ -1,44 +1,18 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
version=1.0.6111
packagename=nvidia-kernel-$(version)
-configure: configure-stamp
-configure-stamp:
- dh_testdir
-
- # add stuff for configuration
-
- touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
- dh_testdir
-
- #$(MAKE)
-
- touch build-stamp
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- #-$(MAKE) clean
-
- -rm -rf $(CURDIR)/debian/temp
-
dh_clean
+
install: build
dh_testdir
dh_testroot
@@ -47,35 +21,29 @@
dh_installinit --name=nvidia-kernel
- install -m 0644 devfs.conf
debian/nvidia-kernel-common/etc/devfs/conf.d/nvidia-kernel-nkc
-# install -m 0644 devfs.devices
debian/nvidia-kernel-common/etc/devfs/devices.d/nvidia-kernel-nkc
- install -m 0644 nvidia-kernel.modules
debian/nvidia-kernel-common/etc/modutils/nvidia-kernel-nkc
- install -m 0644 nvidia-kernel.modules-2.6
debian/nvidia-kernel-common/etc/modprobe.d/nvidia-kernel-nkc
- install -m 0644 nvidia-kernel.modules.devfs
debian/nvidia-kernel-common/usr/share/nvidia-kernel-common/
-
+ install -D -m 0644 nvidia-kernel.modules-2.6
debian/nvidia-kernel-common/etc/modprobe.d/nvidia-kernel-nkc
# Build architecture-independent files here.
binary-indep: build install
-# We have nothing to do by default.
+ dh_testdir
+ dh_testroot
+ dh_installdebconf -i
+ dh_installdocs -i
+ dh_installexamples -i
+ dh_installchangelogs -i
+ dh_link -i
+ dh_strip -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
# Build architecture-dependent files here.
binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdebconf
- dh_installdocs
- dh_installexamples
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
-# dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+# We have nothing to do by default.
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
diff -Nru nvidia-kernel-common-20051028+1/devfs.conf
nvidia-kernel-common-20051028+1+nmu2/devfs.conf
--- nvidia-kernel-common-20051028+1/devfs.conf 2003-05-08 06:57:10.000000000
+0300
+++ nvidia-kernel-common-20051028+1+nmu2/devfs.conf 1970-01-01
02:00:00.000000000 +0200
@@ -1,3 +0,0 @@
-REGISTER ^nvidiactl PERMISSIONS root.video 0660
-REGISTER ^nvidia[0-9] PERMISSIONS root.video 0660
-
diff -Nru nvidia-kernel-common-20051028+1/devfs.devices
nvidia-kernel-common-20051028+1+nmu2/devfs.devices
--- nvidia-kernel-common-20051028+1/devfs.devices 2003-05-08
06:57:10.000000000 +0300
+++ nvidia-kernel-common-20051028+1+nmu2/devfs.devices 1970-01-01
02:00:00.000000000 +0200
@@ -1,7 +0,0 @@
-# devices file
-# format: name [bc] major minor uid gid mode
-nvidia0 c 195 0 root video 0660
-nvidia1 c 195 1 root video 0660
-nvidia2 c 195 2 root video 0660
-nvidia3 c 195 3 root video 0660
-nvidiactl c 195 255 root video 0660
diff -Nru nvidia-kernel-common-20051028+1/nvidia-kernel.modules
nvidia-kernel-common-20051028+1+nmu2/nvidia-kernel.modules
--- nvidia-kernel-common-20051028+1/nvidia-kernel.modules 2003-12-15
09:18:45.000000000 +0200
+++ nvidia-kernel-common-20051028+1+nmu2/nvidia-kernel.modules 1970-01-01
02:00:00.000000000 +0200
@@ -1 +0,0 @@
-alias char-major-195 nvidia
diff -Nru nvidia-kernel-common-20051028+1/nvidia-kernel.modules.devfs
nvidia-kernel-common-20051028+1+nmu2/nvidia-kernel.modules.devfs
--- nvidia-kernel-common-20051028+1/nvidia-kernel.modules.devfs 2003-12-14
03:08:12.000000000 +0200
+++ nvidia-kernel-common-20051028+1+nmu2/nvidia-kernel.modules.devfs
1970-01-01 02:00:00.000000000 +0200
@@ -1 +0,0 @@
-alias /dev/nvidia* nvidia
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
