[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#990181: marked as done (unblock: nvidia-settings-legacy-390xx/390.143-2)

Your message dated Tue, 22 Jun 2021 20:25:52 +0000
with message-id <E1lvmy0-0000GV-V3@respighi.debian.org>
and subject line unblock nvidia-settings-legacy-390xx
has caused the Debian Bug report #990181,
regarding unblock: nvidia-settings-legacy-390xx/390.143-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
990181: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=990181
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package nvidia-settings-legacy-390xx

Let's bring the versions of nvidia-settings-legacy-390xx and
nvidia-graphics-driver-legacy-390xx in sync. Packaging wise the
icon is moved out of the legacy pixmaps location as in all other
nvidia-settings* packages.
This also brings the packaging (i.e. the way how substitutions
are handled) in sync with all the other variants of nvidia-settings*
packages.

unblock nvidia-settings-legacy-390xx/390.143-2

Andreas

diff -Nru nvidia-settings-legacy-390xx-390.141/debian/changelog nvidia-settings-legacy-390xx-390.143/debian/changelog
--- nvidia-settings-legacy-390xx-390.141/debian/changelog	2021-01-11 23:48:22.000000000 +0100
+++ nvidia-settings-legacy-390xx-390.143/debian/changelog	2021-06-15 10:58:57.000000000 +0200
@@ -1,3 +1,20 @@
+nvidia-settings-legacy-390xx (390.143-2) unstable; urgency=medium
+
+  * Rename "legacy" variables to "variant" and add Tesla support.
+
+ -- Andreas Beckmann <anbe@debian.org>  Tue, 15 Jun 2021 10:58:57 +0200
+
+nvidia-settings-legacy-390xx (390.143-1) unstable; urgency=medium
+
+  [ Andreas Beckmann ]
+  * New upstream release 390.143.
+
+  [ Pino Toscano ]
+  * Install nvidia-settings.png in the hicolor icon theme, rather than the
+    legacy pixmaps location.
+
+ -- Andreas Beckmann <anbe@debian.org>  Tue, 25 May 2021 09:59:11 +0200
+
 nvidia-settings-legacy-390xx (390.141-1) unstable; urgency=medium
 
   * New upstream release 390.141.
diff -Nru nvidia-settings-legacy-390xx-390.141/debian/control nvidia-settings-legacy-390xx-390.143/debian/control
--- nvidia-settings-legacy-390xx-390.141/debian/control	2021-01-11 23:48:22.000000000 +0100
+++ nvidia-settings-legacy-390xx-390.143/debian/control	2021-06-15 10:58:57.000000000 +0200
@@ -29,17 +29,18 @@
 Pre-Depends:
  nvidia-installer-cleanup,
 Depends:
- ${nvidia-alternative},
- ${shlibs:Depends}, ${misc:Depends}
+ , ${nvidia}-alternative
+ , ${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}-glvnd-glx
+ | libgl1-${nvidia}-glx
+ , ${nvidia}-vdpau-driver
+ , lib${nvidia}-ml1
 Provides:
  nvidia-settings-gtk-${nvidia:Version},
 Conflicts:
  nvidia-settings-gtk-${nvidia:Version},
-Description: tool for configuring the NVIDIA graphics driver${nvidia:LegacyDesc}
+Description: tool for configuring the NVIDIA graphics driver${nvidia:VariantDesc}
  The nvidia-settings utility is a tool for configuring the NVIDIA
  Linux graphics driver.  It operates by communicating with the NVIDIA
  X driver, querying and updating state as appropriate.  This
diff -Nru nvidia-settings-legacy-390xx-390.141/debian/nvidia-settings.desktop.in nvidia-settings-legacy-390xx-390.143/debian/nvidia-settings.desktop.in
--- nvidia-settings-legacy-390xx-390.141/debian/nvidia-settings.desktop.in	2021-01-11 23:48:22.000000000 +0100
+++ nvidia-settings-legacy-390xx-390.143/debian/nvidia-settings.desktop.in	2021-06-15 10:58:57.000000000 +0200
@@ -4,9 +4,9 @@
 Exec=nvidia-settings
 Terminal=false
 Categories=HardwareSettings;System;Settings;
-Icon=nvidia-settings#LEGACY#
-Name=NVIDIA X Server Settings#LEGACY_DESC#
-Comment=Configure NVIDIA X Server Settings#LEGACY_DESC#
+Icon=nvidia-settings#VARIANT#
+Name=NVIDIA X Server Settings#VARIANT_DESC#
+Comment=Configure NVIDIA X Server Settings#VARIANT_DESC#
 
 # Translations provided by Sun Microsystems
 Name[de]=NVIDIA X-Server-Einstellungen
diff -Nru nvidia-settings-legacy-390xx-390.141/debian/nvidia-settings.install.in nvidia-settings-legacy-390xx-390.143/debian/nvidia-settings.install.in
--- nvidia-settings-legacy-390xx-390.141/debian/nvidia-settings.install.in	2021-01-11 23:48:22.000000000 +0100
+++ nvidia-settings-legacy-390xx-390.143/debian/nvidia-settings.install.in	2021-06-15 10:58:57.000000000 +0200
@@ -1,6 +1,6 @@
 usr/bin/nvidia-settings				usr/lib/#PRIVATE#/
 debian/nvidia-settings.desktop			usr/lib/#PRIVATE#/
-nvidia-settings#LEGACY#.png			usr/share/pixmaps/
+usr/share/icons/
 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-legacy-390xx-390.141/debian/rules nvidia-settings-legacy-390xx-390.143/debian/rules
--- nvidia-settings-legacy-390xx-390.141/debian/rules	2021-01-11 23:48:22.000000000 +0100
+++ nvidia-settings-legacy-390xx-390.143/debian/rules	2021-06-15 10:58:57.000000000 +0200
@@ -26,17 +26,19 @@
 
 include debian/rules.defs
 NVIDIA_LEGACY		?=
-NVIDIA_ALTERNATIVE	?= nvidia$(legacy)-alternative
+NVIDIA_TESLA		?=
 NVIDIA_RELEASE		 = $(DEB_VERSION_UPSTREAM)
-legacy			 = $(if $(NVIDIA_LEGACY),-legacy-$(NVIDIA_LEGACY)xx)
-legacy_description	 = $(if $(NVIDIA_LEGACY), ($(NVIDIA_LEGACY)xx legacy version))
-nvidia_private		 = nvidia$(if $(legacy),/$(patsubst -%,%,$(legacy)),/current)
-watch_version		?= $(NVIDIA_LEGACY)
+variant			 = $(if $(NVIDIA_TESLA),tesla-$(NVIDIA_TESLA),$(if $(NVIDIA_LEGACY),legacy-$(NVIDIA_LEGACY)xx))
+variant_description	 = $(if $(NVIDIA_TESLA), (Tesla $(NVIDIA_TESLA) version),$(if $(NVIDIA_LEGACY), ($(NVIDIA_LEGACY)xx legacy version)))
+-variant		 = $(if $(variant),-$(variant))
+nvidia			 = nvidia$(-variant)
+nvidia_private		 = nvidia/$(if $(variant),$(variant),current)
+watch_version		?= $(or $(NVIDIA_TESLA),$(NVIDIA_LEGACY))
 
 ALL_CONTROL	:= $(wildcard debian/nvidia-settings.*)
-LEGACY_CONTROL	:= $(wildcard debian/nvidia-settings$(legacy).*)
-RENAME_CONTROL	 = $(filter-out $(LEGACY_CONTROL),$(ALL_CONTROL))
-RENAMED_CONTROL	 = $(patsubst debian/nvidia-settings.%,debian/nvidia-settings$(legacy).%,$(RENAME_CONTROL))
+VARIANT_CONTROL	:= $(wildcard debian/nvidia-settings$(-variant).*)
+RENAME_CONTROL	 = $(filter-out $(VARIANT_CONTROL),$(ALL_CONTROL))
+RENAMED_CONTROL	 = $(patsubst debian/nvidia-settings.%,debian/nvidia-settings$(-variant).%,$(RENAME_CONTROL))
 TEMPLATES	:= $(wildcard debian/*.in)
 AUTOGEN		+= $(patsubst %.in,%,$(TEMPLATES))
 AUTOGEN		+= $(patsubst %.in,%,$(RENAMED_CONTROL))
@@ -55,7 +57,8 @@
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp
 	install -m 0755 samples/$(OUTPUTDIR)/nv-control-dpy debian/tmp/usr/bin/
-	install -m 0644 doc/nvidia-settings.png debian/tmp/nvidia-settings$(legacy).png
+	install -d -m 0755 debian/tmp/usr/share/icons/hicolor/128x128/apps/
+	install -m 0644 doc/nvidia-settings.png debian/tmp/usr/share/icons/hicolor/128x128/apps/nvidia-settings$(-variant).png
 
 execute_after_dh_auto_clean:
 	$(RM) src/libXNVCtrl/libXNVCtrl.a
@@ -66,27 +69,27 @@
 	$(MAKE) -f debian/rules $(AUTOKEEP)
 
 override_dh_gencontrol:
-	dh_gencontrol -- -V'nvidia:Legacy=$(legacy)' \
-		-V'nvidia:LegacyDesc=$(legacy_description)' \
-		-V'nvidia:Version=$(NVIDIA_RELEASE)' \
-		-V'nvidia-alternative=$(NVIDIA_ALTERNATIVE)'
+	dh_gencontrol -- \
+		-V'nvidia=$(nvidia)' \
+		-V'nvidia:VariantDesc=$(variant_description)' \
+		-V'nvidia:Version=$(NVIDIA_RELEASE)'
 
 # used by dpkg-genchanges
 debian/substvars:
-	echo 'nvidia:LegacyDesc=$(legacy_description)' > $@
+	echo 'nvidia:VariantDesc=$(variant_description)' > $@
 
 
 # Generating control files
 debian/%:: debian/%.in debian/rules debian/rules.defs
 	perl -p \
-		-e 's{#LEGACY#}{$(legacy)}g;' \
-		-e 's{#LEGACY_DESC#}{$(legacy_description)}g;' \
+		-e 's{#VARIANT#}{$(-variant)}g;' \
+		-e 's{#VARIANT_DESC#}{$(variant_description)}g;' \
 		-e 's{#PRIVATE#}{$(nvidia_private)}g;' \
 		-e 's{#WATCH_VERSION#}{$(watch_version)}g;' \
 		< $< > $@
 
-# Renaming control files for legacy packaging
-ifneq (,$(legacy))
-nvidia-settings$(legacy).%: nvidia-settings.%
+# Renaming control files for variant packaging
+ifneq (,$(variant))
+nvidia-settings$(-variant).%: nvidia-settings.%
 	cp -a $< $@
 endif
diff -Nru nvidia-settings-legacy-390xx-390.141/debian/rules.defs nvidia-settings-legacy-390xx-390.143/debian/rules.defs
--- nvidia-settings-legacy-390xx-390.141/debian/rules.defs	2021-01-11 23:48:22.000000000 +0100
+++ nvidia-settings-legacy-390xx-390.143/debian/rules.defs	2021-06-15 10:58:57.000000000 +0200
@@ -1 +1,2 @@
+#NVIDIA_TESLA	 =
 NVIDIA_LEGACY	 = 390
diff -Nru nvidia-settings-legacy-390xx-390.141/doc/version.mk nvidia-settings-legacy-390xx-390.143/doc/version.mk
--- nvidia-settings-legacy-390xx-390.141/doc/version.mk	2020-12-28 17:31:30.000000000 +0100
+++ nvidia-settings-legacy-390xx-390.143/doc/version.mk	2021-03-12 08:29:56.000000000 +0100
@@ -1 +1 @@
-NVIDIA_VERSION = 390.141
+NVIDIA_VERSION = 390.143
diff -Nru nvidia-settings-legacy-390xx-390.141/samples/version.mk nvidia-settings-legacy-390xx-390.143/samples/version.mk
--- nvidia-settings-legacy-390xx-390.141/samples/version.mk	2020-12-28 17:31:30.000000000 +0100
+++ nvidia-settings-legacy-390xx-390.143/samples/version.mk	2021-03-12 08:29:56.000000000 +0100
@@ -1 +1 @@
-NVIDIA_VERSION = 390.141
+NVIDIA_VERSION = 390.143
diff -Nru nvidia-settings-legacy-390xx-390.141/src/libXNVCtrl/version.mk nvidia-settings-legacy-390xx-390.143/src/libXNVCtrl/version.mk
--- nvidia-settings-legacy-390xx-390.141/src/libXNVCtrl/version.mk	2020-12-28 17:31:30.000000000 +0100
+++ nvidia-settings-legacy-390xx-390.143/src/libXNVCtrl/version.mk	2021-03-12 08:29:56.000000000 +0100
@@ -1 +1 @@
-NVIDIA_VERSION = 390.141
+NVIDIA_VERSION = 390.143
diff -Nru nvidia-settings-legacy-390xx-390.141/src/version.h nvidia-settings-legacy-390xx-390.143/src/version.h
--- nvidia-settings-legacy-390xx-390.141/src/version.h	2020-12-28 17:31:30.000000000 +0100
+++ nvidia-settings-legacy-390xx-390.143/src/version.h	2021-03-12 08:29:56.000000000 +0100
@@ -1 +1 @@
-#define NVIDIA_VERSION "390.141"
+#define NVIDIA_VERSION "390.143"
diff -Nru nvidia-settings-legacy-390xx-390.141/src/version.mk nvidia-settings-legacy-390xx-390.143/src/version.mk
--- nvidia-settings-legacy-390xx-390.141/src/version.mk	2020-12-28 17:31:30.000000000 +0100
+++ nvidia-settings-legacy-390xx-390.143/src/version.mk	2021-03-12 08:29:56.000000000 +0100
@@ -1 +1 @@
-NVIDIA_VERSION = 390.141
+NVIDIA_VERSION = 390.143
diff -Nru nvidia-settings-legacy-390xx-390.141/version.mk nvidia-settings-legacy-390xx-390.143/version.mk
--- nvidia-settings-legacy-390xx-390.141/version.mk	2020-12-28 17:31:30.000000000 +0100
+++ nvidia-settings-legacy-390xx-390.143/version.mk	2021-03-12 08:29:56.000000000 +0100
@@ -1 +1 @@
-NVIDIA_VERSION = 390.141
+NVIDIA_VERSION = 390.143

--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: