Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian....@packages.debian.org
Usertags: pu
Control: block -1 with 735549
In addition to updating nvidia-graphics-drivers to a new upstream
(#735549) we need to update the prebuilt kernel modules.
I'm attaching a proposed source debdiff. This contains one more change
cherry-picked from sid: adding the kernel version to the version of the
metapackages. This should simplify finding the correct metapackage
version in case multiple prebuilt modules are available (e.g. from local
repositories) for various kernel+driver combinations. This scheme works
well in jessie and sid, and it would be great if the official Debian
package would correctly sort into this scheme as well.
Therefore I'm attaching a binary debdiff between n-g-m 304.88+1
(current wheezy version) and n-g-m 304.88+3.2.0+2 (which just contains
this versioning change applied to the wheezy version, without the
version bump to 304.117). (I cannot easily build n-g-m 304.117+3.2.0+1
without n-g-d 304.117 being in p-u, unless I bring some local versions
into play).
Andreas
diff -Nru nvidia-graphics-modules-304.88+1/debian/changelog nvidia-graphics-modules-304.117+3.2.0+1/debian/changelog
--- nvidia-graphics-modules-304.88+1/debian/changelog 2013-04-03 13:24:07.000000000 +0200
+++ nvidia-graphics-modules-304.117+3.2.0+1/debian/changelog 2014-01-25 19:49:05.000000000 +0100
@@ -1,3 +1,12 @@
+nvidia-graphics-modules (304.117+3.2.0+1) wheezy; urgency=low
+
+ * Use nvidia-kernel-source 304.117.
+ * Change versioning scheme to include a part (3.x) for the kernel.
+ * Use canonical Vcs-* URLs.
+ * Upload to wheezy.
+
+ -- Andreas Beckmann <a...@debian.org> Sat, 25 Jan 2014 19:45:43 +0100
+
nvidia-graphics-modules (304.88+1) unstable; urgency=low
* Use nvidia-kernel-source 304.88.
diff -Nru nvidia-graphics-modules-304.88+1/debian/control nvidia-graphics-modules-304.117+3.2.0+1/debian/control
--- nvidia-graphics-modules-304.88+1/debian/control 2013-04-03 13:24:07.000000000 +0200
+++ nvidia-graphics-modules-304.117+3.2.0+1/debian/control 2014-01-25 19:49:05.000000000 +0100
@@ -7,16 +7,16 @@
Andreas Beckmann <a...@debian.org>,
Build-Depends: debhelper (>= 8),
linux-headers-3.2.0-4-amd64 [i386 amd64], linux-headers-3.2.0-4-486 [i386], linux-headers-3.2.0-4-686-pae [i386],
- nvidia-kernel-source (>= 304.88), nvidia-kernel-source (<< 304.88.0~),
+ nvidia-kernel-source (>= 304.117), nvidia-kernel-source (<< 304.117.~),
Standards-Version: 3.9.3
Homepage: http://www.nvidia.com/
-Vcs-Git: git://git.debian.org/git/pkg-nvidia/nvidia-graphics-modules.git
+Vcs-Git: git://anonscm.debian.org/pkg-nvidia/nvidia-graphics-modules.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-nvidia/nvidia-graphics-modules.git
XS-Autobuild: yes
Package: nvidia-kernel-amd64
Architecture: i386 amd64
-Depends: ${misc:Depends}, nvidia-kernel-3.2.0-4-amd64 (>= 304.88)
+Depends: ${misc:Depends}, nvidia-kernel-3.2.0-4-amd64 (>= 304.117)
Breaks: nvidia-kernel-2.6-amd64 (<< 295)
Replaces: nvidia-kernel-2.6-amd64 (<< 295)
Description: NVIDIA kernel module for Linux (amd64 flavor)
@@ -44,7 +44,7 @@
Package: nvidia-kernel-486
Architecture: i386
-Depends: ${misc:Depends}, nvidia-kernel-3.2.0-4-486 (>= 304.88)
+Depends: ${misc:Depends}, nvidia-kernel-3.2.0-4-486 (>= 304.117)
Breaks: nvidia-kernel-2.6-486 (<< 295)
Replaces: nvidia-kernel-2.6-486 (<< 295)
Description: NVIDIA kernel module for Linux (486 flavor)
@@ -72,7 +72,7 @@
Package: nvidia-kernel-686-pae
Architecture: i386
-Depends: ${misc:Depends}, nvidia-kernel-3.2.0-4-686-pae (>= 304.88)
+Depends: ${misc:Depends}, nvidia-kernel-3.2.0-4-686-pae (>= 304.117)
Breaks: nvidia-kernel-2.6-686-pae (<< 295)
Replaces: nvidia-kernel-2.6-686-pae (<< 295)
Description: NVIDIA kernel module for Linux (686-pae flavor)
diff -Nru nvidia-graphics-modules-304.88+1/debian/control.md5sum nvidia-graphics-modules-304.117+3.2.0+1/debian/control.md5sum
--- nvidia-graphics-modules-304.88+1/debian/control.md5sum 2013-04-03 13:24:07.000000000 +0200
+++ nvidia-graphics-modules-304.117+3.2.0+1/debian/control.md5sum 2014-01-25 19:49:05.000000000 +0100
@@ -1,6 +1,6 @@
-568d9fd65e04fa2180abc07a30da0561 debian/control
-74ea8851c11c68068eb126a0581cd61b debian/control.source
+43016338a348af304c7a9331795c1407 debian/control
+e24cb1172a9e708cd6ca8e9a5aa2c86d debian/control.source
8dce140a73e725f1cd59a7aef8ecc83d debian/control.flavor
-737e968161571039c186e1855b948ef6 debian/rules
-f55dbcf51f647cd76be27c83effbc5ca debian/rules.defs
-#UPSTREAM_VERSION=304.88#
+6015281d47a4a606e6e430597d75c27d debian/rules
+94561696e96a4338bb92f811f1058ec6 debian/rules.defs
+#UPSTREAM_VERSION=304.117#
diff -Nru nvidia-graphics-modules-304.88+1/debian/control.source nvidia-graphics-modules-304.117+3.2.0+1/debian/control.source
--- nvidia-graphics-modules-304.88+1/debian/control.source 2013-04-03 13:24:07.000000000 +0200
+++ nvidia-graphics-modules-304.117+3.2.0+1/debian/control.source 2014-01-25 19:49:05.000000000 +0100
@@ -10,6 +10,6 @@
#SOURCE_PKG# (>= #UPSTREAM_VERSION##SOURCE_MIN_REV#), #SOURCE_PKG# (<< #UPSTREAM_VERSION##SOURCE_MAX_SUFFIX#),
Standards-Version: 3.9.3
Homepage: http://www.nvidia.com/
-Vcs-Git: git://git.debian.org/git/pkg-nvidia/nvidia-graphics-modules.git
+Vcs-Git: git://anonscm.debian.org/pkg-nvidia/nvidia-graphics-modules.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-nvidia/nvidia-graphics-modules.git
XS-Autobuild: yes
diff -Nru nvidia-graphics-modules-304.88+1/debian/rules nvidia-graphics-modules-304.117+3.2.0+1/debian/rules
--- nvidia-graphics-modules-304.88+1/debian/rules 2013-04-03 13:24:07.000000000 +0200
+++ nvidia-graphics-modules-304.117+3.2.0+1/debian/rules 2014-01-25 19:49:05.000000000 +0100
@@ -28,6 +28,7 @@
include debian/rules.defs
UPSTREAM_VERSION ?= $(firstword $(subst +, ,$(THIS_VERSION)))
+KERNEL_MAJMIN ?= $(word 2,$(subst +, ,$(THIS_VERSION)))
NVIDIA_LEGACY ?=
legacy = $(if $(NVIDIA_LEGACY),-legacy-$(NVIDIA_LEGACY)xx)
DESC_NAME ?= NVIDIA
@@ -37,13 +38,14 @@
SOURCE_PKG ?= nvidia-kernel$(legacy)-source
SOURCE ?= $(SOURCE_PKG:-source=)
SOURCE_MIN_REV ?=
-SOURCE_MAX_SUFFIX ?= .0~
+SOURCE_MAX_SUFFIX ?= .~
META_MINDEP_VERSION ?= $(UPSTREAM_VERSION)
-KERNEL_VERSION ?= 0.0.0-0
+KERNEL_ABI ?= ???
+KERNEL_VERSION ?= $(KERNEL_MAJMIN)-$(KERNEL_ABI)
SOURCE_VERSION := $(call get_package_version,$(SOURCE_PKG))
SOURCE_REVISION = $(subst X$(UPSTREAM_VERSION)-,,X$(SOURCE_VERSION))
-THIS_REVISION ?= $(subst X$(UPSTREAM_VERSION)+,,X$(THIS_VERSION))
+THIS_REVISION ?= $(subst X$(UPSTREAM_VERSION)+$(KERNEL_MAJMIN)+,,X$(THIS_VERSION))
MERGED_VERSION = $(UPSTREAM_VERSION)+$(THIS_REVISION)+$(SOURCE_REVISION)
KERNEL_FLAVORS_i386 = $(KERNEL_FLAVORS_i386_yes)
@@ -64,6 +66,7 @@
-e '/^Depends:/ s/$$/, linux-image-#KVERS#,/' \
modules/$(SOURCE)/debian/control.template
mv modules/$(SOURCE)/debian/changelog modules/$(SOURCE)/debian/changelog.$(SOURCE_PKG).Debian
+ echo debian/changelog.$(SOURCE_PKG).Debian >> modules/$(SOURCE)/debian/docs
cp debian/changelog modules/$(SOURCE)/debian
touch $@
@@ -90,11 +93,17 @@
.NOTPARALLEL:
binary-module-%: build binary-arch-meta
- set -e; cd modules/$(SOURCE); \
+ cd modules/$(SOURCE) && \
+ KSRC=/lib/modules/$*/build \
+ KDREV=$(SOURCE_REVISION)+$(call get_package_version,linux-headers-$*) \
+ debian/rules configure
+ sed -i 's/^$(THIS_VERSION)/$(UPSTREAM_VERSION)+$(THIS_REVISION)/' modules/$(SOURCE)/debian/VERSION
+ cd modules/$(SOURCE) && \
KSRC=/lib/modules/$*/build \
KDREV=$(SOURCE_REVISION)+$(call get_package_version,linux-headers-$*) \
KPKG_DEST_DIR=../.. \
- debian/rules binary_modules ; \
+ debian/rules binary_modules
+ cd modules/$(SOURCE) && \
KSRC=/lib/modules/$*/build \
debian/rules clean
# Replace dummy deb and entry in debian/files, the package just built
diff -Nru nvidia-graphics-modules-304.88+1/debian/rules.defs nvidia-graphics-modules-304.117+3.2.0+1/debian/rules.defs
--- nvidia-graphics-modules-304.88+1/debian/rules.defs 2013-04-03 13:24:07.000000000 +0200
+++ nvidia-graphics-modules-304.117+3.2.0+1/debian/rules.defs 2014-01-25 19:49:05.000000000 +0100
@@ -1,6 +1,6 @@
SOURCE_MIN_REV =
NVIDIA_LEGACY =
-KERNEL_VERSION = 3.2.0-4
+KERNEL_ABI = 4
DEFAULT = yes
RT = no
File lists identical (after any substitutions)
Control files of package nvidia-kernel-2.6-amd64: lines which differ (wdiff
format)
-----------------------------------------------------------------------------------
Version: [-304.88+1-] {+304.88+3.2.0+2+}
Control files of package nvidia-kernel-3.2.0-4-amd64: lines which differ (wdiff
format)
---------------------------------------------------------------------------------------
Built-Using: linux (= [-3.2.41-2)-] {+3.2.51-1)+}
Installed-Size: [-18631-] {+18635+}
Source: nvidia-graphics-modules [-(304.88+1)-] {+(304.88+3.2.0+2)+}
Version: [-304.88+1+1+3.2.41-2-] {+304.88+2+1+deb7u1+3.2.51-1+}
Control files of package nvidia-kernel-amd64: lines which differ (wdiff format)
-------------------------------------------------------------------------------
Version: [-304.88+1-] {+304.88+3.2.0+2+}
