Source: cpio Version: 2.14+dfsg-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2
cpio installs its programs into /bin. For the ongoing Debian UsrMerge effort [1] these should move to /usr/bin in the trixie cycle. I'm attaching a relatively trivial patch. Please apply it at your earliest convenience. I don't expect any problems with it, feel free to upload it directly to unstable. If during the trixie cycle your package will undergo structural changes or any other file moves, please see the wiki and upload to experimental first when these changes are done. Chris [1] https://wiki.debian.org/UsrMerge
diff -Nru cpio-2.14+dfsg/debian/changelog cpio-2.14+dfsg/debian/changelog --- cpio-2.14+dfsg/debian/changelog 2023-12-22 06:38:54.000000000 +0100 +++ cpio-2.14+dfsg/debian/changelog 2024-01-05 20:13:43.000000000 +0100 @@ -1,3 +1,10 @@ +cpio (2.14+dfsg-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install programs into /usr. (Closes: #-1) + + -- Chris Hofstaedtler <z...@debian.org> Fri, 05 Jan 2024 20:13:43 +0100 + cpio (2.14+dfsg-1) unstable; urgency=medium * New upstream release diff -Nru cpio-2.14+dfsg/debian/rules cpio-2.14+dfsg/debian/rules --- cpio-2.14+dfsg/debian/rules 2023-12-22 06:32:40.000000000 +0100 +++ cpio-2.14+dfsg/debian/rules 2024-01-05 20:13:40.000000000 +0100 @@ -33,7 +33,7 @@ cd obj && ../configure $(shell dpkg-buildflags --export=configure) --prefix=/usr --enable-mt $(CROSS) \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --bindir=/bin \ + --bindir=/usr/bin \ --libexecdir=/usr/sbin touch tests/testsuite tests/package.m4 @@ -73,19 +73,19 @@ debian/prerm debian/tmp/DEBIAN/. # Install directories $(INSTALL_DIR) \ - debian/tmp/bin \ + debian/tmp/usr/bin \ debian/tmp/usr/share/man/man1 \ debian/tmp/usr/share/info # Install files $(MAKE) -C obj install DESTDIR=$(CURDIR)/debian/tmp rm -rf debian/tmp/usr/libexec rm -rf debian/tmp/usr/share/man/man8/rmt.8 - mv debian/tmp/bin/mt debian/tmp/bin/mt-gnu + mv debian/tmp/usr/bin/mt debian/tmp/usr/bin/mt-gnu mv debian/tmp/usr/share/man/man1/mt.1 \ debian/tmp/usr/share/man/man1/mt-gnu.1 # Strip binaries (including hack by policy wonks) ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - $(STRIP) -R.note -R.comment debian/tmp/bin/* + $(STRIP) -R.note -R.comment debian/tmp/usr/bin/* endif rm -rf debian/tmp/usr/sbin # Install documentation @@ -100,7 +100,7 @@ rm -rf debian/tmp/usr/share/info install -m 644 debian/copyright debian/tmp/usr/share/doc/$(package)/. # Determine shared library dependencies - dpkg-shlibdeps debian/tmp/bin/cpio debian/tmp/bin/mt-gnu + dpkg-shlibdeps debian/tmp/usr/bin/cpio debian/tmp/usr/bin/mt-gnu # Generate md5sums cd debian/tmp && find * -type f ! -regex '^DEBIAN/.*' -print0 | LC_ALL=C sort -z | xargs -r0 md5sum > DEBIAN/md5sums
