Package: cpio
Version: 2.14+dfsg-1
Tags: patch
Hi,
we're slowly moving forward with finalizing the /usr-merge via DEP17.
This involves moving files to /usr and cpio happens to be part of a
default debootstrap. Therefore, I've prepared a patch for performing the
move. This patch should not be backported to bookworm-backports or
older. If you want to keep the option of backporting, please use
dh_movetousr instead.
Helmut
diff --minimal -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 2023-12-31 13:36:22.000000000 +0100
@@ -1,3 +1,10 @@
+cpio (2.14+dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move files to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sun, 31 Dec 2023 13:36:22 +0100
+
cpio (2.14+dfsg-1) unstable; urgency=medium
* New upstream release
diff --minimal -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 2023-12-31 13:36:22.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
