Bug#926264: unblock: nvidia-settings/410.104-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package nvidia-settings
Hi,
I recently realized that I can improve the nvidia-graphics-drivers
upgrade path from stretch to buster on the no longer supported
32-bit architectures (i386, armhf) by reintroducing some (meta-)packages
as transitional packages depending on the corresponding packages from
the (still 32-bit supporting) 390xx legacy driver.
This request is for nvidia-settings.
Andreas
unblock nvidia-settings/410.104-2
diff -Nru nvidia-settings-410.104/debian/changelog nvidia-settings-410.104/debian/changelog
--- nvidia-settings-410.104/debian/changelog 2019-03-13 01:01:46.000000000 +0100
+++ nvidia-settings-410.104/debian/changelog 2019-03-30 09:38:32.000000000 +0100
@@ -1,3 +1,10 @@
+nvidia-settings (410.104-2) unstable; urgency=medium
+
+ * [i386 armhf]: Reinstate nvidia-settings as a transitional package
+ depending on nvidia-settings-legacy-390xx.
+
+ -- Andreas Beckmann <anbe@debian.org> Sat, 30 Mar 2019 09:38:32 +0100
+
nvidia-settings (410.104-1) unstable; urgency=medium
* New upstream release 410.104.
diff -Nru nvidia-settings-410.104/debian/control nvidia-settings-410.104/debian/control
--- nvidia-settings-410.104/debian/control 2019-03-13 01:01:46.000000000 +0100
+++ nvidia-settings-410.104/debian/control 2019-03-30 09:38:32.000000000 +0100
@@ -30,21 +30,22 @@
Package: nvidia-settings
Section: contrib/x11
-Architecture: amd64
+Architecture: amd64 i386 armhf
Pre-Depends:
nvidia-installer-cleanup,
Depends:
- ${nvidia-alternative},
- libxnvctrl0 (= ${binary:Version}),
+ nvidia-settings-legacy-390xx [!amd64],
+ ${nvidia-alternative} [amd64],
+ libxnvctrl0 (= ${binary:Version}) [amd64],
${shlibs:Depends}, ${misc:Depends}
Recommends:
- libgl1-nvidia${nvidia:Legacy}-glvnd-glx | libgl1-nvidia${nvidia:Legacy}-glx,
- nvidia${nvidia:Legacy}-vdpau-driver,
- libnvidia${nvidia:Legacy}-ml1,
+ libgl1-nvidia${nvidia:Legacy}-glvnd-glx [amd64] | libgl1-nvidia${nvidia:Legacy}-glx [amd64],
+ nvidia${nvidia:Legacy}-vdpau-driver [amd64],
+ libnvidia${nvidia:Legacy}-ml1 [amd64],
Provides:
- nvidia-settings-gtk-${nvidia:Version},
+ nvidia-settings-gtk-${nvidia:Version} [amd64],
Conflicts:
- nvidia-settings-gtk-${nvidia:Version},
+ nvidia-settings-gtk-${nvidia:Version} [amd64],
Description: tool for configuring the NVIDIA graphics driver${nvidia:LegacyDesc}
The nvidia-settings utility is a tool for configuring the NVIDIA
Linux graphics driver. It operates by communicating with the NVIDIA
diff -Nru nvidia-settings-410.104/debian/nvidia-settings.install.amd64.in nvidia-settings-410.104/debian/nvidia-settings.install.amd64.in
--- nvidia-settings-410.104/debian/nvidia-settings.install.amd64.in 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-settings-410.104/debian/nvidia-settings.install.amd64.in 2019-03-30 09:38:32.000000000 +0100
@@ -0,0 +1,6 @@
+usr/bin/nvidia-settings usr/lib/#PRIVATE#/
+debian/nvidia-settings.desktop usr/lib/#PRIVATE#/
+nvidia-settings#LEGACY#.png usr/share/pixmaps/
+usr/bin/nv-control-dpy usr/lib/#PRIVATE#/
+usr/share/man/man1/nvidia-settings.1.gz usr/lib/#PRIVATE#/
+usr/lib/libnvidia-gtk?.so.*
diff -Nru nvidia-settings-410.104/debian/nvidia-settings.install.in nvidia-settings-410.104/debian/nvidia-settings.install.in
--- nvidia-settings-410.104/debian/nvidia-settings.install.in 2019-03-13 01:01:46.000000000 +0100
+++ nvidia-settings-410.104/debian/nvidia-settings.install.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-usr/bin/nvidia-settings usr/lib/#PRIVATE#/
-debian/nvidia-settings.desktop usr/lib/#PRIVATE#/
-nvidia-settings#LEGACY#.png usr/share/pixmaps/
-usr/bin/nv-control-dpy usr/lib/#PRIVATE#/
-usr/share/man/man1/nvidia-settings.1.gz usr/lib/#PRIVATE#/
-usr/lib/libnvidia-gtk?.so.*
diff -Nru nvidia-settings-410.104/debian/nvidia-settings.lintian-overrides nvidia-settings-410.104/debian/nvidia-settings.lintian-overrides
--- nvidia-settings-410.104/debian/nvidia-settings.lintian-overrides 2019-03-13 01:01:46.000000000 +0100
+++ nvidia-settings-410.104/debian/nvidia-settings.lintian-overrides 2019-03-30 09:38:32.000000000 +0100
@@ -1,6 +1,11 @@
no-upstream-changelog
# the shared libraries are actually version-specific plugins
-package-name-doesnt-match-sonames
-shlib-calls-exit
-no-symbols-control-file
+[amd64]: package-name-doesnt-match-sonames
+[amd64]: shlib-calls-exit
+[amd64]: no-symbols-control-file
+
+# On architectures no longer supported by the current driver,
+# this is a dummy package depending on the 390xx legacy driver.
+[!amd64]: empty-binary-package
+[!amd64]: package-contains-no-arch-dependent-files
diff -Nru nvidia-settings-410.104/debian/rules nvidia-settings-410.104/debian/rules
--- nvidia-settings-410.104/debian/rules 2019-03-13 01:01:46.000000000 +0100
+++ nvidia-settings-410.104/debian/rules 2019-03-30 09:38:32.000000000 +0100
@@ -48,7 +48,7 @@
%:
dh $@
-ifeq (,$(filter nvidia-settings,$(shell dh_listpackages)))
+ifneq (amd64,$(DEB_HOST_ARCH))
override_dh_auto_build: $(AUTOGEN)
CC_ONLY_CFLAGS="$(CPPFLAGS)" dh_auto_build --sourcedirectory=src/libXNVCtrl
Reply to: