diff -pruN 5.36-1/debian/changelog 5.36-1ubuntu1/debian/changelog --- 5.36-1/debian/changelog 2017-03-26 03:42:56.000000000 +0000 +++ 5.36-1ubuntu1/debian/changelog 2017-03-26 03:42:57.000000000 +0000 @@ -1,3 +1,26 @@ +xscreensaver (5.36-1ubuntu1) zesty; 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/patch/90_ubuntu-branding.patch: Use Ubuntu branding. + - debian/patches/60_sequential_glslideshow.patch: + + Allow going through images sequentially rather than just at random in + the GLSlideshow hack. + * Dropped changes: + - debian/control: + + Breaks/Replaces: the old changes are not needed anymore, but the + new changes the screensavers sets needs it. + * d/p/90_ubuntu-branding.patch: Fix feed used for the Fridge. + + -- Unit 193 Fri, 24 Mar 2017 17:21:10 -0400 + xscreensaver (5.36-1) unstable; urgency=medium * New upstream release 5.36, changes since 5.34: @@ -28,6 +51,27 @@ xscreensaver (5.36-1) unstable; urgency= -- Tormod Volden Sun, 11 Dec 2016 15:18:05 +0100 +xscreensaver (5.34-2ubuntu1) xenial; urgency=medium + + * Merge from Debian unstable. Remaining changes: (Really fix LP: #1406825) + - debian/control: + + Breaks/Replaces: the old changes are not needed anymore, but the + new changes the screensavers sets needs it. + - 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/patch/90_ubuntu-branding.patch: Use Ubuntu branding. + - debian/patches/60_sequential_glslideshow.patch: + + Allow going through images sequentially rather than just at random in + the GLSlideshow hack. + + -- Unit 193 Wed, 06 Apr 2016 17:26:23 -0400 + xscreensaver (5.34-2) unstable; urgency=medium * Fix sort order in hacks/Makefile (for reproducible builds) @@ -37,6 +81,31 @@ xscreensaver (5.34-2) unstable; urgency= -- Tormod Volden Tue, 05 Apr 2016 22:53:13 +0200 +xscreensaver (5.34-1ubuntu1) xenial; urgency=medium + + * Merge from Debian unstable. Remaining changes: (LP: #1512136) + - debian/control: + + Breaks/Replaces: the old changes are not needed anymore, but the + new changes the screensavers sets needs it. + - 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/patch/90_ubuntu-branding.patch: Use Ubuntu branding. + - debian/patches/60_sequential_glslideshow.patch: + + Allow going through images sequentially rather than just at random in + the GLSlideshow hack. + * Dropped changes, fixed in Debian: + - debian/patches/91_replace-gdmflexiserver.patch: + + Use dm-tool instead of gdmflexiserver for user-switching, + the latter is no longer provided by lightdm. + + -- Unit 193 Tue, 27 Oct 2015 20:23:19 -0400 + xscreensaver (5.34-1) unstable; urgency=medium * New upstream release 5.34 @@ -74,6 +143,30 @@ xscreensaver (5.33-1) unstable; urgency= -- Tormod Volden Tue, 28 Jul 2015 00:41:06 +0200 +xscreensaver (5.30-1ubuntu1) vivid; urgency=medium + + * Merge from Debian unstable. (LP: #1406825) Remaining changes: + - debian/control: + + Breaks/Replaces: the old changes are not needed anymore, but the + new changes the screensavers sets needs it. + - 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/patch/90_ubuntu-branding.patch: Use Ubuntu branding. + - debian/patches/60_sequential_glslideshow.patch: + + Allow going through images sequentially rather than just at random in + the GLSlideshow hack. + - debian/patches/91_replace-gdmflexiserver.patch: + + Use dm-tool instead of gdmflexiserver for user-switching, + the latter is no longer provided by lightdm. + + -- Unit 193 Wed, 18 Feb 2015 02:17:23 -0500 + xscreensaver (5.30-1) unstable; urgency=low * New upstream release 5.30 @@ -105,6 +198,47 @@ xscreensaver (5.29-1) unstable; urgency= -- Tormod Volden Mon, 22 Sep 2014 08:09:14 +0200 +xscreensaver (5.26-1ubuntu3) utopic; urgency=medium + + * debian/patches/91_replace-gdmflexiserver.patch: + - Use dm-tool instead of gdmflexiserver for user-switching, + the latter is no longer provided by lightdm (LP: #1320560) + + -- Sean Davis Tue, 14 Oct 2014 07:07:45 -0400 + +xscreensaver (5.26-1ubuntu2) utopic; urgency=medium + + * debian/control: Fix typo in Repleaces on xscreensaver-data + (LP: #1319433). + + -- Mattia Rizzolo Sun, 18 May 2014 19:34:54 +0200 + +xscreensaver (5.26-1ubuntu1) utopic; urgency=low + + * Dropped Ubuntu changes: + - Ubuntu delta to the screensavers sets. + - Keep Debian Vcs-* links instead of the ~ubuntu-desktop team bzr + repository: the Desktop team does not have interest any more. + - The Ubuntu changes to the descriptions. + * Merge from Debian unstable. (LP: #1283459) Remaining changes: + - debian/control: + + Breaks/Replaces: the old changes are not needed anymore, but the + new changes the screensavers sets needs it. + - 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/patch/90_ubuntu-branding.patch: Use Ubuntu branding. + - debian/patches/60_sequential_glslideshow.patch: + + Allow going through images sequentially rather than just at random in + the GLSlideshow hack. + + -- Mattia Rizzolo Tue, 06 May 2014 21:55:37 +0200 + xscreensaver (5.26-1) unstable; urgency=low * New upstream release 5.26, changes since 5.23: @@ -198,6 +332,31 @@ xscreensaver (5.22-1) unstable; urgency= -- Tormod Volden Tue, 01 Oct 2013 22:00:48 +0200 +xscreensaver (5.15-3ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: + + Add Vcs-Bzr link + + Add/Update replaces with Ubuntu versions + + Update package descriptions to list Ubuntu screensavers + - debian/rules: + + Use /usr/share/backgrounds as image directory + + Add translation domain to .desktop files + - debian/source_xscreensaver.py: + + Add apport hook + - debian/split-hacks.config: + + Use different set of default hacks than Debian + - debian/xscreensaver.dirs + + Install /usr/share/backgrounds. By default, settings search in + /usr/share/backgrounds and without it, it displays an error + - debian/patches/53_XScreenSaver.ad.in.patch: + + Use Ubuntu branding + - debian/patches/60_sequential_glslideshow.patch: + + Allow going through images sequentially rather than just at random in + the GLSlideshow hack. + + -- Adam Conrad Wed, 17 Jul 2013 13:47:29 +0100 + xscreensaver (5.15-3) unstable; urgency=low [ Jose Luis Rivas ] @@ -800,7 +959,7 @@ xscreensaver (4.21-7) unstable; urgency= thanks to Arnaud Giersch -- Ralf Hildebrandt Thu, 22 Sep 2005 23:23:43 +0200 - + xscreensaver (4.21-6) unstable; urgency=low * patch against stop_the_insanity() (closes: #323841) @@ -1582,7 +1741,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) @@ -1653,5 +1811,3 @@ xscreensaver (1.26-1) unstable; urgency= -- Larry Daffner Wed, 2 Oct 1996 14:43:42 -0500 - - diff -pruN 5.36-1/debian/control 5.36-1ubuntu1/debian/control --- 5.36-1/debian/control 2017-03-26 03:42:56.000000000 +0000 +++ 5.36-1ubuntu1/debian/control 2017-03-26 03:42:57.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: bc, debhelper (>= 9.0), fortune-mod, libgtk2.0-dev, libpam0g-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | xlibmesa-glu-dev | libglu-dev, xutils-dev, libxml2-dev, libglade2-dev, libjpeg-dev, libgle-dev, intltool, autotools-dev, libx11-dev, libxext-dev, libxinerama-dev, libxmu-dev, libxpm-dev, libxrandr-dev, libxss-dev, libxt-dev, libxtst-dev, libxxf86vm-dev, x11proto-core-dev, xbitmaps, quilt, dpkg-dev (>= 1.16.1) Standards-Version: 3.9.8 Homepage: http://www.jwz.org/xscreensaver/ diff -pruN 5.36-1/debian/patches/60_sequential_glslideshow.patch 5.36-1ubuntu1/debian/patches/60_sequential_glslideshow.patch --- 5.36-1/debian/patches/60_sequential_glslideshow.patch 1970-01-01 00:00:00.000000000 +0000 +++ 5.36-1ubuntu1/debian/patches/60_sequential_glslideshow.patch 2017-03-26 03:42:57.000000000 +0000 @@ -0,0 +1,41 @@ +Description: Allow xscreensaver-getimage-file to work sequentially + allowing users to run a slideshow in order. + . + To use in this mode, edit ~/.xscreensaver updating: + chooseRandomImages: True + imageDirectory: /path/to/ordered/pictures + And then: + echo 0 > ~/.xscreensaver-image-index + Then run: + /usr/lib/xscreensaver/glslideshow -duration 2 -pan 2 + To disable: + rm ~/.xscreensaver-image-index +Author: Dustin Kirkland +Forwarded: no +Last-Update: 2014-02-21 + +Index: xscreensaver-5.36-1ubuntu1/driver/xscreensaver-getimage-file +=================================================================== +--- xscreensaver-5.36-1ubuntu1.orig/driver/xscreensaver-getimage-file ++++ xscreensaver-5.36-1ubuntu1/driver/xscreensaver-getimage-file +@@ -855,7 +855,20 @@ sub find_random_file($) { + my $max_tries = 50; + for (my $i = 0; $i < $max_tries; $i++) { + ++ # Default to random image + my $n = int (rand ($#all_files + 1)); ++ ++ # But check if the user wants a sequential image ++ if (open(IN, "<$ENV{HOME}/.xscreensaver-image-index")) { ++ read(IN, $n, 8); ++ close(IN); ++ $n++; ++ if (open (IN, ">$ENV{HOME}/.xscreensaver-image-index")) { ++ print(IN $n--); ++ close(IN); ++ } ++ } ++ + my $file = $all_files[$n]; + if (large_enough_p ($file)) { + if (! $url) { diff -pruN 5.36-1/debian/patches/90_ubuntu-branding.patch 5.36-1ubuntu1/debian/patches/90_ubuntu-branding.patch --- 5.36-1/debian/patches/90_ubuntu-branding.patch 1970-01-01 00:00:00.000000000 +0000 +++ 5.36-1ubuntu1/debian/patches/90_ubuntu-branding.patch 2017-03-26 03:42:57.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/driver/XScreenSaver.ad.in ++++ b/driver/XScreenSaver.ad.in +@@ -63,7 +63,7 @@ + *textLiteral: XScreenSaver + *textFile: @DEFAULT_TEXT_FILE@ + *textProgram: fortune +-*textURL: http://planet.debian.org/rss20.xml ++*textURL: http://feeds.feedburner.com/ubuntu-news + + *overlayTextForeground: #FFFF00 + *overlayTextBackground: #000000 diff -pruN 5.36-1/debian/patches/series 5.36-1ubuntu1/debian/patches/series --- 5.36-1/debian/patches/series 2017-03-26 03:42:56.000000000 +0000 +++ 5.36-1ubuntu1/debian/patches/series 2017-03-26 03:42:57.000000000 +0000 @@ -24,3 +24,5 @@ 80_Makefile_in-clean-fix.patch 81_hacks_deterministic_file_order.patch 90_remove_Easter_egg_about_version.patch +60_sequential_glslideshow.patch +90_ubuntu-branding.patch diff -pruN 5.36-1/debian/rules 5.36-1ubuntu1/debian/rules --- 5.36-1/debian/rules 2017-03-26 03:42:56.000000000 +0000 +++ 5.36-1ubuntu1/debian/rules 2017-03-26 03:42:57.000000000 +0000 @@ -48,6 +48,7 @@ build-stamp: # Configure for xscreensaver ./configure --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) \ --prefix=/usr \ + --with-image-directory=/usr/share/backgrounds \ --without-gl --with-pam --with-gtk --without-kerberos \ --with-hackdir=/usr/lib/xscreensaver \ --with-configdir=/usr/share/xscreensaver/config \ @@ -58,6 +59,7 @@ build-stamp: # Configure for xscreensaver-gl ./configure --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) \ --prefix=/usr \ + --with-image-directory=/usr/share/backgrounds \ --with-gl --with-pam --with-gtk --without-kerberos \ --with-hackdir=/usr/lib/xscreensaver \ --with-configdir=/usr/share/xscreensaver/config \ @@ -97,6 +99,14 @@ binary-arch: build dh_installdirs -a dh_installdocs -a dh_installchangelogs -a + + # 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 5.36-1/debian/source_xscreensaver.py 5.36-1ubuntu1/debian/source_xscreensaver.py --- 5.36-1/debian/source_xscreensaver.py 1970-01-01 00:00:00.000000000 +0000 +++ 5.36-1ubuntu1/debian/source_xscreensaver.py 2017-03-26 03:42:57.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 5.36-1/debian/xscreensaver.dirs 5.36-1ubuntu1/debian/xscreensaver.dirs --- 5.36-1/debian/xscreensaver.dirs 1970-01-01 00:00:00.000000000 +0000 +++ 5.36-1ubuntu1/debian/xscreensaver.dirs 2017-03-26 03:42:57.000000000 +0000 @@ -0,0 +1 @@ +/usr/share/backgrounds