Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian@packages.debian.org
Usertags: pu
[ Reason ]
In prepararion to upgrading nvidia-graphics-drivers(-tesla) to the 535
series (a new LTSB branch announced last week and supported until
June 2026, i.e. sufficient for bookworm) I'd like to split
src:nvidia-settings (building binary packages in main and contrib) into
src:libxnvctrl (in main) and src:nvidia-settings (in contrib).
src:libxnvctrl will most likely see no further updates over the lifetime
of bookworm, while src:nvidia-settings.
As a side effect of this decoupling, bin:nvidia-settings will no longer
be a key package, removing a lot of contrib and non-free packages from
the key package set.
[ Impact ]
Maintaining the new (split style) in sid/trixie and the old (merged
style) in bookworm while updating src:nvidia-settings in bookworm for
updated src:nvidia-drivers(-tesla) versions will be much more difficult
and less tested than doing the package split in stable, too, and just
rebuilding the packages from sid later on.
(This does not affect bullseye which cannot be updated beyond the 470
driver series, so no more nvidia-settings updates are expected there.)
[ Tests ]
diffoscope showed binary identical (excluding metadata) packages built
from src:nvidia-settings (old style) and src:libxnvctrl.
[ Risks ]
Low, the libxnvctrl0, libxnvctrl-dev packages only have metadata
changes.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[ ] the issue is verified as fixed in unstable
the NEW package is is ready in experimental, and I'll upload it to
both sid and bookworm if this request is granted.
[ Changes ]
Most of the diff is just deletion of the packaging bits needed for the
nvidia-settings binary package.
[ Other info ]
This package may require stable-NEW processing.
Andreas
diff --git a/debian/changelog b/debian/changelog
index 884310e..2705350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+libxnvctrl (525.85.05-3~deb12u1) bookworm; urgency=medium
+
+ * Rebuild for bookworm.
+
+ -- Andreas Beckmann Mon, 10 Jul 2023 12:02:00 +0200
+
+libxnvctrl (525.85.05-3) unstable; urgency=medium
+
+ * Upload to unstable.
+
+ -- Andreas Beckmann Mon, 10 Jul 2023 12:01:56 +0200
+
+libxnvctrl (525.85.05-2) experimental; urgency=medium
+
+ * Fork as separate source package building only libxnvctrl0, libxnvctrl-dev
+in main.
+ * Upload to experimental.
+
+ -- Andreas Beckmann Tue, 18 Apr 2023 14:14:26 +0200
+
nvidia-settings (525.85.05-1) unstable; urgency=medium
* New upstream release 525.85.05.
diff --git a/debian/control b/debian/control
index d9a6b3b..7bf03dc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,58 +1,19 @@
-Source: nvidia-settings
-Section: x11
+Source: libxnvctrl
+Section: libs
Priority: optional
Maintainer: Debian NVIDIA Maintainers
Uploaders:
Andreas Beckmann ,
- Luca Boccassi ,
Build-Depends:
debhelper-compat (= 13),
- m4,
- libgl-dev,
- libgtk-3-dev,
- libjansson-dev,
- libwayland-dev,
- libvdpau-dev,
- libxv-dev,
- libxxf86vm-dev,
- pkg-config,
- xserver-xorg-dev,
-Build-Conflicts:
- libxnvctrl-dev,
+ libxext-dev,
Rules-Requires-Root: no
Standards-Version: 4.6.2
Homepage: https://download.nvidia.com/XFree86/nvidia-settings/
Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-settings
-Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-settings.git
-
-Package: nvidia-settings
-Section: contrib/x11
-Architecture: amd64 arm64
-Pre-Depends:
- nvidia-installer-cleanup,
-Depends:
- , ${nvidia}-alternative
- , libxnvctrl0 (= ${binary:Version})
- , ${shlibs:Depends}, ${misc:Depends}
-Recommends:
- , libgl1-${nvidia}-glvnd-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: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
- communication is done with the NV-CONTROL X extension.
- .
- Values such as brightness and gamma, XVideo attributes, temperature,
- and OpenGL settings can be queried and configured via nvidia-settings.
+Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-settings.git -b
libxnvctrl/main
Package: libxnvctrl0
-Section: libs
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/gbp.conf b/debian/gbp.conf
index d3b0fe0..1924bb8 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,8 +1,8 @@
[DEFAULT]
upstream-vcs-tag = %(version)s
upstream-branch = upstream
-debian-branch = main
-debian-tag = debian/%(version)s
+debian-branch = libxnvctrl/main
+debian-tag =