Source: bzip2
Version: 1.0.8-5
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Hi,
We want to finalize the /usr-merge transition via DEP17 by moving all
the files from aliased locations to /usr. bzip2 is involved early,
because it is part of the essential set. I'm attaching a patch for the
conversion. I do not expect this to produce a report from dumat, but the
patch is non-trivial in other ways and I appreciate a review. It should
not be uploaded to bookworm-backports or earlier. If you want to support
backports, please use dh_movetousr instead.
Helmut
diff --minimal -Nru bzip2-1.0.8/debian/bzip2.install
bzip2-1.0.8/debian/bzip2.install
--- bzip2-1.0.8/debian/bzip2.install 2021-11-27 13:25:05.000000000 +0100
+++ bzip2-1.0.8/debian/bzip2.install 2024-01-03 20:32:53.000000000 +0100
@@ -1,2 +1,2 @@
-bin
-debian/bzexe bin
+usr/bin
+debian/bzexe usr/bin
diff --minimal -Nru bzip2-1.0.8/debian/bzip2.links
bzip2-1.0.8/debian/bzip2.links
--- bzip2-1.0.8/debian/bzip2.links 2021-11-27 13:25:05.000000000 +0100
+++ bzip2-1.0.8/debian/bzip2.links 2024-01-03 20:33:52.000000000 +0100
@@ -1,7 +1,7 @@
-bin/bzdiff bin/bzcmp
-bin/bzgrep bin/bzegrep
-bin/bzgrep bin/bzfgrep
-bin/bzmore bin/bzless
+usr/bin/bzdiff usr/bin/bzcmp
+usr/bin/bzgrep usr/bin/bzegrep
+usr/bin/bzgrep usr/bin/bzfgrep
+usr/bin/bzmore usr/bin/bzless
usr/share/man/man1/bzip2.1.gz usr/share/man/man1/bunzip2.1.gz
usr/share/man/man1/bzip2.1.gz usr/share/man/man1/bzcat.1.gz
diff --minimal -Nru bzip2-1.0.8/debian/bzip2.manpages
bzip2-1.0.8/debian/bzip2.manpages
--- bzip2-1.0.8/debian/bzip2.manpages 2021-11-27 13:25:05.000000000 +0100
+++ bzip2-1.0.8/debian/bzip2.manpages 2024-01-03 20:33:52.000000000 +0100
@@ -1,2 +1,2 @@
-man/man1/*
+usr/man/man1/*
debian/bzexe.1
diff --minimal -Nru bzip2-1.0.8/debian/changelog bzip2-1.0.8/debian/changelog
--- bzip2-1.0.8/debian/changelog 2021-12-03 09:32:51.000000000 +0100
+++ bzip2-1.0.8/debian/changelog 2024-01-03 20:33:52.000000000 +0100
@@ -1,3 +1,10 @@
+bzip2 (1.0.8-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * DEP17: Move files to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Wed, 03 Jan 2024 20:33:52 +0100
+
bzip2 (1.0.8-5) unstable; urgency=medium
[ Gianfranco Costamagna ]
diff --minimal -Nru bzip2-1.0.8/debian/libbz2-dev.install
bzip2-1.0.8/debian/libbz2-dev.install
--- bzip2-1.0.8/debian/libbz2-dev.install 2021-12-03 09:30:18.000000000
+0100
+++ bzip2-1.0.8/debian/libbz2-dev.install 2024-01-03 20:33:50.000000000
+0100
@@ -1 +1 @@
-include usr
+usr/include
diff --minimal -Nru bzip2-1.0.8/debian/not-installed
bzip2-1.0.8/debian/not-installed
--- bzip2-1.0.8/debian/not-installed 2021-12-03 05:53:00.000000000 +0100
+++ bzip2-1.0.8/debian/not-installed 2024-01-03 20:33:52.000000000 +0100
@@ -1,2 +1,2 @@
# Replaced with a symbolick link conforming to policy in usr/lib.
-lib/libbz2.so
+usr/lib/libbz2.so
diff --minimal -Nru bzip2-1.0.8/debian/rules bzip2-1.0.8/debian/rules
--- bzip2-1.0.8/debian/rules 2021-12-03 05:53:00.000000000 +0100
+++ bzip2-1.0.8/debian/rules 2024-01-03 20:33:52.000000000 +0100
@@ -66,7 +66,7 @@
.PHONY: override_dh_auto_install-arch
override_dh_auto_install-arch:
- dh_auto_install -- PREFIX=$(CURDIR)/debian/tmp
+ dh_auto_install -- PREFIX=$(CURDIR)/debian/tmp/usr
# Documentation is installed directly, not in debian/tmp.
.PHONY: override_dh_auto_install-indep
@@ -75,15 +75,15 @@
override_dh_link:
# This isn't the soname, and nothing should be looking for this file,
# but leave it alone for now
- dh_link -p$(lib_pkg) lib/$(DEB_HOST_MULTIARCH)/libbz2.so.1.0.4 \
- lib/$(DEB_HOST_MULTIARCH)/libbz2.so.1
- dh_link -p$(dev_pkg) lib/$(DEB_HOST_MULTIARCH)/libbz2.so.1.0 \
+ dh_link -p$(lib_pkg) usr/lib/$(DEB_HOST_MULTIARCH)/libbz2.so.1.0.4 \
+ usr/lib/$(DEB_HOST_MULTIARCH)/libbz2.so.1
+ dh_link -p$(dev_pkg) usr/lib/$(DEB_HOST_MULTIARCH)/libbz2.so.1.0 \
usr/lib/$(DEB_HOST_MULTIARCH)/libbz2.so
dh_link --remaining-packages
override_dh_install:
- dh_install -p$(lib_pkg) lib/libbz2.so.* lib/$(DEB_HOST_MULTIARCH)
- dh_install -p$(dev_pkg) lib/libbz2.a usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install -p$(lib_pkg) usr/lib/libbz2.so.*
usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_install -p$(dev_pkg) usr/lib/libbz2.a usr/lib/$(DEB_HOST_MULTIARCH)
dh_install --remaining-packages
# --fail-missing becomes the default with debhelper 12.
