Package: snapd Version: 2.62-1 Tags: patch User: helm...@debian.org Usertags: dep17m2
Hi, we want to move all aliased files from / to /usr to finalize the /usr-merge transition via DEP17. I'm sending you a patch, because snapd did not convert by itself. This patch must not be backported to bookworm. Otherwise, this should be safe to apply unless you plan to rename or restructure the snapd package. If you do, please upload to experimental first to have QA check your package. Helmut
diff -Nru snapd-2.62/debian/changelog snapd-2.62/debian/changelog --- snapd-2.62/debian/changelog 2024-04-17 09:02:58.000000000 +0200 +++ snapd-2.62/debian/changelog 2024-05-14 10:16:09.000000000 +0200 @@ -1,3 +1,10 @@ +snapd (2.62-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Move files to /usr for DEP17. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Tue, 14 May 2024 10:16:09 +0200 + snapd (2.62-1) unstable; urgency=medium [ Ernest Lotter ] diff -Nru snapd-2.62/debian/rules snapd-2.62/debian/rules --- snapd-2.62/debian/rules 2024-04-17 09:02:58.000000000 +0200 +++ snapd-2.62/debian/rules 2024-05-14 10:16:09.000000000 +0200 @@ -35,7 +35,7 @@ endif # this is overridden in the ubuntu/14.04 release branch -SYSTEMD_UNITS_DESTDIR="lib/systemd/system/" +SYSTEMD_UNITS_DESTDIR="$(shell pkg-config --variable=systemdsystemunitdir systemd)" # The go tool does not fully support vendoring with gccgo, but we can # work around that by constructing the appropriate -I flag by hand. diff -Nru snapd-2.62/debian/snapd.links snapd-2.62/debian/snapd.links --- snapd-2.62/debian/snapd.links 2024-04-17 09:02:58.000000000 +0200 +++ snapd-2.62/debian/snapd.links 2024-05-14 10:15:46.000000000 +0200 @@ -1,4 +1,4 @@ -/usr/lib/snapd/snap-device-helper /lib/udev/snappy-app-dev +/usr/lib/snapd/snap-device-helper /usr/lib/udev/snappy-app-dev # This should be removed once we can rely on debhelper >= 11.5: # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764678 /usr/lib/systemd/user/snapd.session-agent.socket /usr/lib/systemd/user/sockets.target.wants/snapd.session-agent.socket