Package: fuseext2
Version: 0.4-1.4
Tags: patch trixie sid
User: helm...@debian.org
Usertags: dep17m2
We want to finalize the /usr-merge transition by moving all aliased
files from / to /usr via DEP17 to avoid negative effects arising from
the use of aliased files. fuseext2 is involved, because it ships
programs in aliased locations. I'm sending a patch, because it cannot be
converted using dh-sequence-movetousr. Note that this patch must not be
uploaded to bookworm-backports or earlier as it would violate the file
move moratorium there.
Helmut
diff --minimal -Nru fuse-umfuse-ext2-0.4/debian/changelog
fuse-umfuse-ext2-0.4/debian/changelog
--- fuse-umfuse-ext2-0.4/debian/changelog 2023-09-29 01:48:00.000000000
+0200
+++ fuse-umfuse-ext2-0.4/debian/changelog 2024-02-18 12:10:55.000000000
+0100
@@ -1,3 +1,10 @@
+fuse-umfuse-ext2 (0.4-1.5) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * DEP17: Move files to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sun, 18 Feb 2024 12:10:55 +0100
+
fuse-umfuse-ext2 (0.4-1.4) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru fuse-umfuse-ext2-0.4/debian/patches/series
fuse-umfuse-ext2-0.4/debian/patches/series
--- fuse-umfuse-ext2-0.4/debian/patches/series 2023-09-29 01:48:00.000000000
+0200
+++ fuse-umfuse-ext2-0.4/debian/patches/series 2024-02-18 12:10:55.000000000
+0100
@@ -1 +1,2 @@
fuse-ext2.h.patch
+usrmove.patch
diff --minimal -Nru fuse-umfuse-ext2-0.4/debian/patches/usrmove.patch
fuse-umfuse-ext2-0.4/debian/patches/usrmove.patch
--- fuse-umfuse-ext2-0.4/debian/patches/usrmove.patch 1970-01-01
01:00:00.000000000 +0100
+++ fuse-umfuse-ext2-0.4/debian/patches/usrmove.patch 2024-02-18
12:10:55.000000000 +0100
@@ -0,0 +1,22 @@
+--- fuse-umfuse-ext2-0.4.orig/fuse-ext2/Makefile.am
++++ fuse-umfuse-ext2-0.4/fuse-ext2/Makefile.am
+@@ -283,7 +283,7 @@
+ if LINUX
+ install-exec-local:
+ $(INSTALL) -d "$(DESTDIR)/usr/sbin"
+- $(LN_S) -f "$(DESTDIR)/$(bindir)/fuse-ext2"
"$(DESTDIR)/sbin/mount.fuse-ext2"
++ $(LN_S) -f "$(DESTDIR)/$(bindir)/fuse-ext2"
"$(DESTDIR)/$(sbindir)/mount.fuse-ext2"
+ endif
+
+ dist_man1_MANS = fuse-ext2.1
+--- fuse-umfuse-ext2-0.4.orig/fuse-ext2/Makefile.in
++++ fuse-umfuse-ext2-0.4/fuse-ext2/Makefile.in
+@@ -1884,7 +1884,7 @@
+ #endif
+ @LINUX_TRUE@install-exec-local:
+ @LINUX_TRUE@ $(INSTALL) -d "$(DESTDIR)/usr/sbin"
+-@LINUX_TRUE@ $(LN_S) -f "$(DESTDIR)/$(bindir)/fuse-ext2"
"$(DESTDIR)/sbin/mount.fuse-ext2"
++@LINUX_TRUE@ $(LN_S) -f "$(DESTDIR)/$(bindir)/fuse-ext2"
"$(DESTDIR)/$(sbindir)/mount.fuse-ext2"
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --minimal -Nru fuse-umfuse-ext2-0.4/debian/rules
fuse-umfuse-ext2-0.4/debian/rules
--- fuse-umfuse-ext2-0.4/debian/rules 2023-09-29 01:47:05.000000000 +0200
+++ fuse-umfuse-ext2-0.4/debian/rules 2024-02-18 12:10:55.000000000 +0100
@@ -3,15 +3,17 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
+DEB_CONFIGURE_EXTRA_FLAGS=--exec-prefix='$${prefix}'
+
common-install-prehook-arch common-install-prehook-indep::
- mkdir -p debian/tmp/sbin
+ mkdir -p debian/tmp/usr/sbin
install/fuseext2::
dh_link -pfuseext2 /usr/share/man/man1/fuse-ext2.1
/usr/share/man/man8/mount.fuse-ext2.8
- dh_link -pfuseext2 /usr/bin/fuse-ext2 /sbin/mount.fuse-ext2
+ dh_link -pfuseext2 /usr/bin/fuse-ext2 /usr/sbin/mount.fuse-ext2
# Compatibility symlinks for versions up to 0.3.
dh_link -pfuseext2 /usr/bin/fuse-ext2 /usr/bin/fuseext2
- dh_link -pfuseext2 /sbin/mount.fuse-ext2 /sbin/mount.fuseext2
+ dh_link -pfuseext2 /usr/sbin/mount.fuse-ext2 /usr/sbin/mount.fuseext2
dh_link -pfuseext2 /usr/share/man/man1/fuse-ext2.1
/usr/share/man/man1/fuseext2.1
dh_link -pfuseext2 /usr/share/man/man8/mount.fuse-ext2.8
/usr/share/man/man8/mount.fuseext2.8
dh_compress -pfuseext2
