Merge ~mkukri/ubuntu/+source/xscreensaver:merge into ubuntu/+source/xscreensaver:debian/sid

[Mate Kukri]

Merge with debian sid.

Tested to build, and function correctly on noble desktop

[Simon Chopin (schopin)]

Uploaded, thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 20942db..3559a7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+xscreensaver (6.06+dfsg1-3ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/rules:
+      + Use /usr/share/backgrounds as image directory.
+      + Add translation domain to .desktop files.
+    - debian/source_xscreensaver.py:
+      + Add apport hook.
+    - debian/xscreensaver.dirs:
+      + Install /usr/share/backgrounds. By default, settings search in
+        /usr/share/backgrounds and without it, it displays an error.
+    - debian/patches/ubuntu-branding.patch: Use Ubuntu branding.
+    - Patch out multiple messages warning users to upgrade XScreenSaver. Ubuntu
+      backports bug and security fixes to older versions of software as needed
+      and as possible, and XScreenSaver is specifically maintained by the
+      Lubuntu team, therefore this message is not necessary for us.
+      (LP: 2009306)
+
+ -- Mate Kukri <[e-mail]>  Thu, 15 Feb 2024 08:46:37 +0000
+
 xscreensaver (6.06+dfsg1-3) unstable; urgency=medium
 
   * Add 02_dpms_prefs_lost.patch from upstream:
@@ -89,6 +109,31 @@ xscreensaver (6.02+dfsg1-3) unstable; urgency=medium
 
  -- Tormod Volden <[e-mail]>  Fri, 18 Feb 2022 09:11:58 +0100
 
+xscreensaver (6.02+dfsg1-2ubuntu2) lunar; urgency=medium
+
+  * Patch out multiple messages warning users to upgrade XScreenSaver. Ubuntu
+    backports bug and security fixes to older versions of software as needed
+    and as possible, and XScreenSaver is specifically maintained by the
+    Lubuntu team, therefore this message is not necessary for us.
+    (LP: #2009306)
+
+ -- Aaron Rainbolt <[e-mail]>  Sun, 05 Mar 2023 17:25:54 -0600
+
+xscreensaver (6.02+dfsg1-2ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes: (LP: #1961634)
+    - debian/rules:
+      + Use /usr/share/backgrounds as image directory.
+      + Add translation domain to .desktop files.
+    - debian/source_xscreensaver.py:
+      + Add apport hook.
+    - debian/xscreensaver.dirs:
+      + Install /usr/share/backgrounds. By default, settings search in
+        /usr/share/backgrounds and without it, it displays an error.
+    - debian/patches/90_ubuntu-branding.patch: Use Ubuntu branding.
+
+ -- Tormod Volden <[e-mail]>  Thu, 24 Feb 2022 12:02:25 +0100
+
 xscreensaver (6.02+dfsg1-2) unstable; urgency=medium
 
   * Borrow patch from Fedora to fix building "marbling" on arm64
@@ -145,6 +190,21 @@ xscreensaver (6.02+dfsg1-1) unstable; urgency=medium
 
  -- Tormod Volden <[e-mail]>  Mon, 10 Jan 2022 23:10:18 +0100
 
+xscreensaver (5.45+dfsg1-2ubuntu1) impish; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules:
+      + Use /usr/share/backgrounds as image directory.
+      + Add translation domain to .desktop files.
+    - debian/source_xscreensaver.py:
+      + Add apport hook.
+    - debian/xscreensaver.dirs:
+      + Install /usr/share/backgrounds. By default, settings search in
+        /usr/share/backgrounds and without it, it displays an error.
+    - debian/patches/90_ubuntu-branding.patch: Use Ubuntu branding.
+
+ -- Robert Ancell <[e-mail]>  Tue, 15 Jun 2021 11:21:52 +1200
+
 xscreensaver (5.45+dfsg1-2) unstable; urgency=medium
 
   * Do not assign raw net capability to "sonar" hack due to a security
diff --git a/debian/control b/debian/control
index 68086b7..6b25977 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: xscreensaver
 Section: x11
 Priority: optional
-Maintainer: Tormod Volden <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Tormod Volden <[e-mail]>
 Build-Depends: debhelper-compat (= 12),
                bc,
                fortune-mod,
diff --git a/debian/patches/remove_version_upgrade_warnings.patch b/debian/patches/remove_version_upgrade_warnings.patch
new file mode 100644
index 0000000..c97b351
--- /dev/null
+++ b/debian/patches/remove_version_upgrade_warnings.patch
@@ -0,0 +1,73 @@
+From: Aaron Rainbolt <[e-mail]>
+Date: Thu, 15 Feb 2024 09:33:20 +0000
+Subject: Remove unnecessary version upgrade warnings.
+
+Bug-Ubuntu: https://launchpad.net/bugs/2009306
+Forwarded: not-needed
+Last-Updated: 2023-03-05
+
+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.
+
+Ubuntu backports bug and security fixes to older versions of software as
+needed and as possible, and the Lubuntu Development team specifically watches
+over XScreenSaver. It should not be necessary for the user to upgrade
+XScreenSaver. 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. Ubuntu
+    backports bug and security fixes to older versions of software as needed
+    and as possible, and XScreenSaver is specifically maintained by the
+    Lubuntu team, therefore this message is not necessary for us.
+---
+ driver/dialog.c | 30 ++++++++++++++++++------------
+ 1 file changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/driver/dialog.c b/driver/dialog.c
+index 1ab6ee4..71b14f2 100644
+--- a/driver/dialog.c
++++ b/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 Ubuntu. 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 --git a/debian/patches/series b/debian/patches/series
index 5b175c7..3cf59ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,6 @@
 96_nogl-build-for-nogl-config.patch
 98_daemon_desktop_file.patch
 100_configure_allow_warnings.patch
+
+ubuntu-branding.patch
+remove_version_upgrade_warnings.patch
diff --git a/debian/patches/ubuntu-branding.patch b/debian/patches/ubuntu-branding.patch
new file mode 100644
index 0000000..aeb51f8
--- /dev/null
+++ b/debian/patches/ubuntu-branding.patch
@@ -0,0 +1,22 @@
+From: Ubuntu Developers <[e-mail]>
+Date: Thu, 15 Feb 2024 08:47:18 +0000
+Subject: _ubuntu-branding
+
+===================================================================
+---
+ driver/XScreenSaver.ad.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in
+index 8323c43..e48b21a 100644
+--- a/driver/XScreenSaver.ad.in
++++ b/driver/XScreenSaver.ad.in
+@@ -62,7 +62,7 @@
+ *textLiteral:		XScreenSaver
+ *textFile:		@DEFAULT_TEXT_FILE@
+ *textProgram:		fortune
+-*textURL:		https://planet.debian.org/rss20.xml
++*textURL:		https://feeds.feedburner.com/ubuntu-news
+ 
+ ! This is what the "Settings" button on the splash screen runs.
+ *demoCommand: xscreensaver-settings
diff --git a/debian/rules b/debian/rules
index cf25214..4232930 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ override_dh_auto_configure:
 	    mv driver/XScreenSaver_Xm_ad.h driver/XScreenSaver_Xm_ad.h.upstream
 	# Configure for xscreensaver
 	dh_auto_configure -- \
+		--with-image-directory=/usr/share/backgrounds \
 		--without-gl --with-pam --with-gtk --without-kerberos \
 		--without-shadow \
 		--with-hackdir=/usr/libexec/xscreensaver \
@@ -46,6 +47,7 @@ override_dh_auto_configure:
 	cp driver/XScreenSaver.ad driver/XScreenSaver.ad-nogl
 	# Configure for xscreensaver-gl
 	dh_auto_configure -- \
+		--with-image-directory=/usr/share/backgrounds \
 		--with-gl --with-pam --with-gtk --without-kerberos \
 		--without-shadow \
 		--with-hackdir=/usr/libexec/xscreensaver \
@@ -69,6 +71,14 @@ override_dh_auto_install:
 	dh_auto_install -- install_prefix=$(CURDIR)/debian/tmp \
 		GTK_DATADIR=/usr/share KDEDIR=/usr \
 		UPDATE_ICON_CACHE=:
+
+	# Add translation domain to .desktop files
+	DOMAIN=$$(grep --max-count 1 '^GETTEXT_PACKAGE[[:space:]]*=' $(CURDIR)/po/Makefile | sed 's/^.*=[[:space:]]\([^[:space:]]\)/\1/'); \
+	for d in $$(find debian/tmp -type f -name "*.desktop" ); do \
+	    echo "Adding translation domain $$DOMAIN to $$d..."; \
+	    echo "X-Ubuntu-Gettext-Domain=$$DOMAIN" >> $$d; \
+	done
+
 	# Install .desktop files used by gnome-screensaver etc
 	mkdir -p debian/tmp/usr/share/applications/screensavers
 	cp debian/screensavers-desktop-files/*.desktop \
diff --git a/debian/source_xscreensaver.py b/debian/source_xscreensaver.py
new file mode 100644
index 0000000..1afd612
--- /dev/null
+++ b/debian/source_xscreensaver.py
@@ -0,0 +1,21 @@
+'''apport package hook for xscreensaver
+
+(c) 2009 Canonical Ltd.
+Author: Brian Murray <[e-mail]>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+from apport.hookutils import *
+
+def add_info(report):
+
+    attach_file_if_exists(report, '/var/log/Xorg.0.log', 'XorgLog')
+    attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld')
+    report['DisplayDevices'] = pci_devices(PCI_DISPLAY)
+    report['glxinfo'] = command_output(['glxinfo'])
+    nonfree_kernel_modules()
diff --git a/debian/xscreensaver.dirs b/debian/xscreensaver.dirs
new file mode 100644
index 0000000..7ad5adb
--- /dev/null
+++ b/debian/xscreensaver.dirs
@@ -0,0 +1 @@
+/usr/share/backgrounds