Bug#1065747: libgphoto2-2t64: drop unnecessary DEP17 diversions

[Helmut Grohne]

Package: libgphoto2-6t64
Version: 2.5.31-2.1
Severity: minor
Tags: patch
User: helmutg at debian.org
Usertags: dep17p7

Hi,

Chris Hofstaedtler recently added protective diversions for Multi-Arch:
same shared file loss in the context of the /usr-move. Now with the
time64 transition, the affected files (both hwdb.d and rules.d) have
been renamed. Due to the rename, the aliasing is eliminated and the loss
goes away as well. Hence, the mitigation has become unnecessary due to
the time64 upload and can be dropped now already.

Just keep in mind that when/if you backport libgphoto2 to bookworm, you
must revert both the /usr-move and time64 transitions. If you miss
reverting either, bad things will happen both to upgrades from bookworm
to bookworm-backports and to upgrades from bookworm-backports to trixie.
There currently are no backports, so this likely is not a problem.

Helmut
-------------- next part --------------
diff --minimal -Nru libgphoto2-2.5.31/debian/changelog libgphoto2-2.5.31/debian/changelog
--- libgphoto2-2.5.31/debian/changelog	2024-02-28 13:26:32.000000000 +0100
+++ libgphoto2-2.5.31/debian/changelog	2024-03-09 17:29:59.000000000 +0100
@@ -1,3 +1,11 @@
+libgphoto2 (2.5.31-2.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop unnecessary DEP17 diversions: Affected files renamed for time64.
+    Closes: #-1
+
+ -- Helmut Grohne <helmut at subdivi.de>  Sat, 09 Mar 2024 17:29:59 +0100
+
 libgphoto2 (2.5.31-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --minimal -Nru libgphoto2-2.5.31/debian/libgphoto2-6t64.postinst libgphoto2-2.5.31/debian/libgphoto2-6t64.postinst
--- libgphoto2-2.5.31/debian/libgphoto2-6t64.postinst	2023-12-06 18:44:04.000000000 +0100
+++ libgphoto2-2.5.31/debian/libgphoto2-6t64.postinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# begin-remove-after: released:forky
-# 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-libgphoto2-6.hwdb.usr-is-merged \
-        --remove /lib/udev/hwdb.d/20-libgphoto2-6.hwdb
-    dpkg-divert --package usr-is-merged --no-rename \
-        --divert /lib/udev/rules.d/60-libgphoto2-6.rules.usr-is-merged \
-        --remove /lib/udev/rules.d/60-libgphoto2-6.rules
-fi
-# end-remove-after
-
-#DEBHELPER#
diff --minimal -Nru libgphoto2-2.5.31/debian/libgphoto2-6t64.postrm libgphoto2-2.5.31/debian/libgphoto2-6t64.postrm
--- libgphoto2-2.5.31/debian/libgphoto2-6t64.postrm	2023-12-06 18:44:04.000000000 +0100
+++ libgphoto2-2.5.31/debian/libgphoto2-6t64.postrm	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-
-# begin-remove-after: released:forky
-# 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-libgphoto2-6.hwdb.usr-is-merged \
-        --remove /lib/udev/hwdb.d/20-libgphoto2-6.hwdb
-    dpkg-divert --package usr-is-merged --no-rename \
-        --divert /lib/udev/rules.d/60-libgphoto2-6.rules.usr-is-merged \
-        --remove /lib/udev/rules.d/60-libgphoto2-6.rules
-fi
-# end-remove-after
-
-#DEBHELPER#
-
diff --minimal -Nru libgphoto2-2.5.31/debian/libgphoto2-6t64.preinst libgphoto2-2.5.31/debian/libgphoto2-6t64.preinst
--- libgphoto2-2.5.31/debian/libgphoto2-6t64.preinst	2023-12-06 18:44:04.000000000 +0100
+++ libgphoto2-2.5.31/debian/libgphoto2-6t64.preinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-#!/bin/sh
-set -e
-
-# begin-remove-after: released:forky
-# 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-libgphoto2-6.hwdb.usr-is-merged \
-        --add /lib/udev/hwdb.d/20-libgphoto2-6.hwdb
-    dpkg-divert --package usr-is-merged --no-rename \
-        --divert /lib/udev/rules.d/60-libgphoto2-6.rules.usr-is-merged \
-        --add /lib/udev/rules.d/60-libgphoto2-6.rules
-fi
-# end-remove-after
-
-#DEBHELPER#
-