Package: mbr
Version: 1.2.1
Tags: patch trixie sid
User: helm...@debian.org
Usertags: dep17m2

Hi,

we want to finalize the /usr-merge transition by moving all aliased
files from / to /usr via DEP17 to avoid any negative effects arising
from aliasing. mbr is involved, because it installs /sbin/install-mbr.
I am sending a patch, because it cannot be automatically converted using
dh-sequence-movetousr. Note that this patch should not be uploaded to
bookworm-backports or earlier, because it would violate the file move
moratorium there.

Helmut
diff --minimal -Nru mbr-1.2.1/debian/changelog mbr-1.2.1+nmu1/debian/changelog
--- mbr-1.2.1/debian/changelog  2018-09-25 21:15:56.000000000 +0200
+++ mbr-1.2.1+nmu1/debian/changelog     2024-02-09 16:51:48.000000000 +0100
@@ -1,3 +1,10 @@
+mbr (1.2.1+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move install-mbr to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Fri, 09 Feb 2024 16:51:48 +0100
+
 mbr (1.2.1) unstable; urgency=medium
 
   * Remove report bug message and version number. Closes: #909563.
diff --minimal -Nru mbr-1.2.1/debian/rules mbr-1.2.1+nmu1/debian/rules
--- mbr-1.2.1/debian/rules      2018-09-20 10:05:36.000000000 +0200
+++ mbr-1.2.1+nmu1/debian/rules 2024-02-09 16:51:38.000000000 +0100
@@ -21,7 +21,7 @@
 build-indep: build-stamp
 
 build-stamp:
-       ./configure --exec-prefix=`pwd`/debian/mbr/ 
--prefix=`pwd`/debian/mbr/usr --build=$(DEB_BUILD_GNU_TYPE) 
--host=$(DEB_HOST_GNU_TYPE)
+       ./configure --prefix=`pwd`/debian/mbr/usr --build=$(DEB_BUILD_GNU_TYPE) 
--host=$(DEB_HOST_GNU_TYPE)
        $(MAKE) CC="$(CC)" LD="$(LD)" CFLAGS="$(CFLAGS)"
        touch build
 
@@ -36,12 +36,12 @@
        dh_testdir
        dh_testroot
        dh_prep
-       dh_installdirs -p mbr-udeb sbin
+       dh_installdirs -p mbr-udeb usr/sbin
        dh_installdocs -p mbr debian/README-1st.Debian NEWS README AUTHORS
        dh_installchangelogs
        $(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
 ifneq ($(filter mbr-udeb,$(binaries)),)
-       cp `pwd`/debian/mbr/sbin/install-mbr `pwd`/debian/mbr-udeb/sbin/
+       cp `pwd`/debian/mbr/usr/sbin/install-mbr `pwd`/debian/mbr-udeb/usr/sbin/
 endif
 
 binary-indep: build

Reply via email to