From b8b064bf404fbd10c4a84d1d861232005590bd63 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 15 Sep 2026 17:27:57 +0100 Subject: [PATCH] Bug 40901: (QA follow-up) Fix Replaces/Breaks version bound for the package split The split lands in the 26.06 development cycle (Koha.pm is at 26.06.00.xxx), but the Replaces/Breaks on the old monolithic koha-common were written as (<< 25.11). Released 25.11.x and 26.05.x koha-common packages therefore don't match, and upgrading from them aborts with dpkg's "trying to overwrite '/usr/sbin/koha-list', which is also in package koha-common". Use (<< 26.06~) everywhere, including the rm_conffile version in koha-common.maintscript, so every pre-split release is covered. Co-Authored-By: Claude Fable 5.1 Signed-off-by: Martin Renvoize Signed-off-by: Pedro Amorim --- debian/control | 12 ++++++------ debian/control.in | 12 ++++++------ debian/koha-common.maintscript | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/debian/control b/debian/control index 3f555f01ff..7aa59b218e 100644 --- a/debian/control +++ b/debian/control @@ -429,8 +429,8 @@ Description: Perl dep. for koha Package: koha-core Architecture: all -Replaces: koha-common (<< 25.11) -Breaks: koha-common (<< 25.11) +Replaces: koha-common (<< 26.06~) +Breaks: koha-common (<< 26.06~) Description: integrated (physical) library management system Koha is an Integrated Library Management system for real-world libraries (the kinds with books). @@ -476,8 +476,8 @@ Architecture: all Depends: ${misc:Depends}, systemd, koha-core Provides: koha-init Conflicts: koha-sysv -Replaces: koha-common (<< 25.11), koha-sysv -Breaks: koha-common (<< 25.11) +Replaces: koha-common (<< 26.06~), koha-sysv +Breaks: koha-common (<< 26.06~) Description: systemd units for Koha ILS Koha is an Integrated Library Management system for real-world libraries (the kinds with books). @@ -495,8 +495,8 @@ Architecture: all Depends: ${misc:Depends}, daemon, koha-core Provides: koha-init Conflicts: koha-systemd -Replaces: koha-common (<< 25.11), koha-systemd -Breaks: koha-common (<< 25.11) +Replaces: koha-common (<< 26.06~), koha-systemd +Breaks: koha-common (<< 26.06~) Description: SysV init scripts for Koha ILS Koha is an Integrated Library Management system for real-world libraries (the kinds with books). diff --git a/debian/control.in b/debian/control.in index 6cb4746d74..93243d8472 100644 --- a/debian/control.in +++ b/debian/control.in @@ -93,8 +93,8 @@ Description: Perl dep. for koha Package: koha-core Architecture: all -Replaces: koha-common (<< 25.11) -Breaks: koha-common (<< 25.11) +Replaces: koha-common (<< 26.06~) +Breaks: koha-common (<< 26.06~) Description: integrated (physical) library management system Koha is an Integrated Library Management system for real-world libraries (the kinds with books). @@ -140,8 +140,8 @@ Architecture: all Depends: ${misc:Depends}, systemd, koha-core Provides: koha-init Conflicts: koha-sysv -Replaces: koha-common (<< 25.11), koha-sysv -Breaks: koha-common (<< 25.11) +Replaces: koha-common (<< 26.06~), koha-sysv +Breaks: koha-common (<< 26.06~) Description: systemd units for Koha ILS Koha is an Integrated Library Management system for real-world libraries (the kinds with books). @@ -159,8 +159,8 @@ Architecture: all Depends: ${misc:Depends}, daemon, koha-core Provides: koha-init Conflicts: koha-systemd -Replaces: koha-common (<< 25.11), koha-systemd -Breaks: koha-common (<< 25.11) +Replaces: koha-common (<< 26.06~), koha-systemd +Breaks: koha-common (<< 26.06~) Description: SysV init scripts for Koha ILS Koha is an Integrated Library Management system for real-world libraries (the kinds with books). diff --git a/debian/koha-common.maintscript b/debian/koha-common.maintscript index 8489567029..13514fda1f 100644 --- a/debian/koha-common.maintscript +++ b/debian/koha-common.maintscript @@ -1 +1 @@ -rm_conffile /etc/init.d/koha-common 25.11~ +rm_conffile /etc/init.d/koha-common 26.06~