Your message dated Sat, 27 Jan 2024 00:49:33 +0000
with message-id <[email protected]>
and subject line Bug#1057747: fixed in bumblebee 3.2.1-30
has caused the Debian Bug report #1057747,
regarding bumblebee: delegate placement of udev/systemd files to pkg-config data
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 [email protected]
immediately.)


-- 
1057747: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057747
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: bumblebee
Version: 3.2.1-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: dep17m2

Dear Maintainer,

your package installs files related to udev and systemd, into /lib.
These files need to be moved to /usr/lib as part of Debian's
usr-merge effort [1].

Attached you will find a patch to delegate the exact placement of
the udev/systemd files to udev.pc/systemd.pc (using pkg-config).
This should work today
in unstable and, if necessary, for bookworm. Once udev.pc in
unstable points to /usr/lib your package will benefit automatically
after a binNMU or any other upload. systemd.pc was already updated
in unstable.

Later during the trixie cycle I expect this bug class to raise in
priority.

Per the wiki, it is advisable to upload to experimental first, and
wait a few days for the dumat tool to check your package. The same
is advisable when any structural changes are done in the trixie
cycle.

Thank you for considering,
Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru bumblebee-3.2.1/debian/bumblebee.install bumblebee-3.2.1/debian/bumblebee.install
--- bumblebee-3.2.1/debian/bumblebee.install	2023-01-05 01:53:42.000000000 +0100
+++ bumblebee-3.2.1/debian/bumblebee.install	2023-12-07 23:44:03.000000000 +0100
@@ -1,10 +1,10 @@
 etc/bumblebee/bumblebee.conf
 etc/bumblebee/xorg.conf.nvidia
 etc/bumblebee/xorg.conf.nouveau
-lib/udev/rules.d/99-bumblebee-nvidia-dev.rules
+${env:deb_udevdir}/rules.d/99-bumblebee-nvidia-dev.rules
 usr/bin/optirun
 usr/bin/bumblebee-bugreport
 usr/sbin/bumblebeed
 etc/bumblebee/*                       usr/share/bumblebee/default-conf/
 debian/bumblebee.conf                 usr/share/bumblebee/modprobe.d/
-scripts/systemd/bumblebeed.service    lib/systemd/system/
+scripts/systemd/bumblebeed.service    ${env:deb_systemdsystemunitdir}/
diff -Nru bumblebee-3.2.1/debian/changelog bumblebee-3.2.1/debian/changelog
--- bumblebee-3.2.1/debian/changelog	2023-01-05 01:53:42.000000000 +0100
+++ bumblebee-3.2.1/debian/changelog	2023-12-07 23:44:03.000000000 +0100
@@ -1,3 +1,10 @@
+bumblebee (3.2.1-29.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Delegate placement of udev and systemd files to pkg-config data
+
+ -- Chris Hofstaedtler <[email protected]>  Thu, 07 Dec 2023 23:44:03 +0100
+
 bumblebee (3.2.1-29) unstable; urgency=medium
 
   * Switch to dh-sequence-bash-completion.
diff -Nru bumblebee-3.2.1/debian/control bumblebee-3.2.1/debian/control
--- bumblebee-3.2.1/debian/control	2023-01-05 01:53:42.000000000 +0100
+++ bumblebee-3.2.1/debian/control	2023-12-07 23:41:44.000000000 +0100
@@ -16,6 +16,7 @@
  libx11-dev,
  pkg-config,
  libkmod-dev,
+ systemd-dev,
 Rules-Requires-Root: no
 Standards-Version: 4.6.2
 Homepage: https://launchpad.net/~bumblebee
diff -Nru bumblebee-3.2.1/debian/rules bumblebee-3.2.1/debian/rules
--- bumblebee-3.2.1/debian/rules	2023-01-05 01:53:42.000000000 +0100
+++ bumblebee-3.2.1/debian/rules	2023-12-07 23:44:03.000000000 +0100
@@ -57,12 +57,16 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 include /usr/share/dpkg/default.mk
 
+export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
 %:
 	dh $@
 
 override_dh_auto_configure: $(MAINTSCRIPTS_GENERATED)
 ifeq ($(VENDOR),Ubuntu)
 	dh_auto_configure -- \
+		--with-udev-rules=/$(deb_udevdir)/rules.d
 		CONF_DRIVER_MODULE_NVIDIA=nvidia \
 		CONF_LDPATH_NVIDIA=/usr/lib/nvidia-current:/usr/lib32/nvidia-current:/usr/lib/x86_64-linux-gnu:/usr/lib/i386-linux-gnu \
 		CONF_MODPATH_NVIDIA=/usr/lib/nvidia-current/xorg,/usr/lib/xorg/modules \
@@ -70,6 +74,7 @@
 		CONF_XORG_BINARY=/usr/lib/xorg/Xorg
 else
 	dh_auto_configure -- \
+		--with-udev-rules=/$(deb_udevdir)/rules.d
 		CONF_DRIVER_MODULE_NVIDIA=nvidia \
 		CONF_LDPATH_NVIDIA=/usr/lib/x86_64-linux-gnu/nvidia:/usr/lib/i386-linux-gnu/nvidia:/usr/lib/x86_64-linux-gnu:/usr/lib/i386-linux-gnu \
 		CONF_MODPATH_NVIDIA=/usr/lib/nvidia,/usr/lib/xorg/modules \

--- End Message ---
--- Begin Message ---
Source: bumblebee
Source-Version: 3.2.1-30
Done: Andreas Beckmann <[email protected]>

We believe that the bug you reported is fixed in the latest version of
bumblebee, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Andreas Beckmann <[email protected]> (supplier of updated bumblebee package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Sat, 27 Jan 2024 01:28:10 +0100
Source: bumblebee
Architecture: source
Version: 3.2.1-30
Distribution: unstable
Urgency: medium
Maintainer: Debian NVIDIA Maintainers <[email protected]>
Changed-By: Andreas Beckmann <[email protected]>
Closes: 1057747
Changes:
 bumblebee (3.2.1-30) unstable; urgency=medium
 .
   [ Andreas Beckmann ]
   * Update the list of supported drivers.
 .
   [ Chris Hofstaedtler ]
   * Delegate placement of udev and systemd files to pkg-config data.
     (Closes: #1057747)
Checksums-Sha1:
 8e8b8bfbf8a1876a8c5af9b9e00be8e211e87bc1 2267 bumblebee_3.2.1-30.dsc
 999a63af764071d6297b118d3d85e5a64009e999 21964 bumblebee_3.2.1-30.debian.tar.xz
 ef4ac4aa3b486ff57fb256e516b1616bb0bc4dd1 7420 
bumblebee_3.2.1-30_source.buildinfo
Checksums-Sha256:
 158a1bb5382abcb78ede77f2677c4f7d2d821ba1b638beac41be62ca1756ce35 2267 
bumblebee_3.2.1-30.dsc
 483f26e7a49999e887d0cdc5f9ecc98e336e247d75e1d8de5e404817e0aa6df0 21964 
bumblebee_3.2.1-30.debian.tar.xz
 b4e5d51e52f10154ca629984e832f5fde1522d29ae38156874f98d9f630efd88 7420 
bumblebee_3.2.1-30_source.buildinfo
Files:
 4b356cabbaa8a88be9416a80d065116c 2267 utils optional bumblebee_3.2.1-30.dsc
 96309d385d8b559c1731f6a817690ca2 21964 utils optional 
bumblebee_3.2.1-30.debian.tar.xz
 7460c3f1693c44245d7cd3533360d5d8 7420 utils optional 
bumblebee_3.2.1-30_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQJDBAEBCAAuFiEE6/MKMKjZxjvaRMaUX7M/k1np7QgFAmW0TqkQHGFuYmVAZGVi
aWFuLm9yZwAKCRBfsz+TWentCCVbD/UVu1yW9l9uG2UqQUtIDIGNAYBWOaScDnK+
Gq77n5/71DR4V0m7aVn4m4Z95VFMFsIaF/m35qKAfitjCP2XA1FmCqZ3yA/+QdEY
+p53bNciJvnwWEATx3ODupeLEETrojU6Eq4ihu4OL2BxK6KWF1pYLlh57aU/C43G
rOAlxxRI/MJoNKKknWQxnHpe5K4LC6ADg1Du7Uh8HceFRBSoiBWZ8IJSbmMDXpvc
OrNBVxaJ659nVhQtPsoOgVwtpHkRJNWJK1SGM8HmlRf5hxqN3kZ9sPf//te8uqz4
/W3gHqXFjB5KiHmeKLtmI21w9gtZeWhp953oqjynzjBIlOacethr/ZVp/QIsja+e
IQDAHoic6DZ4IqfUMW753Wdl3SB19dqEyxuG0+7kuXvAjdJhndpdoHnutfa4xt0Z
c8SkzkRHCL1p2tWQNQiCzybvpNyuRpmpT3IGg54nD6mlUCV91rDDlHjIgQc3lLDf
kCnwXwDpjjgRfCpHjRwchFliS313YSJFPfjo3YxCmQEMrDysICyejtuMCV8U/lXD
cRKsmlVfoBGUSrBx0UsZNst0E2ZNEQbmATuVWGrMmAC6gtkU5GWgpVHj24vrvAlI
owoYVDsfINAh2K6+nRIgZXtW8MtaPU6yBdchDeaslBtu9qr1MjARvX42qfemmMrI
lPtcqU63
=VeKm
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to