Remove after release trixie (protective diversion for upgrades of files moved from / to /usr

4 files changed, 7 insertions, 65 deletions

diff --git a/debian/changelog b/debian/changelog
index 22d3024..f23c3a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sane-backends (1.4.0-1) UNRELEASED; urgency=medium
+sane-backends (1.4.0-1) unstable; urgency=medium
 
   * New upstream release.
     - Removal of patches that were applied by upstream:
@@ -13,11 +13,14 @@ sane-backends (1.4.0-1) UNRELEASED; urgency=medium
   * debian/patches/0125-multiarch_dll_search_path.patch:
     - Fix compiler warning "unknown escape sequence" (Closes: #1107537).
       Thanks to Peter Marschall <peter@adpm.de>.
-  * debian/libsane1.lintian-overrides:
-    - Remove after release trixie (protective diversion for
+  * Remove after release trixie (protective diversion for
       upgrades of files moved from / to /usr).
+    - debian/libsane1.lintian-overrides.
+    - debian/libsane1.postinst
+    - debian/libsane1.postrm
+    - part of debian/libsane1.preinst.
 
- -- Jörg Frings-Fürst <debian@jff.email>  Mon, 09 Jun 2025 14:30:33 +0200
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 12 Sep 2025 20:42:43 +0200
 
 sane-backends (1.3.1-4) unstable; urgency=medium
 
diff --git a/debian/libsane1.postinst b/debian/libsane1.postinst
deleted file mode 100644
index b5da9aa..0000000
--- a/debian/libsane1.postinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-set -e
-
-# begin-remove-after: released:trixie
-# protective diversion of files moved from / to /usr, to avoid file loss.
-# Only for upgrades.
-if [ "$1" = "configure" ]; then
-    # At this point, the package will have installed the same file in */usr*.
-    dpkg-divert --package usr-is-merged --no-rename \
-        --divert /lib/udev/hwdb.d/20-sane.hwdb.usr-is-merged \
-        --remove /lib/udev/hwdb.d/20-sane.hwdb
-    dpkg-divert --package usr-is-merged --no-rename \
-        --divert /lib/udev/rules.d/60-libsane1.rules.usr-is-merged \
-        --remove /lib/udev/rules.d/60-libsane1.rules
-    dpkg-divert --package usr-is-merged --no-rename \
-        --divert /lib/udev/rules.d/99-libsane1.rules.usr-is-merged \
-        --remove /lib/udev/rules.d/99-libsane1.rules
-fi
-# end-remove-after
-
-
-#DEBHELPER#
diff --git a/debian/libsane1.postrm b/debian/libsane1.postrm
deleted file mode 100644
index 6448e00..0000000
--- a/debian/libsane1.postrm
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# begin-remove-after: released:trixie
-# protective diversion of files moved from / to /usr, to avoid file loss.
-# Only for upgrades.
-if [ "$1" = "remove" ] && [ "$DPKG_MAINTSCRIPT_PACKAGE_REFCOUNT" = "1" ]; then
-    # Cleanup in case package is removed before upgrade is finished (postinst ran).
-    dpkg-divert --package usr-is-merged --no-rename \
-        --divert /lib/udev/hwdb.d/20-sane.hwdb.usr-is-merged \
-        --remove /lib/udev/hwdb.d/20-sane.hwdb
-    dpkg-divert --package usr-is-merged --no-rename \
-        --divert /lib/udev/rules.d/60-libsane1.rules.usr-is-merged \
-        --remove /lib/udev/rules.d/60-libsane1.rules
-    dpkg-divert --package usr-is-merged --no-rename \
-        --divert /lib/udev/rules.d/99-libsane1.rules.usr-is-merged \
-        --remove /lib/udev/rules.d/99-libsane1.rules
-fi
-# end-remove-after
-
-#DEBHELPER#
-
diff --git a/debian/libsane1.preinst b/debian/libsane1.preinst
index 1f02da9..a3a3fb9 100644
--- a/debian/libsane1.preinst
+++ b/debian/libsane1.preinst
@@ -2,22 +2,6 @@
 
 set -e
 
-# begin-remove-after: released:trixie
-# protective diversion of files moved from / to /usr, to avoid file loss.
-# Only for upgrades.
-if [ "$1" = "upgrade" ]; then
-    dpkg-divert --package usr-is-merged --no-rename \
-        --divert /lib/udev/hwdb.d/20-sane.hwdb.usr-is-merged \
-        --add /lib/udev/hwdb.d/20-sane.hwdb
-    dpkg-divert --package usr-is-merged --no-rename \
-        --divert /lib/udev/rules.d/60-libsane1.rules.usr-is-merged \
-        --add /lib/udev/rules.d/60-libsane1.rules
-    dpkg-divert --package usr-is-merged --no-rename \
-        --divert /lib/udev/rules.d/99-libsane1.rules.usr-is-merged \
-        --add /lib/udev/rules.d/99-libsane1.rules
-fi
-# end-remove-after
-
 #if [ "$1" = "upgrade" ]; then
     # Add the scanner system group if it doesn't exist
     if ! getent group | grep -q "^scanner:"; then