Version in base suite: 6.06+dfsg1-3 Base version: xscreensaver_6.06+dfsg1-3 Target version: xscreensaver_6.06+dfsg1-3+deb12u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/x/xscreensaver/xscreensaver_6.06+dfsg1-3.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/x/xscreensaver/xscreensaver_6.06+dfsg1-3+deb12u1.dsc changelog | 8 ++ patches/91_remove_version_upgrade_warnings.patch | 65 +++++++++++++++++++++++ patches/series | 1 3 files changed, 74 insertions(+) diff -Nru xscreensaver-6.06+dfsg1/debian/changelog xscreensaver-6.06+dfsg1/debian/changelog --- xscreensaver-6.06+dfsg1/debian/changelog 2023-03-03 13:18:50.000000000 +0000 +++ xscreensaver-6.06+dfsg1/debian/changelog 2024-04-21 13:49:08.000000000 +0000 @@ -1,3 +1,11 @@ +xscreensaver (6.06+dfsg1-3+deb12u1) bookworm; urgency=medium + + * Add debian/patches/91_remove_version_upgrade_warnings.patch: + - Avoid upstream upgrade warning appearing from 2024-05-04 + (Closes: #1069617) + + -- Tormod Volden Sun, 21 Apr 2024 15:49:08 +0200 + xscreensaver (6.06+dfsg1-3) unstable; urgency=medium * Add 02_dpms_prefs_lost.patch from upstream: diff -Nru xscreensaver-6.06+dfsg1/debian/patches/91_remove_version_upgrade_warnings.patch xscreensaver-6.06+dfsg1/debian/patches/91_remove_version_upgrade_warnings.patch --- xscreensaver-6.06+dfsg1/debian/patches/91_remove_version_upgrade_warnings.patch 1970-01-01 00:00:00.000000000 +0000 +++ xscreensaver-6.06+dfsg1/debian/patches/91_remove_version_upgrade_warnings.patch 2024-04-21 13:49:08.000000000 +0000 @@ -0,0 +1,65 @@ +Description: Remove unnecessary version upgrade warnings. + In order to help users who are on old, buggy, and possibly insecure versions + of XScreenSaver, there is are multiple messages in XScreenSaver that warn the + user that their XScreenSaver version is very old and that they should + upgrade, building from source if necessary. + . + Debian backports bug and security fixes to older versions of software as + needed and as possible. It should not be necessary for the user to upgrade + XScreenSaver manually. Additionally, building XScreenSaver from source + could possibly break a user's system by changing system files without + benefit of the package manager. + . + This patch removes the unnecessary warning. + . + xscreensaver (6.02+dfsg1-2ubuntu2) lunar; urgency=medium + . + * Patch out a message warning users to upgrade XScreenSaver. Debian + backports bug and security fixes to older versions of software as needed + and as possible, therefore this message is not necessary for us. +Author: Aaron Rainbolt +Bug-Ubuntu: https://launchpad.net/bugs/2009306 +Forwarded: not-needed +Last-Updated: 2024-02-13 + +Index: xscreensaver-git/driver/dialog.c +=================================================================== +--- xscreensaver-git.orig/driver/dialog.c ++++ xscreensaver-git/driver/dialog.c +@@ -1372,18 +1372,24 @@ window_draw (window_state *ws) + lines[i].align = CENTER; + i++; + +- if (time ((time_t *) 0) - XSCREENSAVER_RELEASED > 60*60*24*30*17) +- { +- lines[i].text = _("Update available!\nThis version is very old.\n"); +- lines[i].font = ws->error_font; +- lines[i].fg = ws->xft_error_foreground; +- lines[i].fg2 = lines[i].fg; +- lines[i].bg = ws->background; +- lines[i].type = LABEL; +- lines[i].align = CENTER; +- i++; +- } +- else if (strstr (ws->version, "a") || ++ /* The outdated software warning is unnecessary in Debian. The "else" in the ++ * else if block also needs patched out since it's a syntax error when the ++ * first "if" is patched out. ++ * ++ * if (time ((time_t *) 0) - XSCREENSAVER_RELEASED > 60*60*24*30*17) ++ * { ++ * lines[i].text = _("Update available!\nThis version is very old.\n"); ++ * lines[i].font = ws->error_font; ++ * lines[i].fg = ws->xft_error_foreground; ++ * lines[i].fg2 = lines[i].fg; ++ * lines[i].bg = ws->background; ++ * lines[i].type = LABEL; ++ * lines[i].align = CENTER; ++ * i++; ++ * } ++ * else if (strstr (ws->version, "a") || ++ */ ++ if (strstr (ws->version, "a") || + strstr (ws->version, "b")) + { + lines[i].text = _("PRE-RELEASE VERSION"); diff -Nru xscreensaver-6.06+dfsg1/debian/patches/series xscreensaver-6.06+dfsg1/debian/patches/series --- xscreensaver-6.06+dfsg1/debian/patches/series 2023-03-03 13:18:50.000000000 +0000 +++ xscreensaver-6.06+dfsg1/debian/patches/series 2024-04-21 13:49:08.000000000 +0000 @@ -22,6 +22,7 @@ 75_Makefile_in-ignore-alien-platforms.patch 81_hacks_deterministic_file_order.patch 90_remove_Easter_egg_about_version.patch +91_remove_version_upgrade_warnings.patch 92_hacks_images_distclean.patch 94_allow_unrecognized_conf_opts.patch 96_nogl-build-for-nogl-config.patch