Source: 389-ds-base Version: 2.4.4+dfsg1-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2
Please find a patch attached to install aliased files into /usr, for the currently ongoing UsrMerge effort [1]. It has been build-tested and checked by dumat. Please review it and upload to unstable during the trixie cycle, preferably before the time_t-64bit transition. Note: this should not be backported to bookworm. If you intend to backport, please use dh_movetousr instead. If your package will change for the t64 transition or otherwise rename/split/move its binaries (packages) during trixie, please then upload to experimental and get in touch with the UsrMerge driver, please see the wiki [1]. Chris [1] https://wiki.debian.org/UsrMerge
diff -Nru 389-ds-base-2.4.4+dfsg1/debian/389-ds-base.install 389-ds-base-2.4.4+dfsg1/debian/389-ds-base.install --- 389-ds-base-2.4.4+dfsg1/debian/389-ds-base.install 2024-01-08 16:13:23.000000000 +0100 +++ 389-ds-base-2.4.4+dfsg1/debian/389-ds-base.install 2024-01-09 19:14:23.000000000 +0100 @@ -1,10 +1,10 @@ etc/dirsrv/config/ etc/dirsrv/schema/*.ldif etc/systemd/ -lib/systemd/system/dirsrv-snmp.service -lib/systemd/system/dirsrv.target -lib/systemd/system/dirsrv@.service -lib/systemd/system/dirsrv@.service.d/custom.conf +usr/lib/systemd/system/dirsrv-snmp.service +usr/lib/systemd/system/dirsrv.target +usr/lib/systemd/system/dirsrv@.service +usr/lib/systemd/system/dirsrv@.service.d/custom.conf usr/bin/dbscan usr/bin/ds-logpipe usr/bin/ds-replcheck diff -Nru 389-ds-base-2.4.4+dfsg1/debian/389-ds-base.links 389-ds-base-2.4.4+dfsg1/debian/389-ds-base.links --- 389-ds-base-2.4.4+dfsg1/debian/389-ds-base.links 2024-01-08 16:13:23.000000000 +0100 +++ 389-ds-base-2.4.4+dfsg1/debian/389-ds-base.links 2024-01-09 19:14:33.000000000 +0100 @@ -1 +1 @@ -/dev/null lib/systemd/system/dirsrv.service +/dev/null usr/lib/systemd/system/dirsrv.service diff -Nru 389-ds-base-2.4.4+dfsg1/debian/changelog 389-ds-base-2.4.4+dfsg1/debian/changelog --- 389-ds-base-2.4.4+dfsg1/debian/changelog 2024-01-08 17:04:08.000000000 +0100 +++ 389-ds-base-2.4.4+dfsg1/debian/changelog 2024-01-09 19:30:25.000000000 +0100 @@ -1,3 +1,10 @@ +389-ds-base (2.4.4+dfsg1-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install aliased files into /usr (DEP17 M2) (Closes: #-1) + + -- Chris Hofstaedtler <z...@debian.org> Tue, 09 Jan 2024 19:30:25 +0100 + 389-ds-base (2.4.4+dfsg1-1) unstable; urgency=medium * New upstream release. diff -Nru 389-ds-base-2.4.4+dfsg1/debian/rules 389-ds-base-2.4.4+dfsg1/debian/rules --- 389-ds-base-2.4.4+dfsg1/debian/rules 2024-01-08 16:40:49.000000000 +0100 +++ 389-ds-base-2.4.4+dfsg1/debian/rules 2024-01-09 19:26:16.000000000 +0100 @@ -33,7 +33,7 @@ dh_auto_configure -- \ --with-openldap \ --with-systemd \ - --with-systemdsystemunitdir=/lib/systemd/system \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-systemdsystemconfdir=/etc/systemd/system \ --with-systemdgroupname=dirsrv.target \ --with-tmpfiles-d=/etc/tmpfiles.d \
