xscreensaver

Merge lp:~cyphermox/xscreensaver/update-to-5.14 into lp:~ubuntu-desktop/xscreensaver/ubuntu

  1. update-to-5.14
  2. Merge into ubuntu
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Merged at revision: 29
Proposed branch: lp:~cyphermox/xscreensaver/update-to-5.14
Merge into: lp:~ubuntu-desktop/xscreensaver/ubuntu
Diff against target: 712 lines (+469/-50)
6 files modified
debian/changelog (+457/-13)
debian/control (+3/-3)
debian/patches/53_XScreenSaver.ad.in.patch (+9/-9)
debian/patches/61_fix_tube_memleak.patch (+0/-16)
debian/patches/series (+0/-1)
debian/xscreensaver.desktop (+0/-8)
To merge this branch: bzr merge lp:~cyphermox/xscreensaver/update-to-5.14
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+64084@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tormod Volden (tormodvolden) wrote :

Hi Mathieu, I have not looked at your changes, but I just want to copy these notes that I sent to Jeremy who merged 5.13 and had planned to merge 5.14 :) Please verify that you have taken care of these.

"If you do the merge to Ubuntu again, I've noted these things:
- your changelog does not include the whole Ubuntu history
- your previous merge pulled debian 5.13-1 before it was released
 and we updated Standards-Version to 3.9.2 in it
 Just make sure it is not in the Ubuntu delta any longer
- the sequential slide-show patch is not mentioned in your changelog
- as I mentioned in your merge request, the memory leak patch is obsolete
- you have an extraneous debian/xscreensaver.desktop
New in 5.14-1:
- we've dropped the xli | xloadimage depends"

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Hi Tormod,

The changelog will contain all the history that was currently available to me, so all that was there past Jeremy's merge.

Standards-Version is at 3.9.2 now because I got this in this merge, it was set to 3.9.1 in Ubuntu's 5.13-1ubuntu1, but that's just AFAICT merging the right stuff from Debian.

The memory leak patch was dropped, it was clearly included upstream (and this would have failed even quick testing, resulting in a double-free). I also dropped xli | xloadimage from Suggests seeing as it was dropped from Recommends in Debian; rationale is that gdkpixbuf is used instead.

I'll double-check for debian/xscreensaver.desktop.. The slideshow patch is indeed missing, thanks for the catch!

lp:~cyphermox/xscreensaver/update-to-5.14 updated
30. By Mathieu Trudel-Lapierre

  - debian/patches/60_sequential_glslideshow.patch:
    + Allow going through images sequentially rather than just at random in
      the GLSlideshow hack.
* debian/xscreensaver.desktop: drop file left over from previous merge.

Revision history for this message
Tormod Volden (tormodvolden) wrote :

Sounds good. Yes, the 5.13-1ubuntu source actually had double free, after applied patches...

You should try to recover the complete Ubuntu changelog. It might have been dropped by mistake at some point. The full changelog makes it much easier to see the background and rationale for the existing Ubuntu delta.

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

I kind of see what you're getting at; the full changelog helps seeing the rationale for changes, even though the stuff we write when doing a merge is meant to summarize all the changes left as a delta against Debian.

(working on bringing the old changelog entries back)

In light of these changes, is there anything that we could push into Debian as well in order to reduce the delta? I'm thinking in particular of /usr/share/backgrounds as the image directory, and installing /usr/share/backgrounds if it doesn't already exists. Perhaps also get to a consensus about default hacks would be nice.

lp:~cyphermox/xscreensaver/update-to-5.14 updated
31. By Mathieu Trudel-Lapierre

debian/control: drop Build-Depends on ubuntu-artwork. This was only pulled
in to create /usr/share/backgrounds to use as a location for screensavers
that look for images.

32. By Mathieu Trudel-Lapierre

* debian/changelog: reinstate old changelog entries that were dropped in
  previous commits.

Revision history for this message
Tormod Volden (tormodvolden) wrote :

Would be nice to reduce the delta (again). As you might see in the full changelog, I have put quite some effort into reducing the delta :) I will look at the backgrounds item.

The defaults hacks is a bit more difficult to agree on between a community project and a management-driven Desktop team ;) but the whole package split up is not perfect and new ideas are welcome.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-05-18 13:39:51 +0000
+++ debian/changelog 2011-06-10 02:23:23 +0000
@@ -1,3 +1,48 @@
1xscreensaver (5.14-1ubuntu1) UNRELEASED; urgency=low
2
3 * Merge with Debian unstable, remaining Ubuntu changes (LP: #795251):
4 - debian/control:
5 + Add Vcs-Bzr link
6 + Add/Update replaces with Ubuntu versions
7 + Update package descriptions to list Ubuntu screensavers
8 - debian/rules:
9 + Use /usr/share/backgrounds as image directory
10 + Add translation domain to .desktop files
11 - debian/source_xscreensaver.py:
12 + Add apport hook
13 - debian/split-hacks.config:
14 + Use different set of default hacks than Debian
15 - debian/xscreensaver.dirs
16 + Install /usr/share/backgrounds. By default, settings search in
17 /usr/share/backgrounds and without it, it displays an error
18 - debian/patches/53_XScreenSaver.ad.in.patch:
19 + Use Ubuntu branding
20 - debian/patches/60_sequential_glslideshow.patch:
21 + Allow going through images sequentially rather than just at random in
22 the GLSlideshow hack.
23 * debian/patches/61_fix_tube_memleak.patch: dropped, applied upstream.
24 * debian/xscreensaver.desktop: drop file left over from previous merge.
25 * debian/control: drop Build-Depends on ubuntu-artwork. This was only pulled
26 in to create /usr/share/backgrounds to use as a location for screensavers
27 that look for images.
28 * debian/changelog: reinstate old changelog entries that were dropped in
29 previous commits.
30
31 -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 09 Jun 2011 22:10:56 -0400
32
33xscreensaver (5.14-1) unstable; urgency=low
34
35 [ Tormod Volden ]
36 * New upstream version 5.14
37 - Fixed crash in Blank Only Mode when DPMS disabled.
38 (Closes: #627382, #627397)
39 - Added ``Quick Power-off in Blank Only Mode'' option.
40 - BSOD GLaDOS.
41 * Clean up duplicate build-depends (thanks Jeremy Bicha)
42 * Drop xli | xloadimage recommends (we use gdk-pixbuf)
43
44 -- Jose Luis Rivas <ghostbar@debian.org> Sun, 22 May 2011 23:12:59 -0430
45
1xscreensaver (5.13-1ubuntu1) oneiric; urgency=low46xscreensaver (5.13-1ubuntu1) oneiric; urgency=low
247
3 * Merge with Debian unstable, remaining Ubuntu changes:48 * Merge with Debian unstable, remaining Ubuntu changes:
@@ -160,6 +205,43 @@
160205
161 -- Jose Luis Rivas <ghostbar@debian.org> Sun, 08 Nov 2009 09:27:00 -0430206 -- Jose Luis Rivas <ghostbar@debian.org> Sun, 08 Nov 2009 09:27:00 -0430
162207
208xscreensaver (5.10-3ubuntu4) lucid; urgency=low
209
210 * Import parts of debian's current .preinst file to get rid of the
211 previously removed autostart desktop file.
212
213 -- Harald Sitter <apachelogger@ubuntu.com> Thu, 15 Apr 2010 00:46:29 +0200
214
215xscreensaver (5.10-3ubuntu3) lucid; urgency=low
216
217 * Removing autostart from xdg, is now on /usr/share so user can copy it if
218 wants autostart (LP: #554069)
219
220 -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org> Sat, 10 Apr 2010 22:28:57 +0200
221
222xscreensaver (5.10-3ubuntu2) lucid; urgency=low
223
224 * Reintroduce changes lost from version 5.08-0ubuntu5:
225
226 [ Julien Lavergne ]
227 * Add debian/xscreensaver.dirs with /usr/share/backgrounds. By default,
228 settings search in /usr/share/backgrounds and without it, it displays an
229 error (LP: #129769)
230
231 -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 06 Apr 2010 08:10:22 +0000
232
233xscreensaver (5.10-3ubuntu1) lucid; urgency=low
234
235 * Merge with Debian unstable, remaining changes: (LP: #489062)
236 - debian/control: add Build-Depends on ubuntu-artwork
237 - debian/rules: use /usr/share/backgrounds
238 - debian/control: Move xli | xloadimage recommends to suggests
239 - debian/split-hacks.config: Use different set of default hacks to Debian
240 - debian/source_xscreensaver.py: Add apport hook
241 - debian/patches/53_XScreenSaver.ad.in.patch: Use Ubuntu branding
242
243 -- Robert Ancell <robert.ancell@canonical.com> Mon, 30 Nov 2009 13:33:13 +1100
244
163xscreensaver (5.10-3) unstable; urgency=low245xscreensaver (5.10-3) unstable; urgency=low
164246
165 * Move sonar to xscreensaver-gl, it got GL-ified (Closes: #550002)247 * Move sonar to xscreensaver-gl, it got GL-ified (Closes: #550002)
@@ -257,13 +339,6 @@
257339
258 -- Jose Luis Rivas <ghostbar@debian.org> Fri, 25 Sep 2009 07:12:21 -0430340 -- Jose Luis Rivas <ghostbar@debian.org> Fri, 25 Sep 2009 07:12:21 -0430
259341
260xscreensaver (5.05-3+nmu1) unstable; urgency=high
261
262 * Non-maintainer upload by the security team.
263 * Fix local screen lock bypass vulnerability (closes: #539699).
264
265 -- Michael Gilbert <michael.s.gilbert@gmail.com> Mon, 17 Aug 2009 00:43:39 -0400
266
267xscreensaver (5.07-1) unstable; urgency=low342xscreensaver (5.07-1) unstable; urgency=low
268343
269 [ Tormod Volden ]344 [ Tormod Volden ]
@@ -283,6 +358,46 @@
283358
284 -- Jose Luis Rivas <ghostbar38@gmail.com> Fri, 31 Oct 2008 18:54:17 -0430359 -- Jose Luis Rivas <ghostbar38@gmail.com> Fri, 31 Oct 2008 18:54:17 -0430
285360
361xscreensaver (5.07-0ubuntu3) intrepid; urgency=low
362
363 * Drop xli | xloadimage recommends to universe. Both are in universe, and
364 xli is orphaned in Debian.
365
366 -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 23 Oct 2008 12:17:08 +0200
367
368xscreensaver (5.07-0ubuntu2) intrepid; urgency=low
369
370 * Restore the fix from 5.05-1ubuntu2, which was lost in the latest
371 merge:
372 * xscreensaver-gl and xscreensaver-gl-extras Recommend xscreensaver |
373 gnome-screensaver rather than merely xscreensaver, so that germinate
374 won't pull xscreensaver into the desktop (LP: #242495).
375
376 -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 08 Oct 2008 23:07:41 +0000
377
378xscreensaver (5.07-0ubuntu1) intrepid; urgency=low
379
380 * Upgrade upstream version
381 * debian/control: Remove suggest xdaliclock as it is no longer
382 included
383 * Remove 10_jwz-screensaver-randr-patch-3.patch as it has been merged
384 upstream.
385 * Add 24_hacks_xsublim_enable.patch as it seems that xsublim was dropped
386 from the build files. There is nothing in the Changelog about it
387 so I believe it was accidental.
388 * Updating the .desktop files from the XML files using gnome-screensaver's
389 utility to do so. Lots of text updates. Also:
390 * Added: abstractile.desktop
391 * Added: cwaves.desktop
392 * Added: m6502.desktop
393 * Added: skytentacles.desktop
394 * Removed: xteevee.desktop
395 * xscreensaver-gl-extra.files: Added skytentacles
396 * xscreensaver-data-extra.files: Added abstractile, cwaves and m6502
397 * xscreensaver-data.files: Remove partial abstractile, m6502 and cwaves
398
399 -- Ted Gould <ted@ubuntu.com> Thu, 28 Aug 2008 16:15:25 -0500
400
286xscreensaver (5.06-1) unstable; urgency=low401xscreensaver (5.06-1) unstable; urgency=low
287402
288 [ Jose Luis Rivas ]403 [ Jose Luis Rivas ]
@@ -308,6 +423,94 @@
308423
309 -- Jose Luis Rivas <ghostbar38@gmail.com> Tue, 22 Jul 2008 23:33:51 -0430424 -- Jose Luis Rivas <ghostbar38@gmail.com> Tue, 22 Jul 2008 23:33:51 -0430
310425
426xscreensaver (5.08-0ubuntu4) karmic; urgency=low
427
428 * Install fewer screensavers by default. (LP: #385850)
429 - Move all screensavers except fiberlamp, fuzzyflakes,
430 antspotlight, glblur, glcells, glmatrix, glschool,
431 glslideshow, gltext, and hypertoru to the extra
432 packages.
433 * Add files split-hacks.sh and split-hacks.config in /debian
434 inorder to simplfy moving screensavers between packages. Patch
435 from Debian (Thanks to Tormod Volden):
436 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=539937
437 * debian/control:
438 - Make xscreensaver-data and xscreensaver-data-extra replace each other
439 as files have moved between the two packages. The same is done for
440 xscreensaver-gl and xscreensaver-gl-extra
441
442 -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Wed, 09 Sep 2009 10:59:31 +0200
443
444xscreensaver (5.08-0ubuntu3) karmic; urgency=low
445
446 * Added an apport package hook (LP: #398007)
447
448 -- Brian Murray <brian@ubuntu.com> Mon, 13 Jul 2009 10:22:54 -0700
449
450xscreensaver (5.08-0ubuntu2) karmic; urgency=low
451
452 * Included patch for Phosphor segfault (LP: #357556)
453
454 -- Timothy Pearson <kb9vqf@ubuntu.com> Mon, 29 June 2009 12:07:00 -0600
455
456xscreensaver (5.08-0ubuntu1) karmic; urgency=low
457
458 * New upstream release (LP: #392374)
459 - New hack, `photopile'.
460 - Rewrote `sonar' and `jigsaw' as OpenGL programs.
461 - Minor tweaks to `maze', `m6502', `hypnowheel', and `timetunnel'.
462 - Savers that load images now obey EXIF rotation tags.
463 - Arrgh, more RANDR noise! Fixes this time for rotated screens, and for
464 systems where RANDR lies and says the screen size is 0x0.
465 - When the password dialog has timed out or been cancelled, don't pop it
466 right back up a second time.
467 - Password timeouts/cancels don't count as "failed logins".
468 - Retired some of the older, less interesting savers:
469 say goodbye to `bubbles', `critical', `flag', `forest',
470 `glforestfire', `lmorph', `laser', `lightning', `lisa',
471 `lissie', `rotor', `sphere', `spiral', `t3d', `vines',
472 `whirlygig', and `worm'.
473 - Merged `munch' and `mismunch'.
474 - Updated `webcollage' to use twitpics.com as well.
475 * debian/patches/20_hacks_Makefile.patch:
476 - Refreshed
477 * debian/patches/24_hacks_xsublim_enable.patch:
478 - Refreshed
479 * debian/patches/25_xsublim_missing_man_page.patch
480 - Put back removed man page
481 * debian/patches/53_XScreenSaver.ad.in.patch:
482 - Refreshed
483 * debian/screensavers-desktop-files/*:
484 debian/xscreensaver.files:
485 debian/xscreensaver-data-extra.files:
486 debian/xscreensaver-gl-extra.files:
487 - Updated for new/removed/changed screensavers
488 * debian/control: Added Bzr link
489
490 -- Robert Ancell <robert.ancell@canonical.com> Mon, 29 Jun 2009 09:30:05 +0200
491
492xscreensaver (5.05-3+nmu1) unstable; urgency=high
493
494 * Non-maintainer upload by the security team.
495 * Fix local screen lock bypass vulnerability (closes: #539699).
496
497 -- Michael Gilbert <michael.s.gilbert@gmail.com> Mon, 17 Aug 2009 00:43:39 -0400
498
499xscreensaver (5.05-3ubuntu1) intrepid; urgency=low
500
501 * Merge in changes from Debian packaging (in Changelog below)
502 * debian/control: Reset build depends to be easier to merge with
503 Debian in the future.
504 * debian/xscreensaver-gl.files: Reorder files to make merges with
505 Debian easier in the future.
506 * Removing patch 70_demo_gtk_stfu_removal.patch as the work it was doing
507 is now being done by the patch 10_jwz-xscreensaver-randr-patch-3.patch
508 * Removing patch 90_ubuntu-xscreensaver-desktop.patch as the work it was
509 doing is now being done by the patch
510 10_jwz-xscreensaver-randr-patch-3.patch
511
512 -- Ted Gould <ted@ubuntu.com> Thu, 28 Aug 2008 10:50:54 -0500
513
311xscreensaver (5.05-3) unstable; urgency=low514xscreensaver (5.05-3) unstable; urgency=low
312515
313 [ Tormod Volden ]516 [ Tormod Volden ]
@@ -350,6 +553,29 @@
350553
351 -- Jose Luis Rivas <ghostbar38@gmail.com> Fri, 11 Apr 2008 11:56:14 -0430554 -- Jose Luis Rivas <ghostbar38@gmail.com> Fri, 11 Apr 2008 11:56:14 -0430
352555
556xscreensaver (5.05-1ubuntu2) intrepid; urgency=low
557
558 * xscreensaver-gl and xscreensaver-gl-extras Recommend xscreensaver |
559 gnome-screensaver rather than merely xscreensaver, so that germinate
560 won't pull xscreensaver into the desktop (LP: #242495).
561
562 -- Colin Watson <cjwatson@ubuntu.com> Fri, 04 Jul 2008 17:18:38 +0100
563
564xscreensaver (5.05-1ubuntu1) intrepid; urgency=low
565
566 * Added 70_demo_gtk_stfu_removal.patch to remove some more cases where
567 the STFU macro is used such that when the #defines it's used on change
568 the compile breaks. Bad coding style.
569 * Removing 82_ubuntu-texturl-fridge.patch in favor of updating the
570 53_XScreenSaver.ad.in.patch to include the Ubuntu branding instead
571 of the Debian branding. This should make merges easier as long as
572 we use something smart like Bazaar. Also the Debian version has lots
573 of good changes like making it work with /etc/alternates which we
574 didn't have.
575 * Removing 54_driver_demogtk.patch as it was merged upstream.
576
577 -- Ted Gould <ted@ubuntu.com> Tue, 17 Jun 2008 09:41:41 -0700
578
353xscreensaver (5.05-1) unstable; urgency=low579xscreensaver (5.05-1) unstable; urgency=low
354580
355 * New upstream release. 581 * New upstream release.
@@ -387,6 +613,31 @@
387613
388 -- Jose Luis Rivas <ghostbar38@gmail.com> Tue, 11 Mar 2008 22:45:00 -0430614 -- Jose Luis Rivas <ghostbar38@gmail.com> Tue, 11 Mar 2008 22:45:00 -0430
389615
616xscreensaver (5.04-4ubuntu1) hardy; urgency=low
617
618 * Merge from debian unstable, remaining changes: (LP: #201626)
619 - debian/control: add Build-Depends on ubuntu-artwork
620 - debian/rules: use /usr/share/backgrounds
621 - 82_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss
622 - 91_ubuntu-no-pam-conf: don't ship pam.conf
623 - 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop
624 file for what it is to not confuse it with gnome-screensaver
625 - debian/rules: don't hide the xscreensaver desktop icon if the
626 user insists on installing xscreensaver (LP: #86416)
627 - 54_drivers_demogtk.patch: Patching a compile failure with
628 GTK+ in Hardy
629 - 28_rotate.patch: Add in the gdk pixbuf function to rotate JPEGs and
630 TIFFs so that they're the right direction
631 - debian/control: Increasing the GTK+ version to 2.12 for the patch
632 28_rotate.patch
633 - glslideshow.desktop: Changing so that it shows only one image, one
634 time and no extra black on the edges.
635 * Fixed upstream:
636 - install xscreensaver-properties.desktop to right place (LP: #201481)
637 - remove planetary-gears screensaver (LP: #196360)
638
639 -- Tormod Volden <debian.tormod@gmail.com> Thu, 06 Mar 2008 11:01:03 +0100
640
390xscreensaver (5.04-4) unstable; urgency=low641xscreensaver (5.04-4) unstable; urgency=low
391642
392 * debian/control: Add replaces/conflicts to fix upgrades (Closes: #468899)643 * debian/control: Add replaces/conflicts to fix upgrades (Closes: #468899)
@@ -421,6 +672,43 @@
421672
422 -- Jose Luis Rivas <ghostbar38@gmail.com> Fri, 29 Feb 2008 18:53:35 -0430673 -- Jose Luis Rivas <ghostbar38@gmail.com> Fri, 29 Feb 2008 18:53:35 -0430
423674
675xscreensaver (5.04-2ubuntu2) hardy; urgency=low
676
677 * 54_drivers_demogtk.patch: Patching a compile failure with
678 GTK+ in Hardy
679 * 28_rotate.patch: Add in the gdk pixbuf function to rotate JPEGs and
680 TIFFs so that they're the right direction
681 * debian/control: Increasing the GTK+ version to 2.12 for the patch
682 28_rotate.patch
683 * glslideshow.desktop: Changing so that it shows only one image, one
684 time and no extra black on the edges.
685
686 -- Ted Gould <ted@ubuntu.com> Wed, 23 Jan 2008 19:00:20 +0000
687
688xscreensaver (5.04-2ubuntu1) hardy; urgency=low
689
690 * Merge from debian unstable, remaining changes: (LP: #177126)
691 - Split xscreensaver into xscreensaver, xscreensaver-data
692 (hacks we ship), xscreensaver-data-extra (hacks in universe).
693 Split out GL hacks for universe to xscreensaver-gl-extra
694 - create and install .desktop files for gnome-screensaver
695 - debian/control: add Build-Depends on ubuntu-artwork
696 - debian/rules: use /usr/share/backgrounds
697 - 60_ubuntu-add-ant-hack.patch: bring back ant hack
698 - 62_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss
699 - 65_ubuntu-no-pam-conf: don't ship pam.conf
700 * 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop
701 file for what it is to not confuse it with gnome-screensaver
702 * debian/control: warn about gnome-screensaver conflict in
703 xscreensaver package description (LP: #74727)
704 * debian/rules: don't hide the xscreensaver desktop icon if the
705 user insists on installing xscreensaver (LP: #86416)
706 * 60_ubuntu-add-ant-hack.patch refreshed to include "ant" in
707 application defaults (LP: #160669)
708 * Fixed upstream: glhanoi assertion failure (LP: #71795)
709
710 -- Tormod Volden <debian.tormod@gmail.com> Tue, 18 Dec 2007 21:40:55 +0100
711
424xscreensaver (5.04-2) unstable; urgency=low712xscreensaver (5.04-2) unstable; urgency=low
425713
426 [ Tormod Volden ]714 [ Tormod Volden ]
@@ -455,6 +743,23 @@
455743
456 -- Jose Luis Rivas <ghostbar38@gmail.com> Sun, 09 Dec 2007 20:37:38 -0430744 -- Jose Luis Rivas <ghostbar38@gmail.com> Sun, 09 Dec 2007 20:37:38 -0430
457745
746xscreensaver (5.04-1ubuntu2) hardy; urgency=low
747
748 * Fix build failure with new glib2.0.
749
750 -- Matthias Klose <doko@ubuntu.com> Fri, 01 Feb 2008 00:25:15 +0100
751
752xscreensaver (5.04-1ubuntu1) hardy; urgency=low
753
754 * Merge from debian unstable, remaining changes:
755 - split xscreensaver into xscreensaver, xscreensaver-data (hacks we ship),
756 xscreensaver-data-extra (hacks in universe). split out gl hacks for
757 universe to xscreensaver-gl-extra
758 - use fridge for rss screensavers
759 - create and install .desktop files for gnome-screensaver
760
761 -- Oliver Grawert <ogra@ubuntu.com> Thu, 06 Dec 2007 09:53:12 +0000
762
458xscreensaver (5.04-1) unstable; urgency=low763xscreensaver (5.04-1) unstable; urgency=low
459764
460 * New upstream release765 * New upstream release
@@ -555,6 +860,29 @@
555860
556 -- Jose Luis Rivas <ghostbar38@gmail.com> Fri, 13 Jul 2007 17:15:43 -0400861 -- Jose Luis Rivas <ghostbar38@gmail.com> Fri, 13 Jul 2007 17:15:43 -0400
557862
863xscreensaver (4.24-5ubuntu3) gutsy; urgency=low
864
865 * SECURITY UPDATE: password bypass when using network authentication.
866 * driver/lock.c: upstream fixes applied inline.
867 * References
868 CVE-2007-1859
869
870 -- Kees Cook <kees@ubuntu.com> Mon, 11 Jun 2007 12:58:25 -0700
871
872xscreensaver (4.24-5ubuntu2) feisty; urgency=low
873
874 * debian/control:
875 -add libjpeg-progs, netpbm to xscreensaver-data-extras
876 Depends. WebCollage needs them (LP: #61775)
877
878 -- Timo Aaltonen <tepsipakki@ubuntu.com> Sat, 3 Feb 2007 00:33:40 +0200
879
880xscreensaver (4.24-5ubuntu1) feisty; urgency=low
881
882 * Merge from debian unstable.
883
884 -- Oliver Grawert <ogra@ubuntu.com> Mon, 30 Oct 2006 13:55:08 +0000
885
558xscreensaver (4.24-5) unstable; urgency=low886xscreensaver (4.24-5) unstable; urgency=low
559887
560 * remove /usr/doc/xscreensaver link to finish /usr/doc ->888 * remove /usr/doc/xscreensaver link to finish /usr/doc ->
@@ -562,6 +890,19 @@
562890
563 -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Sat, 29 Jul 2006 23:00:43 +0100891 -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Sat, 29 Jul 2006 23:00:43 +0100
564892
893xscreensaver (4.24-4ubuntu2) edgy; urgency=low
894
895 * fix location of the gnome-screensaver .desktop files,
896 they need to be in /usr/share/applications/screensavers now
897
898 -- Oliver Grawert <ogra@ubuntu.com> Fri, 21 Jul 2006 16:33:39 +0200
899
900xscreensaver (4.24-4ubuntu1) edgy; urgency=low
901
902 * Merge from debian unstable.
903
904 -- Oliver Grawert <ogra@ubuntu.com> Fri, 30 Jun 2006 16:27:21 +0100
905
565xscreensaver (4.24-4) unstable; urgency=low906xscreensaver (4.24-4) unstable; urgency=low
566907
567 * we may be building in an environment (e.g. Debian buildd chroot)908 * we may be building in an environment (e.g. Debian buildd chroot)
@@ -598,6 +939,78 @@
598939
599 -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Sun, 26 Mar 2006 11:00:43 +0100940 -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Sun, 26 Mar 2006 11:00:43 +0100
600941
942xscreensaver (4.23-4ubuntu8) dapper; urgency=low
943
944 * disable offending glsnake screensavers (closes malone #36743)
945 * remove the .desktop alternative again, after discussing the issue with
946 seb128 i agree its not a bug (rejected malone 32385 alongside)
947 * make the fridge the default url for rss feeds (closes malone #34829)
948 * fix xscreensaver-data.postrm to point to the right config if xscreensaver-gl
949 is still installed (closes malone #33748)
950 * added dictionaries-common to xscreensaver-data-extra dependencys (closes
951 malone #6498)
952
953 -- Oliver Grawert <ogra@ubuntu.com> Thu, 18 May 2006 12:09:48 +0200
954
955xscreensaver (4.23-4ubuntu7) dapper; urgency=low
956
957 * make preferences .desktop file an alternative, so it wont be shown if
958 gnome-screensaver is installed and selected as alternative
959
960 -- Oliver Grawert <ogra@ubuntu.com> Thu, 16 Mar 2006 14:21:14 +0100
961
962xscreensaver (4.23-4ubuntu6) dapper; urgency=low
963
964 * add gnome-screensaver planetary_gears.desktop helper file to
965 xscreensaver-gl closes malone 33754
966
967 -- Oliver Grawert <ogra@ubuntu.com> Sun, 5 Mar 2006 03:13:36 +0100
968
969xscreensaver (4.23-4ubuntu5) dapper; urgency=low
970
971 * debian/rules: Add gettext domain to .desktop files to get language pack
972 support for them.
973
974 -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 24 Feb 2006 10:17:03 +0100
975
976xscreensaver (4.23-4ubuntu4) dapper; urgency=low
977
978 * make xscreensaver use /usr/share/backgrounds as default
979 (compile time option) location for image processing screensavers
980 and enable random images in the default config (adds build dep to
981 ubuntu-artwork that creates this dir. to be moved to a combination
982 of a screensaver specific subdir and an ubuntu-artwork-screensaver
983 package for default images)
984 * move the default config to the -data .deb so it applies for hacks without
985 having xscreensaver installed adjust postinst and postrm files accordingly
986 * split out packages xscreensaver-data-extra and xscreensaver-gl-extra so
987 xscreensaver-data and xscreensaver-gl only contain the hacks we want to
988 ship which gains us 5 megabytes on the CD (install the -extra files to get
989 the full set of hacks as before)
990 * make planet.ubuntu.com the default rss source for rss reading screensavers
991 * make sure the ant screensaver is built and installed
992
993 -- Oliver Grawert <ogra@ubuntu.com> Mon, 20 Feb 2006 18:41:15 +0100
994
995xscreensaver (4.23-4ubuntu3) dapper; urgency=low
996
997 * add missing gnome-screensaver .desktop helper files to
998 xscreensaver-data and xscreensaver-gl
999
1000 -- Oliver Grawert <ogra@ubuntu.com> Sun, 19 Feb 2006 03:05:32 +0100
1001
1002xscreensaver (4.23-4ubuntu2) dapper; urgency=low
1003
1004 * fixed build dependencys
1005
1006 -- Oliver Grawert <ogra@ubuntu.com> Mon, 6 Feb 2006 14:05:03 +0100
1007
1008xscreensaver (4.23-4ubuntu1) dapper; urgency=low
1009
1010 * merge with debian
1011
1012 -- Oliver Grawert <ogra@ubuntu.com> Tue, 17 Jan 2006 02:20:00 +0100
1013
601xscreensaver (4.23-4) unstable; urgency=high1014xscreensaver (4.23-4) unstable; urgency=high
6021015
603 * replace xlibs-dev build-depend with the individual libraries that1016 * replace xlibs-dev build-depend with the individual libraries that
@@ -625,6 +1038,37 @@
6251038
626 -- Josselin Mouette <joss@debian.org> Fri, 9 Dec 2005 00:53:01 +01001039 -- Josselin Mouette <joss@debian.org> Fri, 9 Dec 2005 00:53:01 +0100
6271040
1041xscreensaver (4.23-2ubuntu4) dapper; urgency=low
1042
1043 * Bump the versioned xscreensaver-data -> xscreensaver Replaces to
1044 catch the latest file overwrite and allow upgrades to go smoothly.
1045
1046 -- Adam Conrad <adconrad@ubuntu.com> Thu, 8 Dec 2005 16:00:22 +1100
1047
1048xscreensaver (4.23-2ubuntu3) dapper; urgency=low
1049
1050 * and actually upload the right source package ...
1051
1052 -- Oliver Grawert <ogra@ubuntu.com> Wed, 7 Dec 2005 22:49:24 +0100
1053
1054xscreensaver (4.23-2ubuntu2) dapper; urgency=low
1055
1056 * remove the config/README file from the xscreensaver package
1057 and move it to xscreensaver-data where it belongs
1058
1059 -- Oliver Grawert <ogra@ubuntu.com> Wed, 7 Dec 2005 19:58:48 +0100
1060
1061xscreensaver (4.23-2ubuntu1) dapper; urgency=low
1062
1063 * resyncronize with debian (drop most ubuntu changes, we'll
1064 only support the hacks we ship for gnome-screensaver)
1065 * split out the xscreensaver-data package again
1066 * fix build dependencys to match ubuntu
1067 * add a set of .desktop files for selected hacks for usage
1068 of the xscreensaver-data package with gnome-screensaver
1069
1070 -- Oliver Grawert <ogra@ubuntu.com> Wed, 16 Nov 2005 00:23:02 +0100
1071
628xscreensaver (4.23-2) unstable; urgency=low1072xscreensaver (4.23-2) unstable; urgency=low
6291073
630 * Apply NMU patch (why was there an NMU? Hello? Talk to me before doing an NMU!) (Closes: #334193)1074 * Apply NMU patch (why was there an NMU? Hello? Talk to me before doing an NMU!) (Closes: #334193)
@@ -634,6 +1078,12 @@
6341078
635 -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Sun, 30 Oct 2005 14:43:43 +01001079 -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Sun, 30 Oct 2005 14:43:43 +0100
6361080
1081xscreensaver (4.23-1) unstable; urgency=low
1082
1083 * new upstream (closes: #308668, #195727, #322752, #305528)
1084
1085 -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Wed, 26 Sep 2005 15:23:43 +0200
1086
637xscreensaver (4.23-0.1) unstable; urgency=high1087xscreensaver (4.23-0.1) unstable; urgency=high
6381088
639 * NMU.1089 * NMU.
@@ -641,12 +1091,6 @@
6411091
642 -- Emfox Zhou <EmfoxZhou@gmail.com> Sun, 30 Oct 2005 01:54:04 +08001092 -- Emfox Zhou <EmfoxZhou@gmail.com> Sun, 30 Oct 2005 01:54:04 +0800
6431093
644xscreensaver (4.23-1) unstable; urgency=low
645
646 * new upstream (closes: #308668, #195727, #322752, #305528)
647
648 -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Wed, 26 Sep 2005 15:23:43 +0200
649
650xscreensaver (4.21-7) unstable; urgency=low1094xscreensaver (4.21-7) unstable; urgency=low
6511095
652 * fixed fubared patch in lines 1596 to 1603 of file "driver/prefs.c" (closes: #323841)1096 * fixed fubared patch in lines 1596 to 1603 of file "driver/prefs.c" (closes: #323841)
6531097
=== modified file 'debian/control'
--- debian/control 2011-05-13 16:00:06 +0000
+++ debian/control 2011-06-10 02:23:23 +0000
@@ -4,8 +4,8 @@
4Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Jose Luis Rivas <ghostbar@debian.org>5XSBC-Original-Maintainer: Jose Luis Rivas <ghostbar@debian.org>
6Uploaders: Tormod Volden <debian.tormod@gmail.com>6Uploaders: Tormod Volden <debian.tormod@gmail.com>
7Build-Depends: bc, debhelper (>= 7.0), fortune-mod, libgtk2.0-dev, libpam0g-dev (>= 0.72), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | xlibmesa-glu-dev | libglu-dev, xutils-dev, libxml2-dev, libglade2-dev, libjpeg62-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, ubuntu-artwork7Build-Depends: bc, debhelper (>= 7.0), fortune-mod, libgtk2.0-dev, libpam0g-dev (>= 0.72), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | xlibmesa-glu-dev | libglu-dev, xutils-dev, libxml2-dev, libglade2-dev, libjpeg62-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
8Standards-Version: 3.9.18Standards-Version: 3.9.2
9Homepage: http://www.jwz.org/xscreensaver/9Homepage: http://www.jwz.org/xscreensaver/
10Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/xscreensaver/ubuntu10Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/xscreensaver/ubuntu
1111
@@ -14,7 +14,7 @@
14Depends: ${shlibs:Depends}, xscreensaver-data, ${misc:Depends}14Depends: ${shlibs:Depends}, xscreensaver-data, ${misc:Depends}
15Conflicts: funny-manpages (<< 1.3-1), suidmanager (<< 0.50), xscreensaver-gnome (<< 4.09-2), xscreensaver-nognome (<< 4.09-2), gnome-control-center (<< 1:2)15Conflicts: funny-manpages (<< 1.3-1), suidmanager (<< 0.50), xscreensaver-gnome (<< 4.09-2), xscreensaver-nognome (<< 4.09-2), gnome-control-center (<< 1:2)
16Recommends: libjpeg-progs, perl5, miscfiles | wordlist16Recommends: libjpeg-progs, perl5, miscfiles | wordlist
17Suggests: xli | xloadimage, xfishtank, xdaliclock, xscreensaver-gl, fortune, www-browser, qcam | streamer, gdm3 | kdm-gdmcompat17Suggests: xfishtank, xdaliclock, xscreensaver-gl, fortune, www-browser, qcam | streamer, gdm3 | kdm-gdmcompat
18Description: Automatic screensaver for X18Description: Automatic screensaver for X
19 XScreenSaver is a modular screen saver and locker for X11,19 XScreenSaver is a modular screen saver and locker for X11,
20 containing more than 200 screen savers.20 containing more than 200 screen savers.
2121
=== modified file 'debian/patches/53_XScreenSaver.ad.in.patch'
--- debian/patches/53_XScreenSaver.ad.in.patch 2011-05-13 16:00:06 +0000
+++ debian/patches/53_XScreenSaver.ad.in.patch 2011-06-10 02:23:23 +0000
@@ -1,8 +1,8 @@
1Index: xscreensaver/driver/XScreenSaver.ad.in1Index: xscreensaver/driver/XScreenSaver.ad.in
2===================================================================2===================================================================
3--- xscreensaver.orig/driver/XScreenSaver.ad.in 2011-04-21 23:44:55.000000000 +02003--- xscreensaver.orig/driver/XScreenSaver.ad.in 2011-05-22 18:43:28.000000000 +0200
4+++ xscreensaver/driver/XScreenSaver.ad.in 2011-04-22 13:10:29.000000000 +02004+++ xscreensaver/driver/XScreenSaver.ad.in 2011-05-22 18:43:51.000000000 +0200
5@@ -56,11 +56,11 @@5@@ -57,11 +57,11 @@
6 *captureStderr: True6 *captureStderr: True
7 *ignoreUninstalledPrograms: False7 *ignoreUninstalledPrograms: False
8 8
@@ -16,7 +16,7 @@
16 !*textURL: http://twitter.com/statuses/public_timeline.atom16 !*textURL: http://twitter.com/statuses/public_timeline.atom
17 17
18 *overlayTextForeground: #FFFF0018 *overlayTextForeground: #FFFF00
19@@ -95,9 +95,13 @@19@@ -96,9 +96,13 @@
20 !20 !
21 ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)21 ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
22 !22 !
@@ -33,7 +33,7 @@
33 !33 !
34 ! Gnome 2.2:34 ! Gnome 2.2:
35 !35 !
36@@ -112,14 +116,18 @@36@@ -113,14 +117,18 @@
37 !37 !
38 ! non-Gnome systems:38 ! non-Gnome systems:
39 !39 !
@@ -56,7 +56,7 @@
56 ! To show the time only:56 ! To show the time only:
57 ! *dateFormat: %I:%M %p57 ! *dateFormat: %I:%M %p
58 ! For 24 hour time:58 ! For 24 hour time:
59@@ -130,7 +138,9 @@59@@ -131,7 +139,9 @@
60 ! (That button does not appear on the dialog if this program does not exist.)60 ! (That button does not appear on the dialog if this program does not exist.)
61 ! For Gnome: probably "gdmflexiserver -ls". KDE, probably "kdmctl reserve".61 ! For Gnome: probably "gdmflexiserver -ls". KDE, probably "kdmctl reserve".
62 !62 !
@@ -67,7 +67,7 @@
67 67
68 68
69 ! Turning on "installColormap" on 8-bit systems interacts erratically with69 ! Turning on "installColormap" on 8-bit systems interacts erratically with
70@@ -247,7 +257,6 @@70@@ -248,7 +258,6 @@
71 xspirograph -root \n\71 xspirograph -root \n\
72 @GL_KLUDGE@ GL: circuit -root \n\72 @GL_KLUDGE@ GL: circuit -root \n\
73 @GL_KLUDGE@ GL: dangerball -root \n\73 @GL_KLUDGE@ GL: dangerball -root \n\
@@ -75,7 +75,7 @@
75 @GL_KLUDGE@ GL: engine -root \n\75 @GL_KLUDGE@ GL: engine -root \n\
76 @GL_KLUDGE@ GL: flipscreen3d -root \n\76 @GL_KLUDGE@ GL: flipscreen3d -root \n\
77 @GL_KLUDGE@ GL: gltext -root \n\77 @GL_KLUDGE@ GL: gltext -root \n\
78@@ -348,7 +357,8 @@78@@ -349,7 +358,8 @@
79 - lcdscrub -root \n\79 - lcdscrub -root \n\
80 @GL_KLUDGE@ GL: photopile -root \n\80 @GL_KLUDGE@ GL: photopile -root \n\
81 @GL_KLUDGE@ GL: skytentacles -root \n\81 @GL_KLUDGE@ GL: skytentacles -root \n\
@@ -85,7 +85,7 @@
85 85
86 86
87 87
88@@ -398,10 +408,11 @@88@@ -399,10 +409,11 @@
89 *Dialog.shadowThickness: 289 *Dialog.shadowThickness: 2
90 90
91 *passwd.heading.label: XScreenSaver %s91 *passwd.heading.label: XScreenSaver %s
9292
=== removed file 'debian/patches/61_fix_tube_memleak.patch'
--- debian/patches/61_fix_tube_memleak.patch 2011-03-07 07:50:21 +0000
+++ debian/patches/61_fix_tube_memleak.patch 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
1Description: Fix obnoxious per-frame memleak in (at least) gltext
2Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
3Forwarded: Yes
4
5Index: xscreensaver-5.12/hacks/glx/tube.c
6===================================================================
7--- xscreensaver-5.12.orig/hacks/glx/tube.c 2011-03-07 18:31:54.322875242 +1100
8+++ xscreensaver-5.12/hacks/glx/tube.c 2011-03-07 18:38:59.758156110 +1100
9@@ -181,6 +181,7 @@
10 glDrawArrays ((wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN), 0, out);
11 }
12
13+ free(array);
14 return polys;
15 }
16
170
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-03-07 07:50:21 +0000
+++ debian/patches/series 2011-06-10 02:23:23 +0000
@@ -14,4 +14,3 @@
1414
1580_Makefile_in-clean-fix.patch1580_Makefile_in-clean-fix.patch
1660_sequential_glslideshow.patch1660_sequential_glslideshow.patch
1761_fix_tube_memleak.patch
1817
=== removed file 'debian/xscreensaver.desktop'
--- debian/xscreensaver.desktop 2009-06-26 02:35:30 +0000
+++ debian/xscreensaver.desktop 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1[Desktop Entry]
2Name=XScreenSaver Setup
3Exec=xscreensaver-demo
4Icon=xscreensaver
5Terminal=false
6StartupNotify=true
7Type=Application
8Categories=System;

Subscribers

People subscribed via source and target branches