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

Proposed by Mathieu Trudel-Lapierre on 2011-06-09
Status: Merged
Merged at revision: 29
Proposed branch: lp:~mathieu-tl/xscreensaver/update-to-5.14
Merge into: lp:~ubuntu-desktop/xscreensaver/ubuntu
Diff against target: 712 lines (+469/-50) 6 files modified
To merge this branch: bzr merge lp:~mathieu-tl/xscreensaver/update-to-5.14
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2011-06-09 Pending
Review via email: mp+64084@code.launchpad.net
To post a comment you must log in.
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"

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!

30. By Mathieu Trudel-Lapierre on 2011-06-09

  - 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.

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.

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.

31. By Mathieu Trudel-Lapierre on 2011-06-10

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 on 2011-06-10

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

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

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-05-18 13:39:51 +0000
3+++ debian/changelog 2011-06-10 02:23:23 +0000
4@@ -1,3 +1,48 @@
5+xscreensaver (5.14-1ubuntu1) UNRELEASED; urgency=low
6+
7+ * Merge with Debian unstable, remaining Ubuntu changes (LP: #795251):
8+ - debian/control:
9+ + Add Vcs-Bzr link
10+ + Add/Update replaces with Ubuntu versions
11+ + Update package descriptions to list Ubuntu screensavers
12+ - debian/rules:
13+ + Use /usr/share/backgrounds as image directory
14+ + Add translation domain to .desktop files
15+ - debian/source_xscreensaver.py:
16+ + Add apport hook
17+ - debian/split-hacks.config:
18+ + Use different set of default hacks than Debian
19+ - debian/xscreensaver.dirs
20+ + Install /usr/share/backgrounds. By default, settings search in
21+ /usr/share/backgrounds and without it, it displays an error
22+ - debian/patches/53_XScreenSaver.ad.in.patch:
23+ + Use Ubuntu branding
24+ - debian/patches/60_sequential_glslideshow.patch:
25+ + Allow going through images sequentially rather than just at random in
26+ the GLSlideshow hack.
27+ * debian/patches/61_fix_tube_memleak.patch: dropped, applied upstream.
28+ * debian/xscreensaver.desktop: drop file left over from previous merge.
29+ * debian/control: drop Build-Depends on ubuntu-artwork. This was only pulled
30+ in to create /usr/share/backgrounds to use as a location for screensavers
31+ that look for images.
32+ * debian/changelog: reinstate old changelog entries that were dropped in
33+ previous commits.
34+
35+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 09 Jun 2011 22:10:56 -0400
36+
37+xscreensaver (5.14-1) unstable; urgency=low
38+
39+ [ Tormod Volden ]
40+ * New upstream version 5.14
41+ - Fixed crash in Blank Only Mode when DPMS disabled.
42+ (Closes: #627382, #627397)
43+ - Added ``Quick Power-off in Blank Only Mode'' option.
44+ - BSOD GLaDOS.
45+ * Clean up duplicate build-depends (thanks Jeremy Bicha)
46+ * Drop xli | xloadimage recommends (we use gdk-pixbuf)
47+
48+ -- Jose Luis Rivas <ghostbar@debian.org> Sun, 22 May 2011 23:12:59 -0430
49+
50 xscreensaver (5.13-1ubuntu1) oneiric; urgency=low
51
52 * Merge with Debian unstable, remaining Ubuntu changes:
53@@ -160,6 +205,43 @@
54
55 -- Jose Luis Rivas <ghostbar@debian.org> Sun, 08 Nov 2009 09:27:00 -0430
56
57+xscreensaver (5.10-3ubuntu4) lucid; urgency=low
58+
59+ * Import parts of debian's current .preinst file to get rid of the
60+ previously removed autostart desktop file.
61+
62+ -- Harald Sitter <apachelogger@ubuntu.com> Thu, 15 Apr 2010 00:46:29 +0200
63+
64+xscreensaver (5.10-3ubuntu3) lucid; urgency=low
65+
66+ * Removing autostart from xdg, is now on /usr/share so user can copy it if
67+ wants autostart (LP: #554069)
68+
69+ -- Alessandro Ghersi <alessandro-ghersi@kubuntu.org> Sat, 10 Apr 2010 22:28:57 +0200
70+
71+xscreensaver (5.10-3ubuntu2) lucid; urgency=low
72+
73+ * Reintroduce changes lost from version 5.08-0ubuntu5:
74+
75+ [ Julien Lavergne ]
76+ * Add debian/xscreensaver.dirs with /usr/share/backgrounds. By default,
77+ settings search in /usr/share/backgrounds and without it, it displays an
78+ error (LP: #129769)
79+
80+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 06 Apr 2010 08:10:22 +0000
81+
82+xscreensaver (5.10-3ubuntu1) lucid; urgency=low
83+
84+ * Merge with Debian unstable, remaining changes: (LP: #489062)
85+ - debian/control: add Build-Depends on ubuntu-artwork
86+ - debian/rules: use /usr/share/backgrounds
87+ - debian/control: Move xli | xloadimage recommends to suggests
88+ - debian/split-hacks.config: Use different set of default hacks to Debian
89+ - debian/source_xscreensaver.py: Add apport hook
90+ - debian/patches/53_XScreenSaver.ad.in.patch: Use Ubuntu branding
91+
92+ -- Robert Ancell <robert.ancell@canonical.com> Mon, 30 Nov 2009 13:33:13 +1100
93+
94 xscreensaver (5.10-3) unstable; urgency=low
95
96 * Move sonar to xscreensaver-gl, it got GL-ified (Closes: #550002)
97@@ -257,13 +339,6 @@
98
99 -- Jose Luis Rivas <ghostbar@debian.org> Fri, 25 Sep 2009 07:12:21 -0430
100
101-xscreensaver (5.05-3+nmu1) unstable; urgency=high
102-
103- * Non-maintainer upload by the security team.
104- * Fix local screen lock bypass vulnerability (closes: #539699).
105-
106- -- Michael Gilbert <michael.s.gilbert@gmail.com> Mon, 17 Aug 2009 00:43:39 -0400
107-
108 xscreensaver (5.07-1) unstable; urgency=low
109
110 [ Tormod Volden ]
111@@ -283,6 +358,46 @@
112
113 -- Jose Luis Rivas <ghostbar38@gmail.com> Fri, 31 Oct 2008 18:54:17 -0430
114
115+xscreensaver (5.07-0ubuntu3) intrepid; urgency=low
116+
117+ * Drop xli | xloadimage recommends to universe. Both are in universe, and
118+ xli is orphaned in Debian.
119+
120+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 23 Oct 2008 12:17:08 +0200
121+
122+xscreensaver (5.07-0ubuntu2) intrepid; urgency=low
123+
124+ * Restore the fix from 5.05-1ubuntu2, which was lost in the latest
125+ merge:
126+ * xscreensaver-gl and xscreensaver-gl-extras Recommend xscreensaver |
127+ gnome-screensaver rather than merely xscreensaver, so that germinate
128+ won't pull xscreensaver into the desktop (LP: #242495).
129+
130+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 08 Oct 2008 23:07:41 +0000
131+
132+xscreensaver (5.07-0ubuntu1) intrepid; urgency=low
133+
134+ * Upgrade upstream version
135+ * debian/control: Remove suggest xdaliclock as it is no longer
136+ included
137+ * Remove 10_jwz-screensaver-randr-patch-3.patch as it has been merged
138+ upstream.
139+ * Add 24_hacks_xsublim_enable.patch as it seems that xsublim was dropped
140+ from the build files. There is nothing in the Changelog about it
141+ so I believe it was accidental.
142+ * Updating the .desktop files from the XML files using gnome-screensaver's
143+ utility to do so. Lots of text updates. Also:
144+ * Added: abstractile.desktop
145+ * Added: cwaves.desktop
146+ * Added: m6502.desktop
147+ * Added: skytentacles.desktop
148+ * Removed: xteevee.desktop
149+ * xscreensaver-gl-extra.files: Added skytentacles
150+ * xscreensaver-data-extra.files: Added abstractile, cwaves and m6502
151+ * xscreensaver-data.files: Remove partial abstractile, m6502 and cwaves
152+
153+ -- Ted Gould <ted@ubuntu.com> Thu, 28 Aug 2008 16:15:25 -0500
154+
155 xscreensaver (5.06-1) unstable; urgency=low
156
157 [ Jose Luis Rivas ]
158@@ -308,6 +423,94 @@
159
160 -- Jose Luis Rivas <ghostbar38@gmail.com> Tue, 22 Jul 2008 23:33:51 -0430
161
162+xscreensaver (5.08-0ubuntu4) karmic; urgency=low
163+
164+ * Install fewer screensavers by default. (LP: #385850)
165+ - Move all screensavers except fiberlamp, fuzzyflakes,
166+ antspotlight, glblur, glcells, glmatrix, glschool,
167+ glslideshow, gltext, and hypertoru to the extra
168+ packages.
169+ * Add files split-hacks.sh and split-hacks.config in /debian
170+ inorder to simplfy moving screensavers between packages. Patch
171+ from Debian (Thanks to Tormod Volden):
172+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=539937
173+ * debian/control:
174+ - Make xscreensaver-data and xscreensaver-data-extra replace each other
175+ as files have moved between the two packages. The same is done for
176+ xscreensaver-gl and xscreensaver-gl-extra
177+
178+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com> Wed, 09 Sep 2009 10:59:31 +0200
179+
180+xscreensaver (5.08-0ubuntu3) karmic; urgency=low
181+
182+ * Added an apport package hook (LP: #398007)
183+
184+ -- Brian Murray <brian@ubuntu.com> Mon, 13 Jul 2009 10:22:54 -0700
185+
186+xscreensaver (5.08-0ubuntu2) karmic; urgency=low
187+
188+ * Included patch for Phosphor segfault (LP: #357556)
189+
190+ -- Timothy Pearson <kb9vqf@ubuntu.com> Mon, 29 June 2009 12:07:00 -0600
191+
192+xscreensaver (5.08-0ubuntu1) karmic; urgency=low
193+
194+ * New upstream release (LP: #392374)
195+ - New hack, `photopile'.
196+ - Rewrote `sonar' and `jigsaw' as OpenGL programs.
197+ - Minor tweaks to `maze', `m6502', `hypnowheel', and `timetunnel'.
198+ - Savers that load images now obey EXIF rotation tags.
199+ - Arrgh, more RANDR noise! Fixes this time for rotated screens, and for
200+ systems where RANDR lies and says the screen size is 0x0.
201+ - When the password dialog has timed out or been cancelled, don't pop it
202+ right back up a second time.
203+ - Password timeouts/cancels don't count as "failed logins".
204+ - Retired some of the older, less interesting savers:
205+ say goodbye to `bubbles', `critical', `flag', `forest',
206+ `glforestfire', `lmorph', `laser', `lightning', `lisa',
207+ `lissie', `rotor', `sphere', `spiral', `t3d', `vines',
208+ `whirlygig', and `worm'.
209+ - Merged `munch' and `mismunch'.
210+ - Updated `webcollage' to use twitpics.com as well.
211+ * debian/patches/20_hacks_Makefile.patch:
212+ - Refreshed
213+ * debian/patches/24_hacks_xsublim_enable.patch:
214+ - Refreshed
215+ * debian/patches/25_xsublim_missing_man_page.patch
216+ - Put back removed man page
217+ * debian/patches/53_XScreenSaver.ad.in.patch:
218+ - Refreshed
219+ * debian/screensavers-desktop-files/*:
220+ debian/xscreensaver.files:
221+ debian/xscreensaver-data-extra.files:
222+ debian/xscreensaver-gl-extra.files:
223+ - Updated for new/removed/changed screensavers
224+ * debian/control: Added Bzr link
225+
226+ -- Robert Ancell <robert.ancell@canonical.com> Mon, 29 Jun 2009 09:30:05 +0200
227+
228+xscreensaver (5.05-3+nmu1) unstable; urgency=high
229+
230+ * Non-maintainer upload by the security team.
231+ * Fix local screen lock bypass vulnerability (closes: #539699).
232+
233+ -- Michael Gilbert <michael.s.gilbert@gmail.com> Mon, 17 Aug 2009 00:43:39 -0400
234+
235+xscreensaver (5.05-3ubuntu1) intrepid; urgency=low
236+
237+ * Merge in changes from Debian packaging (in Changelog below)
238+ * debian/control: Reset build depends to be easier to merge with
239+ Debian in the future.
240+ * debian/xscreensaver-gl.files: Reorder files to make merges with
241+ Debian easier in the future.
242+ * Removing patch 70_demo_gtk_stfu_removal.patch as the work it was doing
243+ is now being done by the patch 10_jwz-xscreensaver-randr-patch-3.patch
244+ * Removing patch 90_ubuntu-xscreensaver-desktop.patch as the work it was
245+ doing is now being done by the patch
246+ 10_jwz-xscreensaver-randr-patch-3.patch
247+
248+ -- Ted Gould <ted@ubuntu.com> Thu, 28 Aug 2008 10:50:54 -0500
249+
250 xscreensaver (5.05-3) unstable; urgency=low
251
252 [ Tormod Volden ]
253@@ -350,6 +553,29 @@
254
255 -- Jose Luis Rivas <ghostbar38@gmail.com> Fri, 11 Apr 2008 11:56:14 -0430
256
257+xscreensaver (5.05-1ubuntu2) intrepid; urgency=low
258+
259+ * xscreensaver-gl and xscreensaver-gl-extras Recommend xscreensaver |
260+ gnome-screensaver rather than merely xscreensaver, so that germinate
261+ won't pull xscreensaver into the desktop (LP: #242495).
262+
263+ -- Colin Watson <cjwatson@ubuntu.com> Fri, 04 Jul 2008 17:18:38 +0100
264+
265+xscreensaver (5.05-1ubuntu1) intrepid; urgency=low
266+
267+ * Added 70_demo_gtk_stfu_removal.patch to remove some more cases where
268+ the STFU macro is used such that when the #defines it's used on change
269+ the compile breaks. Bad coding style.
270+ * Removing 82_ubuntu-texturl-fridge.patch in favor of updating the
271+ 53_XScreenSaver.ad.in.patch to include the Ubuntu branding instead
272+ of the Debian branding. This should make merges easier as long as
273+ we use something smart like Bazaar. Also the Debian version has lots
274+ of good changes like making it work with /etc/alternates which we
275+ didn't have.
276+ * Removing 54_driver_demogtk.patch as it was merged upstream.
277+
278+ -- Ted Gould <ted@ubuntu.com> Tue, 17 Jun 2008 09:41:41 -0700
279+
280 xscreensaver (5.05-1) unstable; urgency=low
281
282 * New upstream release.
283@@ -387,6 +613,31 @@
284
285 -- Jose Luis Rivas <ghostbar38@gmail.com> Tue, 11 Mar 2008 22:45:00 -0430
286
287+xscreensaver (5.04-4ubuntu1) hardy; urgency=low
288+
289+ * Merge from debian unstable, remaining changes: (LP: #201626)
290+ - debian/control: add Build-Depends on ubuntu-artwork
291+ - debian/rules: use /usr/share/backgrounds
292+ - 82_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss
293+ - 91_ubuntu-no-pam-conf: don't ship pam.conf
294+ - 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop
295+ file for what it is to not confuse it with gnome-screensaver
296+ - debian/rules: don't hide the xscreensaver desktop icon if the
297+ user insists on installing xscreensaver (LP: #86416)
298+ - 54_drivers_demogtk.patch: Patching a compile failure with
299+ GTK+ in Hardy
300+ - 28_rotate.patch: Add in the gdk pixbuf function to rotate JPEGs and
301+ TIFFs so that they're the right direction
302+ - debian/control: Increasing the GTK+ version to 2.12 for the patch
303+ 28_rotate.patch
304+ - glslideshow.desktop: Changing so that it shows only one image, one
305+ time and no extra black on the edges.
306+ * Fixed upstream:
307+ - install xscreensaver-properties.desktop to right place (LP: #201481)
308+ - remove planetary-gears screensaver (LP: #196360)
309+
310+ -- Tormod Volden <debian.tormod@gmail.com> Thu, 06 Mar 2008 11:01:03 +0100
311+
312 xscreensaver (5.04-4) unstable; urgency=low
313
314 * debian/control: Add replaces/conflicts to fix upgrades (Closes: #468899)
315@@ -421,6 +672,43 @@
316
317 -- Jose Luis Rivas <ghostbar38@gmail.com> Fri, 29 Feb 2008 18:53:35 -0430
318
319+xscreensaver (5.04-2ubuntu2) hardy; urgency=low
320+
321+ * 54_drivers_demogtk.patch: Patching a compile failure with
322+ GTK+ in Hardy
323+ * 28_rotate.patch: Add in the gdk pixbuf function to rotate JPEGs and
324+ TIFFs so that they're the right direction
325+ * debian/control: Increasing the GTK+ version to 2.12 for the patch
326+ 28_rotate.patch
327+ * glslideshow.desktop: Changing so that it shows only one image, one
328+ time and no extra black on the edges.
329+
330+ -- Ted Gould <ted@ubuntu.com> Wed, 23 Jan 2008 19:00:20 +0000
331+
332+xscreensaver (5.04-2ubuntu1) hardy; urgency=low
333+
334+ * Merge from debian unstable, remaining changes: (LP: #177126)
335+ - Split xscreensaver into xscreensaver, xscreensaver-data
336+ (hacks we ship), xscreensaver-data-extra (hacks in universe).
337+ Split out GL hacks for universe to xscreensaver-gl-extra
338+ - create and install .desktop files for gnome-screensaver
339+ - debian/control: add Build-Depends on ubuntu-artwork
340+ - debian/rules: use /usr/share/backgrounds
341+ - 60_ubuntu-add-ant-hack.patch: bring back ant hack
342+ - 62_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss
343+ - 65_ubuntu-no-pam-conf: don't ship pam.conf
344+ * 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop
345+ file for what it is to not confuse it with gnome-screensaver
346+ * debian/control: warn about gnome-screensaver conflict in
347+ xscreensaver package description (LP: #74727)
348+ * debian/rules: don't hide the xscreensaver desktop icon if the
349+ user insists on installing xscreensaver (LP: #86416)
350+ * 60_ubuntu-add-ant-hack.patch refreshed to include "ant" in
351+ application defaults (LP: #160669)
352+ * Fixed upstream: glhanoi assertion failure (LP: #71795)
353+
354+ -- Tormod Volden <debian.tormod@gmail.com> Tue, 18 Dec 2007 21:40:55 +0100
355+
356 xscreensaver (5.04-2) unstable; urgency=low
357
358 [ Tormod Volden ]
359@@ -455,6 +743,23 @@
360
361 -- Jose Luis Rivas <ghostbar38@gmail.com> Sun, 09 Dec 2007 20:37:38 -0430
362
363+xscreensaver (5.04-1ubuntu2) hardy; urgency=low
364+
365+ * Fix build failure with new glib2.0.
366+
367+ -- Matthias Klose <doko@ubuntu.com> Fri, 01 Feb 2008 00:25:15 +0100
368+
369+xscreensaver (5.04-1ubuntu1) hardy; urgency=low
370+
371+ * Merge from debian unstable, remaining changes:
372+ - split xscreensaver into xscreensaver, xscreensaver-data (hacks we ship),
373+ xscreensaver-data-extra (hacks in universe). split out gl hacks for
374+ universe to xscreensaver-gl-extra
375+ - use fridge for rss screensavers
376+ - create and install .desktop files for gnome-screensaver
377+
378+ -- Oliver Grawert <ogra@ubuntu.com> Thu, 06 Dec 2007 09:53:12 +0000
379+
380 xscreensaver (5.04-1) unstable; urgency=low
381
382 * New upstream release
383@@ -555,6 +860,29 @@
384
385 -- Jose Luis Rivas <ghostbar38@gmail.com> Fri, 13 Jul 2007 17:15:43 -0400
386
387+xscreensaver (4.24-5ubuntu3) gutsy; urgency=low
388+
389+ * SECURITY UPDATE: password bypass when using network authentication.
390+ * driver/lock.c: upstream fixes applied inline.
391+ * References
392+ CVE-2007-1859
393+
394+ -- Kees Cook <kees@ubuntu.com> Mon, 11 Jun 2007 12:58:25 -0700
395+
396+xscreensaver (4.24-5ubuntu2) feisty; urgency=low
397+
398+ * debian/control:
399+ -add libjpeg-progs, netpbm to xscreensaver-data-extras
400+ Depends. WebCollage needs them (LP: #61775)
401+
402+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Sat, 3 Feb 2007 00:33:40 +0200
403+
404+xscreensaver (4.24-5ubuntu1) feisty; urgency=low
405+
406+ * Merge from debian unstable.
407+
408+ -- Oliver Grawert <ogra@ubuntu.com> Mon, 30 Oct 2006 13:55:08 +0000
409+
410 xscreensaver (4.24-5) unstable; urgency=low
411
412 * remove /usr/doc/xscreensaver link to finish /usr/doc ->
413@@ -562,6 +890,19 @@
414
415 -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Sat, 29 Jul 2006 23:00:43 +0100
416
417+xscreensaver (4.24-4ubuntu2) edgy; urgency=low
418+
419+ * fix location of the gnome-screensaver .desktop files,
420+ they need to be in /usr/share/applications/screensavers now
421+
422+ -- Oliver Grawert <ogra@ubuntu.com> Fri, 21 Jul 2006 16:33:39 +0200
423+
424+xscreensaver (4.24-4ubuntu1) edgy; urgency=low
425+
426+ * Merge from debian unstable.
427+
428+ -- Oliver Grawert <ogra@ubuntu.com> Fri, 30 Jun 2006 16:27:21 +0100
429+
430 xscreensaver (4.24-4) unstable; urgency=low
431
432 * we may be building in an environment (e.g. Debian buildd chroot)
433@@ -598,6 +939,78 @@
434
435 -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Sun, 26 Mar 2006 11:00:43 +0100
436
437+xscreensaver (4.23-4ubuntu8) dapper; urgency=low
438+
439+ * disable offending glsnake screensavers (closes malone #36743)
440+ * remove the .desktop alternative again, after discussing the issue with
441+ seb128 i agree its not a bug (rejected malone 32385 alongside)
442+ * make the fridge the default url for rss feeds (closes malone #34829)
443+ * fix xscreensaver-data.postrm to point to the right config if xscreensaver-gl
444+ is still installed (closes malone #33748)
445+ * added dictionaries-common to xscreensaver-data-extra dependencys (closes
446+ malone #6498)
447+
448+ -- Oliver Grawert <ogra@ubuntu.com> Thu, 18 May 2006 12:09:48 +0200
449+
450+xscreensaver (4.23-4ubuntu7) dapper; urgency=low
451+
452+ * make preferences .desktop file an alternative, so it wont be shown if
453+ gnome-screensaver is installed and selected as alternative
454+
455+ -- Oliver Grawert <ogra@ubuntu.com> Thu, 16 Mar 2006 14:21:14 +0100
456+
457+xscreensaver (4.23-4ubuntu6) dapper; urgency=low
458+
459+ * add gnome-screensaver planetary_gears.desktop helper file to
460+ xscreensaver-gl closes malone 33754
461+
462+ -- Oliver Grawert <ogra@ubuntu.com> Sun, 5 Mar 2006 03:13:36 +0100
463+
464+xscreensaver (4.23-4ubuntu5) dapper; urgency=low
465+
466+ * debian/rules: Add gettext domain to .desktop files to get language pack
467+ support for them.
468+
469+ -- Martin Pitt <martin.pitt@ubuntu.com> Fri, 24 Feb 2006 10:17:03 +0100
470+
471+xscreensaver (4.23-4ubuntu4) dapper; urgency=low
472+
473+ * make xscreensaver use /usr/share/backgrounds as default
474+ (compile time option) location for image processing screensavers
475+ and enable random images in the default config (adds build dep to
476+ ubuntu-artwork that creates this dir. to be moved to a combination
477+ of a screensaver specific subdir and an ubuntu-artwork-screensaver
478+ package for default images)
479+ * move the default config to the -data .deb so it applies for hacks without
480+ having xscreensaver installed adjust postinst and postrm files accordingly
481+ * split out packages xscreensaver-data-extra and xscreensaver-gl-extra so
482+ xscreensaver-data and xscreensaver-gl only contain the hacks we want to
483+ ship which gains us 5 megabytes on the CD (install the -extra files to get
484+ the full set of hacks as before)
485+ * make planet.ubuntu.com the default rss source for rss reading screensavers
486+ * make sure the ant screensaver is built and installed
487+
488+ -- Oliver Grawert <ogra@ubuntu.com> Mon, 20 Feb 2006 18:41:15 +0100
489+
490+xscreensaver (4.23-4ubuntu3) dapper; urgency=low
491+
492+ * add missing gnome-screensaver .desktop helper files to
493+ xscreensaver-data and xscreensaver-gl
494+
495+ -- Oliver Grawert <ogra@ubuntu.com> Sun, 19 Feb 2006 03:05:32 +0100
496+
497+xscreensaver (4.23-4ubuntu2) dapper; urgency=low
498+
499+ * fixed build dependencys
500+
501+ -- Oliver Grawert <ogra@ubuntu.com> Mon, 6 Feb 2006 14:05:03 +0100
502+
503+xscreensaver (4.23-4ubuntu1) dapper; urgency=low
504+
505+ * merge with debian
506+
507+ -- Oliver Grawert <ogra@ubuntu.com> Tue, 17 Jan 2006 02:20:00 +0100
508+
509 xscreensaver (4.23-4) unstable; urgency=high
510
511 * replace xlibs-dev build-depend with the individual libraries that
512@@ -625,6 +1038,37 @@
513
514 -- Josselin Mouette <joss@debian.org> Fri, 9 Dec 2005 00:53:01 +0100
515
516+xscreensaver (4.23-2ubuntu4) dapper; urgency=low
517+
518+ * Bump the versioned xscreensaver-data -> xscreensaver Replaces to
519+ catch the latest file overwrite and allow upgrades to go smoothly.
520+
521+ -- Adam Conrad <adconrad@ubuntu.com> Thu, 8 Dec 2005 16:00:22 +1100
522+
523+xscreensaver (4.23-2ubuntu3) dapper; urgency=low
524+
525+ * and actually upload the right source package ...
526+
527+ -- Oliver Grawert <ogra@ubuntu.com> Wed, 7 Dec 2005 22:49:24 +0100
528+
529+xscreensaver (4.23-2ubuntu2) dapper; urgency=low
530+
531+ * remove the config/README file from the xscreensaver package
532+ and move it to xscreensaver-data where it belongs
533+
534+ -- Oliver Grawert <ogra@ubuntu.com> Wed, 7 Dec 2005 19:58:48 +0100
535+
536+xscreensaver (4.23-2ubuntu1) dapper; urgency=low
537+
538+ * resyncronize with debian (drop most ubuntu changes, we'll
539+ only support the hacks we ship for gnome-screensaver)
540+ * split out the xscreensaver-data package again
541+ * fix build dependencys to match ubuntu
542+ * add a set of .desktop files for selected hacks for usage
543+ of the xscreensaver-data package with gnome-screensaver
544+
545+ -- Oliver Grawert <ogra@ubuntu.com> Wed, 16 Nov 2005 00:23:02 +0100
546+
547 xscreensaver (4.23-2) unstable; urgency=low
548
549 * Apply NMU patch (why was there an NMU? Hello? Talk to me before doing an NMU!) (Closes: #334193)
550@@ -634,6 +1078,12 @@
551
552 -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Sun, 30 Oct 2005 14:43:43 +0100
553
554+xscreensaver (4.23-1) unstable; urgency=low
555+
556+ * new upstream (closes: #308668, #195727, #322752, #305528)
557+
558+ -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Wed, 26 Sep 2005 15:23:43 +0200
559+
560 xscreensaver (4.23-0.1) unstable; urgency=high
561
562 * NMU.
563@@ -641,12 +1091,6 @@
564
565 -- Emfox Zhou <EmfoxZhou@gmail.com> Sun, 30 Oct 2005 01:54:04 +0800
566
567-xscreensaver (4.23-1) unstable; urgency=low
568-
569- * new upstream (closes: #308668, #195727, #322752, #305528)
570-
571- -- Ralf Hildebrandt <ralf.hildebrandt@charite.de> Wed, 26 Sep 2005 15:23:43 +0200
572-
573 xscreensaver (4.21-7) unstable; urgency=low
574
575 * fixed fubared patch in lines 1596 to 1603 of file "driver/prefs.c" (closes: #323841)
576
577=== modified file 'debian/control'
578--- debian/control 2011-05-13 16:00:06 +0000
579+++ debian/control 2011-06-10 02:23:23 +0000
580@@ -4,8 +4,8 @@
581 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
582 XSBC-Original-Maintainer: Jose Luis Rivas <ghostbar@debian.org>
583 Uploaders: Tormod Volden <debian.tormod@gmail.com>
584-Build-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-artwork
585-Standards-Version: 3.9.1
586+Build-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
587+Standards-Version: 3.9.2
588 Homepage: http://www.jwz.org/xscreensaver/
589 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/xscreensaver/ubuntu
590
591@@ -14,7 +14,7 @@
592 Depends: ${shlibs:Depends}, xscreensaver-data, ${misc:Depends}
593 Conflicts: funny-manpages (<< 1.3-1), suidmanager (<< 0.50), xscreensaver-gnome (<< 4.09-2), xscreensaver-nognome (<< 4.09-2), gnome-control-center (<< 1:2)
594 Recommends: libjpeg-progs, perl5, miscfiles | wordlist
595-Suggests: xli | xloadimage, xfishtank, xdaliclock, xscreensaver-gl, fortune, www-browser, qcam | streamer, gdm3 | kdm-gdmcompat
596+Suggests: xfishtank, xdaliclock, xscreensaver-gl, fortune, www-browser, qcam | streamer, gdm3 | kdm-gdmcompat
597 Description: Automatic screensaver for X
598 XScreenSaver is a modular screen saver and locker for X11,
599 containing more than 200 screen savers.
600
601=== modified file 'debian/patches/53_XScreenSaver.ad.in.patch'
602--- debian/patches/53_XScreenSaver.ad.in.patch 2011-05-13 16:00:06 +0000
603+++ debian/patches/53_XScreenSaver.ad.in.patch 2011-06-10 02:23:23 +0000
604@@ -1,8 +1,8 @@
605 Index: xscreensaver/driver/XScreenSaver.ad.in
606 ===================================================================
607---- xscreensaver.orig/driver/XScreenSaver.ad.in 2011-04-21 23:44:55.000000000 +0200
608-+++ xscreensaver/driver/XScreenSaver.ad.in 2011-04-22 13:10:29.000000000 +0200
609-@@ -56,11 +56,11 @@
610+--- xscreensaver.orig/driver/XScreenSaver.ad.in 2011-05-22 18:43:28.000000000 +0200
611++++ xscreensaver/driver/XScreenSaver.ad.in 2011-05-22 18:43:51.000000000 +0200
612+@@ -57,11 +57,11 @@
613 *captureStderr: True
614 *ignoreUninstalledPrograms: False
615
616@@ -16,7 +16,7 @@
617 !*textURL: http://twitter.com/statuses/public_timeline.atom
618
619 *overlayTextForeground: #FFFF00
620-@@ -95,9 +95,13 @@
621+@@ -96,9 +96,13 @@
622 !
623 ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
624 !
625@@ -33,7 +33,7 @@
626 !
627 ! Gnome 2.2:
628 !
629-@@ -112,14 +116,18 @@
630+@@ -113,14 +117,18 @@
631 !
632 ! non-Gnome systems:
633 !
634@@ -56,7 +56,7 @@
635 ! To show the time only:
636 ! *dateFormat: %I:%M %p
637 ! For 24 hour time:
638-@@ -130,7 +138,9 @@
639+@@ -131,7 +139,9 @@
640 ! (That button does not appear on the dialog if this program does not exist.)
641 ! For Gnome: probably "gdmflexiserver -ls". KDE, probably "kdmctl reserve".
642 !
643@@ -67,7 +67,7 @@
644
645
646 ! Turning on "installColormap" on 8-bit systems interacts erratically with
647-@@ -247,7 +257,6 @@
648+@@ -248,7 +258,6 @@
649 xspirograph -root \n\
650 @GL_KLUDGE@ GL: circuit -root \n\
651 @GL_KLUDGE@ GL: dangerball -root \n\
652@@ -75,7 +75,7 @@
653 @GL_KLUDGE@ GL: engine -root \n\
654 @GL_KLUDGE@ GL: flipscreen3d -root \n\
655 @GL_KLUDGE@ GL: gltext -root \n\
656-@@ -348,7 +357,8 @@
657+@@ -349,7 +358,8 @@
658 - lcdscrub -root \n\
659 @GL_KLUDGE@ GL: photopile -root \n\
660 @GL_KLUDGE@ GL: skytentacles -root \n\
661@@ -85,7 +85,7 @@
662
663
664
665-@@ -398,10 +408,11 @@
666+@@ -399,10 +409,11 @@
667 *Dialog.shadowThickness: 2
668
669 *passwd.heading.label: XScreenSaver %s
670
671=== removed file 'debian/patches/61_fix_tube_memleak.patch'
672--- debian/patches/61_fix_tube_memleak.patch 2011-03-07 07:50:21 +0000
673+++ debian/patches/61_fix_tube_memleak.patch 1970-01-01 00:00:00 +0000
674@@ -1,16 +0,0 @@
675-Description: Fix obnoxious per-frame memleak in (at least) gltext
676-Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
677-Forwarded: Yes
678-
679-Index: xscreensaver-5.12/hacks/glx/tube.c
680-===================================================================
681---- xscreensaver-5.12.orig/hacks/glx/tube.c 2011-03-07 18:31:54.322875242 +1100
682-+++ xscreensaver-5.12/hacks/glx/tube.c 2011-03-07 18:38:59.758156110 +1100
683-@@ -181,6 +181,7 @@
684- glDrawArrays ((wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN), 0, out);
685- }
686-
687-+ free(array);
688- return polys;
689- }
690-
691
692=== modified file 'debian/patches/series'
693--- debian/patches/series 2011-03-07 07:50:21 +0000
694+++ debian/patches/series 2011-06-10 02:23:23 +0000
695@@ -14,4 +14,3 @@
696
697 80_Makefile_in-clean-fix.patch
698 60_sequential_glslideshow.patch
699-61_fix_tube_memleak.patch
700
701=== removed file 'debian/xscreensaver.desktop'
702--- debian/xscreensaver.desktop 2009-06-26 02:35:30 +0000
703+++ debian/xscreensaver.desktop 1970-01-01 00:00:00 +0000
704@@ -1,8 +0,0 @@
705-[Desktop Entry]
706-Name=XScreenSaver Setup
707-Exec=xscreensaver-demo
708-Icon=xscreensaver
709-Terminal=false
710-StartupNotify=true
711-Type=Application
712-Categories=System;

Subscribers

People subscribed via source and target branches