This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=d9b6c2768471a896365c369e45907fe647bfc43a

commit d9b6c2768471a896365c369e45907fe647bfc43a
Author: Guillem Jover <[email protected]>
AuthorDate: Fri May 23 03:01:03 2025 +0200

    dpkg-divert: Clarify default behavior change timeline
    
    This should have been documented as not being changed until no more
    users are in place, and not before a specific dpkg release cycle. Do
    that now to make the documentation more clear.
---
 man/dpkg-divert.pod | 4 +++-
 src/divert/main.c   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/dpkg-divert.pod b/man/dpkg-divert.pod
index fe7fa0bd2..33647f4e1 100644
--- a/man/dpkg-divert.pod
+++ b/man/dpkg-divert.pod
@@ -138,7 +138,9 @@ diversion into the database (since dpkg 1.19.1).
 This is intended for diversions of files from the B<Essential> package set,
 where the temporary disappearance of the original file is not acceptable, as
 it can render the system non-functional.
-This is the default behavior, but that will change in the dpkg 1.20.x cycle.
+This is the default behavior,
+which will change once there are no known users,
+but not before the dpkg 1.23.x release cycle.
 
 =item B<--test>
 
diff --git a/src/divert/main.c b/src/divert/main.c
index 37f2ff2f9..b2c143607 100644
--- a/src/divert/main.c
+++ b/src/divert/main.c
@@ -127,7 +127,7 @@ opt_rename_setup(void)
 
        opt_rename = 0;
        warning(_("please specify --no-rename explicitly, the default "
-                 "will change to --rename in 1.20.x"));
+                 "will change to --rename not before 1.23.x"));
 }
 
 struct file {

-- 
Dpkg.Org's dpkg

Reply via email to