Version in base suite: 3.6.1-4

Base version: cyrus-imapd_3.6.1-4
Target version: cyrus-imapd_3.6.1-4+deb12u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/c/cyrus-imapd/cyrus-imapd_3.6.1-4.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/c/cyrus-imapd/cyrus-imapd_3.6.1-4+deb12u1.dsc

 changelog                          |    8 ++++++++
 cyrus-common.postinst              |    2 +-
 patches/fix-upgrade-versions.patch |   37 +++++++++++++++++++++++++++++++++++++
 patches/series                     |    1 +
 salsa-ci.yml                       |    3 +++
 5 files changed, 50 insertions(+), 1 deletion(-)

diff -Nru cyrus-imapd-3.6.1/debian/changelog cyrus-imapd-3.6.1/debian/changelog
--- cyrus-imapd-3.6.1/debian/changelog	2023-03-31 07:12:57.000000000 +0000
+++ cyrus-imapd-3.6.1/debian/changelog	2023-09-06 02:19:18.000000000 +0000
@@ -1,3 +1,11 @@
+cyrus-imapd (3.6.1-4+deb12u1) bookworm; urgency=medium
+
+  * Doc: add patch to fix minimal version needed before upgrade
+    (see #1037346)
+  * Fix postint version check (see #1037346)
+
+ -- Yadd <yadd@debian.org>  Wed, 06 Sep 2023 06:19:18 +0400
+
 cyrus-imapd (3.6.1-4) unstable; urgency=medium
 
   * Update copyright
diff -Nru cyrus-imapd-3.6.1/debian/cyrus-common.postinst cyrus-imapd-3.6.1/debian/cyrus-common.postinst
--- cyrus-imapd-3.6.1/debian/cyrus-common.postinst	2023-03-01 04:35:04.000000000 +0000
+++ cyrus-imapd-3.6.1/debian/cyrus-common.postinst	2023-09-06 02:16:25.000000000 +0000
@@ -60,7 +60,7 @@
 case "$1" in
     configure)
 	# Refuse to update if previous version is lower than 3.2.6-2+deb11u2~
-    	if [ -z "$1" ] || $(dpkg --compare-versions $1 lt '3.2.6-2+deb11u2~'); then
+	if [ ! -z "$2" ] && $(dpkg --compare-versions $2 lt '3.2.6-2+deb11u2~'); then
     	    echo "You must update cyrus-imapd to at least version 3.2.6-2+deb11u2~" >&2
 	    echo "before updating it to version 3.6.x and run it, else your mailboxes" >&2
 	    echo "may be corrupted" >&2
diff -Nru cyrus-imapd-3.6.1/debian/patches/fix-upgrade-versions.patch cyrus-imapd-3.6.1/debian/patches/fix-upgrade-versions.patch
--- cyrus-imapd-3.6.1/debian/patches/fix-upgrade-versions.patch	1970-01-01 00:00:00.000000000 +0000
+++ cyrus-imapd-3.6.1/debian/patches/fix-upgrade-versions.patch	2023-09-06 02:14:55.000000000 +0000
@@ -0,0 +1,37 @@
+Description: fix the minimal version needed to update
+Author: Yadd <yadd@debian.org>
+Bug-Debian: https://bugs.debian.org/1037346
+Forwarded: not-needed
+Last-Update: 2023-07-19
+
+--- a/doc/html/_sources/imap/download/upgrade.rst.txt
++++ b/doc/html/_sources/imap/download/upgrade.rst.txt
+@@ -25,10 +25,9 @@
+ Versions to upgrade from
+ ########################
+ 
+-Before upgrading to 3.6, your deployment should be running either:
++Before upgrading to 3.6, your deployment should be running:
+ 
+-* 3.2.10 (or later), or
+-* 3.4.4 (or later)
++* 3.2.6-2+deb11u2 (or later)
+ 
+ If your existing deployment predates these releases, you should first upgrade
+ to one of these versions, let it run for a while, resolve any issues that
+--- a/doc/text/imap/download/upgrade.txt
++++ b/doc/text/imap/download/upgrade.txt
+@@ -59,11 +59,9 @@
+ Versions to upgrade from
+ ------------------------
+ 
+-Before upgrading to 3.6, your deployment should be running either:
++Before upgrading to 3.6, your deployment should be running:
+ 
+-* 3.2.10 (or later), or
+-
+-* 3.4.4 (or later)
++* 3.2.6-2+deb11u2 (or later)
+ 
+ If your existing deployment predates these releases, you should first
+ upgrade to one of these versions, let it run for a while, resolve any
diff -Nru cyrus-imapd-3.6.1/debian/patches/series cyrus-imapd-3.6.1/debian/patches/series
--- cyrus-imapd-3.6.1/debian/patches/series	2023-03-31 07:03:46.000000000 +0000
+++ cyrus-imapd-3.6.1/debian/patches/series	2023-09-06 02:14:55.000000000 +0000
@@ -8,3 +8,4 @@
 0018-increase-test-timeout.patch
 #0019-propagate-XXFLAGS.patch
 0020_fix-cyr_cd-shebang.patch
+fix-upgrade-versions.patch
diff -Nru cyrus-imapd-3.6.1/debian/salsa-ci.yml cyrus-imapd-3.6.1/debian/salsa-ci.yml
--- cyrus-imapd-3.6.1/debian/salsa-ci.yml	2023-03-01 04:35:04.000000000 +0000
+++ cyrus-imapd-3.6.1/debian/salsa-ci.yml	2023-09-06 02:14:55.000000000 +0000
@@ -1,4 +1,7 @@
 ---
+variables:
+  RELEASE: 'bookworm'
+
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml