Coordinated move of binaries into /usrdebian/1%1.36.1-6_exp.1

7 files changed, 16 insertions, 9 deletions

diff --git a/debian/busybox-static.install b/debian/busybox-static.install
index c75abcaed..4107d204c 100644
--- a/debian/busybox-static.install
+++ b/debian/busybox-static.install
@@ -1,3 +1,3 @@
-b/static/busybox bin/
+b/static/busybox usr/bin/
 b/static/docs/busybox.1 usr/share/man/man1/
 debian/tree/busybox/* /
diff --git a/debian/busybox-syslogd.links b/debian/busybox-syslogd.links
index 959347905..35acb166f 100644
--- a/debian/busybox-syslogd.links
+++ b/debian/busybox-syslogd.links
@@ -1,6 +1,6 @@
-bin/busybox bin/logread
-bin/busybox sbin/klogd
-bin/busybox sbin/syslogd
+usr/bin/busybox usr/bin/logread
+usr/bin/busybox usr/sbin/klogd
+usr/bin/busybox usr/sbin/syslogd
 usr/share/man/man1/busybox.1.gz usr/share/man/man1/logread.1.gz
 usr/share/man/man1/busybox.1.gz usr/share/man/man8/klogd.8.gz
 usr/share/man/man1/busybox.1.gz usr/share/man/man8/syslogd.8.gz
diff --git a/debian/busybox-udeb.install b/debian/busybox-udeb.install
index a075c9f37..63576af43 100644
--- a/debian/busybox-udeb.install
+++ b/debian/busybox-udeb.install
@@ -1,2 +1,2 @@
-b/udeb/busybox bin/
+b/udeb/busybox usr/bin/
 debian/tree/busybox-udeb/* /
diff --git a/debian/busybox.install b/debian/busybox.install
index 99e4ad446..54cedff8b 100644
--- a/debian/busybox.install
+++ b/debian/busybox.install
@@ -1,3 +1,3 @@
-b/deb/busybox bin/
+b/deb/busybox usr/bin/
 b/deb/docs/busybox.1 usr/share/man/man1/
 debian/tree/busybox/* /
diff --git a/debian/changelog b/debian/changelog
index ebde58a37..c2bd84eaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+busybox (1:1.36.1-6~exp.1) experimental; urgency=medium
+
+  * Coordinated move of binaries into /usr.
+  * Upload to experimental.
+
+ -- Chris Boot <bootc@debian.org>  Thu, 23 Nov 2023 12:35:38 +0000
+
 busybox (1:1.36.1-5) unstable; urgency=medium
 
   * config:
diff --git a/debian/udhcpc.links b/debian/udhcpc.links
index 6881752b5..5d7942323 100644
--- a/debian/udhcpc.links
+++ b/debian/udhcpc.links
@@ -1,2 +1,2 @@
-bin/busybox sbin/udhcpc
+usr/bin/busybox usr/sbin/udhcpc
 usr/share/man/man1/busybox.1.gz usr/share/man/man8/udhcpc.8.gz
diff --git a/debian/udhcpd.links b/debian/udhcpd.links
index e91e31cda..d92ff591d 100644
--- a/debian/udhcpd.links
+++ b/debian/udhcpd.links
@@ -1,4 +1,4 @@
-bin/busybox usr/bin/dumpleases
-bin/busybox usr/sbin/udhcpd
+usr/bin/busybox usr/bin/dumpleases
+usr/bin/busybox usr/sbin/udhcpd
 usr/share/man/man1/busybox.1.gz usr/share/man/man1/dumpleases.1.gz
 usr/share/man/man1/busybox.1.gz usr/share/man/man8/udhcpd.8.gz