Your message dated Fri, 01 Mar 2024 23:04:13 +0000
with message-id <[email protected]>
and subject line Bug#1059394: fixed in bridge-utils 1.7.1-2
has caused the Debian Bug report #1059394,
regarding bridge-utils: install files into /usr (instead of /)
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1059394: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1059394
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: bridge-utils
Version: 1.7.1-1
Severity: normal
Tags: patch
User: [email protected]
Usertags: dep17m2
Hi!
Your package installs files directly into /. For the ongoing Debian
UsrMerge effort [1] these files should move to /usr in the trixie
cycle.
I'm attaching a patch to implement such a move.
However, please still read the wiki page on moving files, especially
if you intend to backport to bookworm or earlier. The patch has
already been checked by a local dumat copy.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please also see the wiki and upload
to experimental first when these changes are done.
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru bridge-utils-1.7.1/debian/bridge-network-interface.sh bridge-utils-1.7.1/debian/bridge-network-interface.sh
--- bridge-utils-1.7.1/debian/bridge-network-interface.sh 2023-01-25 22:11:52.000000000 +0100
+++ bridge-utils-1.7.1/debian/bridge-network-interface.sh 2023-12-23 21:31:44.000000000 +0100
@@ -19,7 +19,7 @@
[ "$BRIDGE_HOTPLUG" = "no" ] && exit 0
-. /lib/bridge-utils/bridge-utils.sh
+. /usr/lib/bridge-utils/bridge-utils.sh
if [ -d /run/network ]; then
for i in $(ifquery --list --allow auto); do
diff -Nru bridge-utils-1.7.1/debian/changelog bridge-utils-1.7.1/debian/changelog
--- bridge-utils-1.7.1/debian/changelog 2023-01-25 22:11:52.000000000 +0100
+++ bridge-utils-1.7.1/debian/changelog 2023-12-23 21:31:44.000000000 +0100
@@ -1,3 +1,10 @@
+bridge-utils (1.7.1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install files into /usr instead of /. (Closes: #-1)
+
+ -- Chris Hofstaedtler <[email protected]> Sat, 23 Dec 2023 21:31:44 +0100
+
bridge-utils (1.7.1-1) unstable; urgency=low
* New upstream version.
diff -Nru bridge-utils-1.7.1/debian/dirs bridge-utils-1.7.1/debian/dirs
--- bridge-utils-1.7.1/debian/dirs 2023-01-25 22:11:52.000000000 +0100
+++ bridge-utils-1.7.1/debian/dirs 2023-12-23 21:31:44.000000000 +0100
@@ -1,6 +1,6 @@
etc/network/if-pre-up.d
etc/network/if-down.d
etc/network/if-post-down.d
-sbin
-lib/bridge-utils
-lib/udev
+usr/sbin
+usr/lib/bridge-utils
+usr/lib/udev
diff -Nru bridge-utils-1.7.1/debian/examples/hibernate bridge-utils-1.7.1/debian/examples/hibernate
--- bridge-utils-1.7.1/debian/examples/hibernate 2023-01-25 22:11:52.000000000 +0100
+++ bridge-utils-1.7.1/debian/examples/hibernate 2023-12-23 21:31:44.000000000 +0100
@@ -6,7 +6,7 @@
AddConfigHandler BridgeOptions
BridgeSuspend() {
- for i in `/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
+ for i in `/usr/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
do
ip link set dev $i down
done
@@ -14,7 +14,7 @@
}
BridgeResume() {
- for i in `/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
+ for i in `/usr/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
do
ip link set dev $i up
done
diff -Nru bridge-utils-1.7.1/debian/examples/pm-utils bridge-utils-1.7.1/debian/examples/pm-utils
--- bridge-utils-1.7.1/debian/examples/pm-utils 2023-01-25 22:11:52.000000000 +0100
+++ bridge-utils-1.7.1/debian/examples/pm-utils 2023-12-23 21:31:44.000000000 +0100
@@ -4,7 +4,7 @@
# as /etc/pm/sleep.d/bridge
BridgeSuspend() {
- for i in `/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
+ for i in `/usr/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
do
ip link set dev $i down
done
@@ -12,7 +12,7 @@
}
BridgeResume() {
- for i in `/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
+ for i in `/usr/sbin/brctl show|sed -n "s/^[^ ]*\t\([^\t]*\)/\1/p"`
do
ip link set dev $i up
done
diff -Nru bridge-utils-1.7.1/debian/ifupdown.sh bridge-utils-1.7.1/debian/ifupdown.sh
--- bridge-utils-1.7.1/debian/ifupdown.sh 2023-01-25 22:11:52.000000000 +0100
+++ bridge-utils-1.7.1/debian/ifupdown.sh 2023-12-23 21:31:44.000000000 +0100
@@ -6,7 +6,7 @@
# Have a look at /usr/share/doc/bridge-utils/README.Debian if you want
# more info about the way on wich a bridge is set up on Debian.
-if [ ! -x /sbin/brctl ]
+if [ ! -x /usr/sbin/brctl ]
then
exit 0
fi
@@ -14,7 +14,7 @@
#default configuration
[ -f /etc/default/bridge-utils ] && . /etc/default/bridge-utils
-. /lib/bridge-utils/bridge-utils.sh
+. /usr/lib/bridge-utils/bridge-utils.sh
case "$IF_BRIDGE_PORTS" in
"")
diff -Nru bridge-utils-1.7.1/debian/rules bridge-utils-1.7.1/debian/rules
--- bridge-utils-1.7.1/debian/rules 2023-01-25 22:11:52.000000000 +0100
+++ bridge-utils-1.7.1/debian/rules 2023-12-23 21:31:44.000000000 +0100
@@ -64,13 +64,13 @@
# Add here commands to install the package into debian/tmp.
#$(MAKE) install prefix=$(CURDIR)/debian/bridge-utils/usr
- $(INSTALL_PROGRAM) -m 755 brctl/brctl $(IDIR)/sbin
- $(INSTALL_SCRIPT) -m 755 debian/ifupdown.sh $(IDIR)/lib/bridge-utils/
- ln -s /lib/bridge-utils/ifupdown.sh $(IDIR)/etc/network/if-pre-up.d/bridge
- ln -s /lib/bridge-utils/ifupdown.sh $(IDIR)/etc/network/if-down.d/bridge
- ln -s /lib/bridge-utils/ifupdown.sh $(IDIR)/etc/network/if-post-down.d/bridge
- $(INSTALL_SCRIPT) -m 755 debian/bridge-utils.sh $(IDIR)/lib/bridge-utils/
- $(INSTALL_SCRIPT) -m 755 debian/bridge-network-interface.sh $(IDIR)/lib/udev/bridge-network-interface
+ $(INSTALL_PROGRAM) -m 755 brctl/brctl $(IDIR)/usr/sbin
+ $(INSTALL_SCRIPT) -m 755 debian/ifupdown.sh $(IDIR)/usr/lib/bridge-utils/
+ ln -s /usr/lib/bridge-utils/ifupdown.sh $(IDIR)/etc/network/if-pre-up.d/bridge
+ ln -s /usr/lib/bridge-utils/ifupdown.sh $(IDIR)/etc/network/if-down.d/bridge
+ ln -s /usr/lib/bridge-utils/ifupdown.sh $(IDIR)/etc/network/if-post-down.d/bridge
+ $(INSTALL_SCRIPT) -m 755 debian/bridge-utils.sh $(IDIR)/usr/lib/bridge-utils/
+ $(INSTALL_SCRIPT) -m 755 debian/bridge-network-interface.sh $(IDIR)/usr/lib/udev/bridge-network-interface
# dh_movefiles
--- End Message ---
--- Begin Message ---
Source: bridge-utils
Source-Version: 1.7.1-2
Done: Santiago García Mantiñán <[email protected]>
We believe that the bug you reported is fixed in the latest version of
bridge-utils, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Santiago García Mantiñán <[email protected]> (supplier of updated bridge-utils
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Fri, 01 Mar 2024 23:09:33 +0100
Source: bridge-utils
Architecture: source
Version: 1.7.1-2
Distribution: unstable
Urgency: low
Maintainer: Santiago García Mantiñán <[email protected]>
Changed-By: Santiago García Mantiñán <[email protected]>
Closes: 1059394
Changes:
bridge-utils (1.7.1-2) unstable; urgency=low
.
[ Debian Janitor ]
* Trim trailing whitespace.
* Update standards version to 4.6.2, no changes needed.
.
[ Chris Hofstaedtler ]
* Install files into /usr instead of /. (Closes: #1059394)
Checksums-Sha1:
64a3d80333abec2e6c664418dcd348a5ffc1f6d7 1874 bridge-utils_1.7.1-2.dsc
57a5dbad908dbb28a790328a67412d47b6826cff 16140
bridge-utils_1.7.1-2.debian.tar.xz
947f02306054c97f80b5ea296c62192f50767e30 6357
bridge-utils_1.7.1-2_source.buildinfo
Checksums-Sha256:
5131ca3b4d62f95e47106accd1ecd8893ba315ae5f68d543460b32e5fe934c57 1874
bridge-utils_1.7.1-2.dsc
59dd869801347a7ad5601d758078204545a4af497a9a4b459f10350fe0eeed55 16140
bridge-utils_1.7.1-2.debian.tar.xz
59ebec779464a316928df3f0302b8f749305fb5f93477886906cd13f652f5144 6357
bridge-utils_1.7.1-2_source.buildinfo
Files:
77ce28f507d148bcf76186d770ecf4a9 1874 net optional bridge-utils_1.7.1-2.dsc
4f167135730272dd1bd80bf994a51e97 16140 net optional
bridge-utils_1.7.1-2.debian.tar.xz
815b5b37e7b2d3e083d7c1a4fa2a2d5f 6357 net optional
bridge-utils_1.7.1-2_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEBqPldg9hG0uxqQ5ouGiMo9h21aMFAmXiWsUACgkQuGiMo9h2
1aMaEA//XWePgucGTIi8bfSO8kTByFCIfD2JFCjqYPbKvazRo22F0RU/PoHDzoKl
e+iReTmPodh1EaUSJk89RuQyBHerA7Va82zkFocbuu/WZNx70+OTtBERSYyGkUGi
bWnWeahz9NC7Rd6GT/etxjH7qTN6Jfz56tPg5SzK8eeMkrdK8UWFPS81d6tj2EEI
Cd3j4ZfG16zxM4fiVCoRAoXTkJkMk1IWBhVsoqi5Nx5aTNbK6PX6ZULaiUiqvqNT
41Re159rSRacz38cAodx23JU51a8oI6U0HRs4xGAe/xf5fKxSDUx00YBwC/jrdm4
PIq3hQlpwXGYnvxjCa0Qg3U1l92KSkvuVbDB9WO0qfif4hs+M9Rls1dJ4oYzlt1/
mqjDW7ovZ0Vtg5gYoWYZ53TLe2hA6mlZks+gVWNk/U3Ek4J/bRom+VI1+Bpf7DrY
mVv8BtvRttFVW9SIn3FhEhuztvyDmeYyB2z8EQ402Fo0D61dxmB+azdX5BHcuKFD
ThnVJM+lcSB8IQ7Cb3wn1bWMJAoCxUTcGgsDeUCtYxdXFI5e99P5kADB+KFHQ/sh
+6kIA84fmMCDOyip9jXA9+RrdFfwbjOvRgZgSBU3tht+ac4yEmDyrOwe6EnxJAsc
wh8NWfzBA7VCzKf54+gdTl2bcwowUrcoNxRNtxM1mJh74ihuyW8=
=jCe+
-----END PGP SIGNATURE-----
pgp6zqlYE9OST.pgp
Description: PGP signature
--- End Message ---
