diff -pruN 6.02+dfsg1-2/debian/changelog 6.02+dfsg1-2ubuntu1/debian/changelog --- 6.02+dfsg1-2/debian/changelog 2022-01-15 15:40:56.000000000 +0000 +++ 6.02+dfsg1-2ubuntu1/debian/changelog 2022-02-24 11:02:25.000000000 +0000 @@ -1,3 +1,18 @@ +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 @@ -54,6 +69,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 diff -pruN 6.02+dfsg1-2/debian/control 6.02+dfsg1-2ubuntu1/debian/control --- 6.02+dfsg1-2/debian/control 2022-01-15 15:40:56.000000000 +0000 +++ 6.02+dfsg1-2ubuntu1/debian/control 2022-02-24 11:02:25.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, dpkg-dev (>= 1.16.1), diff -pruN 6.02+dfsg1-2/debian/patches/90_ubuntu-branding.patch 6.02+dfsg1-2ubuntu1/debian/patches/90_ubuntu-branding.patch --- 6.02+dfsg1-2/debian/patches/90_ubuntu-branding.patch 1970-01-01 00:00:00.000000000 +0000 +++ 6.02+dfsg1-2ubuntu1/debian/patches/90_ubuntu-branding.patch 2022-02-24 11:02:25.000000000 +0000 @@ -0,0 +1,13 @@ +Index: xscreensaver-6.02+dfsg1/driver/XScreenSaver.ad.in +=================================================================== +--- xscreensaver-6.02+dfsg1.orig/driver/XScreenSaver.ad.in ++++ xscreensaver-6.02+dfsg1/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.02+dfsg1-2/debian/patches/series 6.02+dfsg1-2ubuntu1/debian/patches/series --- 6.02+dfsg1-2/debian/patches/series 2022-01-15 15:40:56.000000000 +0000 +++ 6.02+dfsg1-2ubuntu1/debian/patches/series 2022-02-24 11:02:25.000000000 +0000 @@ -25,3 +25,5 @@ # For benchmarking of cpu usage 94_cpu_usage_verbose.patch + +90_ubuntu-branding.patch diff -pruN 6.02+dfsg1-2/debian/rules 6.02+dfsg1-2ubuntu1/debian/rules --- 6.02+dfsg1-2/debian/rules 2022-01-15 15:40:56.000000000 +0000 +++ 6.02+dfsg1-2ubuntu1/debian/rules 2022-02-24 11:02:25.000000000 +0000 @@ -28,6 +28,7 @@ override_dh_auto_configure: mv driver/XScreenSaver_Xm_ad.h driver/XScreenSaver_Xm_ad.h.upstream # Configure for xscreensaver ./configure --prefix=/usr \ + --with-image-directory=/usr/share/backgrounds \ --without-gl --with-pam --with-gtk --without-kerberos \ --without-shadow \ --with-hackdir=/usr/libexec/xscreensaver \ @@ -38,6 +39,7 @@ override_dh_auto_configure: cp driver/XScreenSaver.ad driver/XScreenSaver.ad-nogl # Configure for xscreensaver-gl ./configure --prefix=/usr \ + --with-image-directory=/usr/share/backgrounds \ --with-gl --with-pam --with-gtk --without-kerberos \ --without-shadow \ --with-hackdir=/usr/libexec/xscreensaver \ @@ -58,6 +60,14 @@ override_dh_auto_install: ln -sf README NEWS dh_auto_install -- install_prefix=$(CURDIR)/debian/tmp \ GTK_DATADIR=/usr/share KDEDIR=/usr + + # 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.02+dfsg1-2/debian/source_xscreensaver.py 6.02+dfsg1-2ubuntu1/debian/source_xscreensaver.py --- 6.02+dfsg1-2/debian/source_xscreensaver.py 1970-01-01 00:00:00.000000000 +0000 +++ 6.02+dfsg1-2ubuntu1/debian/source_xscreensaver.py 2022-02-24 11:02:25.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.02+dfsg1-2/debian/xscreensaver.dirs 6.02+dfsg1-2ubuntu1/debian/xscreensaver.dirs --- 6.02+dfsg1-2/debian/xscreensaver.dirs 1970-01-01 00:00:00.000000000 +0000 +++ 6.02+dfsg1-2ubuntu1/debian/xscreensaver.dirs 2022-02-24 11:02:25.000000000 +0000 @@ -0,0 +1 @@ +/usr/share/backgrounds