diff -pruN 6.08+dfsg1-1/debian/changelog 6.08+dfsg1-1ubuntu4/debian/changelog --- 6.08+dfsg1-1/debian/changelog 2024-02-21 08:40:55.000000000 +0000 +++ 6.08+dfsg1-1ubuntu4/debian/changelog 2025-05-20 10:18:25.000000000 +0000 @@ -1,3 +1,34 @@ +xscreensaver (6.08+dfsg1-1ubuntu4) questing; urgency=medium + + * No-change rebuild for libxml2 soname change. + + -- Matthias Klose Tue, 20 May 2025 12:18:25 +0200 + +xscreensaver (6.08+dfsg1-1ubuntu3) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- Steve Langasek Sun, 31 Mar 2024 17:32:28 +0000 + +xscreensaver (6.08+dfsg1-1ubuntu2) noble; urgency=medium + + * No-change rebuild against libglib2.0-0t64 + + -- Steve Langasek Fri, 08 Mar 2024 08:18:03 +0000 + +xscreensaver (6.08+dfsg1-1ubuntu1) noble; urgency=low + + * Merge from Debian unstable. (LP: #2054591) 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/patches/ubuntu-branding.patch: Use Ubuntu branding. + * Fixed an improper leading slash in a Lintian override. + + -- Aaron Rainbolt Sun, 25 Feb 2024 18:14:28 +0000 + xscreensaver (6.08+dfsg1-1) unstable; urgency=medium * New upstream release 6.08, changes since 6.06: @@ -24,6 +55,26 @@ xscreensaver (6.08+dfsg1-1) unstable; ur -- Tormod Volden Wed, 21 Feb 2024 09:40:55 +0100 +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 Thu, 15 Feb 2024 08:46:37 +0000 + xscreensaver (6.06+dfsg1-3) unstable; urgency=medium * Add 02_dpms_prefs_lost.patch from upstream: @@ -115,6 +166,31 @@ xscreensaver (6.02+dfsg1-3) unstable; ur -- Tormod Volden 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 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 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 @@ -171,6 +247,21 @@ xscreensaver (6.02+dfsg1-1) unstable; ur -- Tormod Volden 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 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 @@ -1945,7 +2036,6 @@ xscreensaver (2.15-3) unstable; urgency= -- Larry Daffner Mon, 9 Feb 1998 20:54:21 -0600 - xscreensaver (2.15-2) unstable; urgency=low * Fixed typo in control file (fixes Bug#17516) diff -pruN 6.08+dfsg1-1/debian/control 6.08+dfsg1-1ubuntu4/debian/control --- 6.08+dfsg1-1/debian/control 2024-02-21 08:40:55.000000000 +0000 +++ 6.08+dfsg1-1ubuntu4/debian/control 2024-02-24 01:45:08.000000000 +0000 @@ -1,7 +1,8 @@ Source: xscreensaver Section: x11 Priority: optional -Maintainer: Tormod Volden +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Tormod Volden Build-Depends: debhelper-compat (= 12), bc, fortune-mod, diff -pruN 6.08+dfsg1-1/debian/patches/series 6.08+dfsg1-1ubuntu4/debian/patches/series --- 6.08+dfsg1-1/debian/patches/series 2024-02-21 08:40:55.000000000 +0000 +++ 6.08+dfsg1-1ubuntu4/debian/patches/series 2024-02-25 18:14:28.000000000 +0000 @@ -28,3 +28,5 @@ 96_nogl-build-for-nogl-config.patch 98_daemon_desktop_file.patch 100_configure_allow_warnings.patch + +ubuntu-branding.patch diff -pruN 6.08+dfsg1-1/debian/patches/ubuntu-branding.patch 6.08+dfsg1-1ubuntu4/debian/patches/ubuntu-branding.patch --- 6.08+dfsg1-1/debian/patches/ubuntu-branding.patch 1970-01-01 00:00:00.000000000 +0000 +++ 6.08+dfsg1-1ubuntu4/debian/patches/ubuntu-branding.patch 2024-02-15 08:46:37.000000000 +0000 @@ -0,0 +1,22 @@ +From: Ubuntu Developers +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 -pruN 6.08+dfsg1-1/debian/rules 6.08+dfsg1-1ubuntu4/debian/rules --- 6.08+dfsg1-1/debian/rules 2024-02-21 08:40:55.000000000 +0000 +++ 6.08+dfsg1-1ubuntu4/debian/rules 2024-02-24 01:45:08.000000000 +0000 @@ -34,6 +34,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 \ @@ -44,6 +45,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 \ @@ -67,6 +69,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 -pruN 6.08+dfsg1-1/debian/source_xscreensaver.py 6.08+dfsg1-1ubuntu4/debian/source_xscreensaver.py --- 6.08+dfsg1-1/debian/source_xscreensaver.py 1970-01-01 00:00:00.000000000 +0000 +++ 6.08+dfsg1-1ubuntu4/debian/source_xscreensaver.py 2024-02-15 08:46:37.000000000 +0000 @@ -0,0 +1,21 @@ +'''apport package hook for xscreensaver + +(c) 2009 Canonical Ltd. +Author: Brian Murray + +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 -pruN 6.08+dfsg1-1/debian/xscreensaver.dirs 6.08+dfsg1-1ubuntu4/debian/xscreensaver.dirs --- 6.08+dfsg1-1/debian/xscreensaver.dirs 1970-01-01 00:00:00.000000000 +0000 +++ 6.08+dfsg1-1ubuntu4/debian/xscreensaver.dirs 2024-02-15 08:46:37.000000000 +0000 @@ -0,0 +1 @@ +/usr/share/backgrounds diff -pruN 6.08+dfsg1-1/debian/xscreensaver.lintian-overrides 6.08+dfsg1-1ubuntu4/debian/xscreensaver.lintian-overrides --- 6.08+dfsg1-1/debian/xscreensaver.lintian-overrides 2024-02-21 08:40:55.000000000 +0000 +++ 6.08+dfsg1-1ubuntu4/debian/xscreensaver.lintian-overrides 2024-02-25 18:14:28.000000000 +0000 @@ -8,4 +8,4 @@ xscreensaver binary: killall-is-dangerou xscreensaver: truetype-font-prohibits-installable-embedding (edit only) [usr/share/fonts/xscreensaver/clacon.ttf] # the font file is provided by upstream and is tested with their software -xscreensaver: duplicate-font-file also in (fonts-ocr-a) [/usr/share/fonts/xscreensaver/OCRA.ttf] +xscreensaver: duplicate-font-file also in (fonts-ocr-a) [usr/share/fonts/xscreensaver/OCRA.ttf]