Source: procps
Version: 2:4.0.4-2
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
We want to finalize the /usr-merge by moving files from / to /usr via
DEP17. procps is involved at this time, because it is part of the
debootstrap set. I'm attaching a patch for performing the merge. This
patch should not be backported to bookworm-backports or earlier. If you
want to support backporting, please use dh_movetousr instead. Please
upload this change to experimental first as a precautions measure. If
you do not receive an RC bug within three days, move forward to
unstable.
Helmut
diff --minimal -Nru procps-4.0.4/debian/changelog procps-4.0.4/debian/changelog
--- procps-4.0.4/debian/changelog 2023-10-09 08:02:52.000000000 +0200
+++ procps-4.0.4/debian/changelog 2024-01-01 21:36:06.000000000 +0100
@@ -1,3 +1,10 @@
+procps (2:4.0.4-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move files to /usr for DEP17. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 01 Jan 2024 21:36:06 +0100
+
procps (2:4.0.4-2) unstable; urgency=medium
* Loosen regex and check file perms in pmap test Closes: #1052034
diff --minimal -Nru procps-4.0.4/debian/libproc2-0.install
procps-4.0.4/debian/libproc2-0.install
--- procps-4.0.4/debian/libproc2-0.install 2023-10-09 08:02:52.000000000
+0200
+++ procps-4.0.4/debian/libproc2-0.install 2024-01-01 21:32:37.000000000
+0100
@@ -1 +1 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libproc2.so.* lib/${DEB_HOST_MULTIARCH}/
+usr/lib/${DEB_HOST_MULTIARCH}/libproc2.so.*
diff --minimal -Nru procps-4.0.4/debian/libproc2-dev.links
procps-4.0.4/debian/libproc2-dev.links
--- procps-4.0.4/debian/libproc2-dev.links 2023-10-09 08:02:52.000000000
+0200
+++ procps-4.0.4/debian/libproc2-dev.links 2024-01-01 21:32:49.000000000
+0100
@@ -1 +1 @@
-lib/${DEB_HOST_MULTIARCH}/libproc2.so.0
usr/lib/${DEB_HOST_MULTIARCH}/libproc2.so
+usr/lib/${DEB_HOST_MULTIARCH}/libproc2.so.0
usr/lib/${DEB_HOST_MULTIARCH}/libproc2.so
diff --minimal -Nru procps-4.0.4/debian/procps.install
procps-4.0.4/debian/procps.install
--- procps-4.0.4/debian/procps.install 2023-10-09 08:02:52.000000000 +0200
+++ procps-4.0.4/debian/procps.install 2024-01-01 21:36:06.000000000 +0100
@@ -3,7 +3,6 @@
debian/sysctl.conf etc
debian/99-protect-links.conf usr/lib/sysctl.d
debian/README.sysctl etc/sysctl.d
-bbin/* bin
-bin/* usr/bin
-sbin/sysctl sbin
+usr/bin
+usr/sbin/sysctl usr/sbin
usr/share/locale
diff --minimal -Nru procps-4.0.4/debian/procps.install.hurd
procps-4.0.4/debian/procps.install.hurd
--- procps-4.0.4/debian/procps.install.hurd 2023-10-09 08:02:52.000000000
+0200
+++ procps-4.0.4/debian/procps.install.hurd 2024-01-01 21:34:21.000000000
+0100
@@ -1,5 +1,3 @@
# Files to install for hurd systems
-bbin/kill.procps bin
-bbin/ps.procps bin
-bin/* /usr/bin
+usr/bin
usr/share/locale
diff --minimal -Nru procps-4.0.4/debian/procps.install.kfreebsd
procps-4.0.4/debian/procps.install.kfreebsd
--- procps-4.0.4/debian/procps.install.kfreebsd 2023-10-09 08:02:52.000000000
+0200
+++ procps-4.0.4/debian/procps.install.kfreebsd 2024-01-01 21:34:39.000000000
+0100
@@ -1,5 +1,3 @@
# Files to install for kfreebsd systems
-bbin/kill.procps bin
-bbin/ps bin
-bin/* /usr/bin
+usr/bin
usr/share/locale
diff --minimal -Nru procps-4.0.4/debian/rules procps-4.0.4/debian/rules
--- procps-4.0.4/debian/rules 2023-10-09 08:02:52.000000000 +0200
+++ procps-4.0.4/debian/rules 2024-01-01 21:35:22.000000000 +0100
@@ -40,7 +40,6 @@
--disable-pidof \
--disable-modern-top \
--prefix=/usr \
- --exec-prefix=/ \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--build=$(DEB_BUILD_GNU_TYPE) \
--host=$(DEB_HOST_GNU_TYPE) \
@@ -48,9 +47,6 @@
override_dh_auto_install: $(autogen-files)
dh_auto_install
- mkdir $(DEBROOT)/bbin
- mv $(DEBROOT)/bin/kill $(DEBROOT)/bbin/
- mv $(DEBROOT)/bin/ps $(DEBROOT)/bbin/
ifneq ($(DEB_HOST_ARCH_OS), linux)
rm -f \
@@ -62,7 +58,7 @@
$(NULL)
# Rename kill as there are two of them
- (cd $(DEBROOT)/bbin && mv kill kill.procps )
+ (cd $(DEBROOT)/usr/bin && mv kill kill.procps )
(cd $(DEBROOT)/usr/share/man/man1 && mv kill.1 kill.procps.1 )
endif
ifeq ($(DEB_HOST_ARCH_OS), hurd)
@@ -72,15 +68,15 @@
$(NULL)
# Rename vmstat as there are two of them
- (cd $(DEBROOT)/bin && mv vmstat vmstat.procps )
+ (cd $(DEBROOT)/usr/bin && mv vmstat vmstat.procps )
(cd $(DEBROOT)/usr/share/man/man8 && mv vmstat.8 vmstat.procps.8 )
# Rename uptime as there are two of them
- (cd $(DEBROOT)/bin && mv uptime uptime.procps )
+ (cd $(DEBROOT)/usr/bin && mv uptime uptime.procps )
(cd $(DEBROOT)/usr/share/man/man1 && mv uptime.1 uptime.procps.1 )
# Rename ps as there are two of them
- (cd $(DEBROOT)/bbin && mv ps ps.procps )
+ (cd $(DEBROOT)/usr/bin && mv ps ps.procps )
(cd $(DEBROOT)/usr/share/man/man1 && mv ps.1 ps.procps.1 )
endif
