Source: bash Version: 5.2.21-2 Tags: patch moreinfo User: [email protected] Usertags: dep17m2
Do not upload this patch to unstable yet! We want to finalize the /usr-merge transition by moving all aliased files from / to /usr via DEP17 to avoid negative effects arising from aliasing. bash is special, because it is involved with debootstrap and since some packages have #!/bin/bash maintainer scripts we have to sync this move with base-files, dash, glibc and util-linux as I contacted you earlier about this. I do not have a date for the coordinated upload yet, because we need to wait for the time64 transition, but I appreciate reviews already. The patch is relatively boring otherwise. Helmut
diff --minimal -Nru bash-5.2.21/debian/changelog bash-5.2.21/debian/changelog --- bash-5.2.21/debian/changelog 2023-11-26 09:09:52.000000000 +0100 +++ bash-5.2.21/debian/changelog 2024-01-24 09:15:01.000000000 +0100 @@ -1,3 +1,10 @@ +bash (5.2.21-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * DEP17: Move files to /usr. (Closes: #-1) + + -- Helmut Grohne <[email protected]> Wed, 24 Jan 2024 09:15:01 +0100 + bash (5.2.21-2) unstable; urgency=medium * Fix crash in rl_do_undo, taken from upstream. See #1056314, #1037274. diff --minimal -Nru bash-5.2.21/debian/rules bash-5.2.21/debian/rules --- bash-5.2.21/debian/rules 2023-01-01 12:52:43.000000000 +0100 +++ bash-5.2.21/debian/rules 2024-01-24 09:15:01.000000000 +0100 @@ -184,7 +184,7 @@ dh_testroot dh_prep -p$(p) -p$(p_doc) -p$(p_bins) dh_installdirs -p$(p) \ - bin \ + usr/bin \ etc/skel \ usr/share/doc/$(p) dh_installdirs -p$(p_doc) \ @@ -201,7 +201,6 @@ $(MAKE) -C build-bash install \ YACC="$(YACC)" \ DESTDIR=$(CURDIR)/$(d) - mv $(d)/usr/bin/bash $(d)/bin/. chmod 755 $(d)/usr/bin/bashbug $(ID) debian/bashbug.1 $(d)/usr/share/man/man1/ ifneq ($(with_gfdl),yes) @@ -213,7 +212,7 @@ rm -f $(d)/usr/share/info/dir* : # extra links - ln -sf bash $(d)/bin/rbash + ln -sf bash $(d)/usr/bin/rbash : # skeleton files $(ID) debian/etc.bash.bashrc $(d)/etc/bash.bashrc @@ -313,7 +312,7 @@ dh_strip -p$(p) dh_compress -p$(p) dh_fixperms -p$(p) - dh_shlibdeps -p$(p) -- -dPre-Depends $(d)/bin/bash + dh_shlibdeps -p$(p) -- -dPre-Depends $(d)/usr/bin/bash dh_installdeb -p$(p) dh_gencontrol -p$(p) dh_md5sums -p$(p) @@ -338,9 +337,9 @@ dh_testroot dh_prep -p$(p_stat) dh_installdirs -p$(p_stat) \ - bin \ + usr/bin \ usr/share/man/man1 - cp -p build-static/bash $(d_stat)/bin/bash-static + cp -p build-static/bash $(d_stat)/usr/bin/bash-static cp -p doc/bash.1 $(d_stat)/usr/share/man/man1/bash-static.1 $(ID) -D debian/shells.d/bash-static $(d_stat)/usr/share/debianutils/shells.d/bash-static dh_installdocs -p$(p_stat) diff --minimal -Nru bash-5.2.21/debian/shells.d/bash bash-5.2.21/debian/shells.d/bash --- bash-5.2.21/debian/shells.d/bash 2022-05-12 17:01:36.000000000 +0200 +++ bash-5.2.21/debian/shells.d/bash 2024-01-24 09:15:01.000000000 +0100 @@ -1,2 +1,4 @@ /bin/bash /bin/rbash +/usr/bin/bash +/usr/bin/rbash diff --minimal -Nru bash-5.2.21/debian/shells.d/bash-static bash-5.2.21/debian/shells.d/bash-static --- bash-5.2.21/debian/shells.d/bash-static 2022-05-12 17:01:36.000000000 +0200 +++ bash-5.2.21/debian/shells.d/bash-static 2024-01-24 09:15:01.000000000 +0100 @@ -1 +1,2 @@ /bin/bash-static +/usr/bin/bash-static
