please merge xscreensaver 5.04-2 from Debian unstable main
Bug #177126 reported by
Tormod Volden
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
xscreensaver (Ubuntu) |
Fix Released
|
Undecided
|
Unassigned |
Bug Description
Binary package hint: xscreensaver
After a long due overhaul of the packaging, the Debian diff.gz is now reduced from 170k to 45k, and the Ubuntu package could need to catch up.
- In perfect timing for the seasonal family festivities, the new version has removed potentially offensive language from a couple of hacks.
- Bug #71795 seems to be fixed even though it can not be traced to anything in the changelog
- Fixes for bug #74727, bug #86416, bug #160669 in my upcoming patch
Changed in xscreensaver: | |
assignee: | nobody → tormodvolden |
status: | New → In Progress |
To post a comment you must log in.
The Ubuntu debdiff is now reduced from 12 MB to 190 kB (by removing autogenerated files, duplicates etc). (The Ubuntu diff.gz is now 71 kB.)
* Merge from debian unstable, remaining changes: (LP: #177126) data-extra (hacks in universe). gl-extra backgrounds add-ant- hack.patch: bring back ant hack texturl- fridge. patch: use Ubuntu fridge for rss no-pam- conf: don't ship pam.conf xscreensaver- desktop. patch: name the xscreensaver desktop add-ant- hack.patch refreshed to include "ant" in
- Split xscreensaver into xscreensaver, xscreensaver-data
(hacks we ship), xscreensaver-
Split out GL hacks for universe to xscreensaver-
- create and install .desktop files for gnome-screensaver
- debian/control: add Build-Depends on ubuntu-artwork
- debian/rules: use /usr/share/
- 60_ubuntu-
- 62_ubuntu-
- 65_ubuntu-
* 70_ubuntu-
file for what it is to not confuse it with gnome-screensaver
* debian/control: warn about gnome-screensaver conflict in
xscreensaver package description (LP: #74727)
* debian/rules: don't hide the xscreensaver desktop icon if the
user insists on installing xscreensaver (LP: #86416)
* 60_ubuntu-
application defaults (LP: #160669)
* Fixed upstream: glhanoi assertion failure (LP: #71795)