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) - Split xscreensaver into xscreensaver, xscreensaver-data (hacks we ship), xscreensaver-data-extra (hacks in universe). Split out GL hacks for universe to xscreensaver-gl-extra - create and install .desktop files for gnome-screensaver - debian/control: add Build-Depends on ubuntu-artwork - debian/rules: use /usr/share/backgrounds - 60_ubuntu-add-ant-hack.patch: bring back ant hack - 62_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss - 65_ubuntu-no-pam-conf: don't ship pam.conf * 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop 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-add-ant-hack.patch refreshed to include "ant" in application defaults (LP: #160669) * Fixed upstream: glhanoi assertion failure (LP: #71795) ** Attachment added: "debdiff from Debian version 5.04-2" http://launchpadlibrarian.net/10973495/xscreensaver_5.04-2ubuntu1.debdiff ** Changed in: xscreensaver (Ubuntu) Assignee: Tormod Volden (tormodvolden) => (unassigned) Status: In Progress => New -- please merge xscreensaver 5.04-2 from Debian unstable main https://bugs.launchpad.net/bugs/177126 You received this bug notification because you are a member of Ubuntu Bugs, which is the bug contact for Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs