lp:~mrpouit/xscreensaver/restore-vanished-changes
- Get this branch:
- bzr branch lp:~mrpouit/xscreensaver/restore-vanished-changes
Branch merges
- Ubuntu Desktop: Pending requested
-
Diff: 122 lines (+73/-15)4 files modifieddebian/changelog (+29/-0)
debian/patches/50_driver_screensaver-properties-desktop.patch (+0/-14)
debian/patches/60_sequential_glslideshow.patch (+43/-0)
debian/patches/series (+1/-1)
Related source package recipes
Branch information
Recent revisions
- 20. By Lionel Le Folgoc
-
Restore changes from 5.11-1ubuntu2 that disappeared with 5.12-0ubuntu1
Also, resync 5.12-0ubuntu2 changes from the archive to avoid losing them
with the next upload…: - 17. By Robert Ancell
-
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control:
- Build-Depend on ubuntu-artwork
- Add Vcs-Bzr link
- Move xli | xloadimage xscreensaver recommends to suggests
- 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 to Debian
* debian/xscreensaver. dirs
- Install /usr/share/backgrounds. By default, settings search in
/usr/share/backgroun ds and without it, it displays an error
* debian/patches/ 53_XScreenSaver .ad.in. patch:
- Use Ubuntu branding
- Updated new login command (newLoginCommand) to work with new GDM by
truncating deprecated arguments to gdmflexiserver. - 16. By Cody A.W. Somerville
-
* Updated debian/
patches/ 53_XScreenSaver .ad.in. patch:
- Updated new login command (newLoginCommand) to work with new GDM by
truncating deprecated arguments to gdmflexiserver. (Fixes LP #566913) - 13. By Steve Langasek
-
* Reintroduce changes lost from version 5.08-0ubuntu5:
* Add debian/xscreensaver. dirs with /usr/share/ backgrounds. By default,
settings search in /usr/share/backgrounds and without it, it displays an
error (LP: #129769) - 12. By Robert Ancell
-
* Merge with Debian unstable, remaining changes: (LP: #489062)
- debian/control: add Build-Depends on ubuntu-artwork
- debian/rules: use /usr/share/backgrounds
- debian/control: Move xli | xloadimage recommends to suggests
- debian/split-hacks. config: Use different set of default hacks to Debian
- debian/source_ xscreensaver. py: Add apport hook
- debian/patches/ 53_XScreenSaver .ad.in. patch: Use Ubuntu branding
* Move sonar to xscreensaver-gl, it got GL-ified (Closes: #550002)
* Remove Xsession hook, could not be disabled (Closes: #550042)
* Add desktop file to /etc/xdg/autostart, to disable it see
http://standards. freedesktop. org/autostart- spec/ (Closes: #357297)
* Move 20_hack_flurry_ man_name to 11_upstream_ flurry_ man_name
* debian/split-config. sh, debian/rules, etc: Auto-generate the
package.install files to make one single dh_install{,man} call
since this is so much more efficent.
* Updated my email address in debian/copyright.
* Added README.hacking to debian/xscreensaver. docs (Closes: #544352).
* Included a hook for Xsession thanks to Y Giridhar Appaji Nag
<email address hidden> (Closes: #357297).
* Fixed the changelog.
* Drop patch applied upstream:
- 12_upstream_fix_typo_ in_de.po. patch
* Removed hyperball and hypercube hacks, retired upstream
* Updated Standards-Version to 3.8.3 w/o any changes needed.
* Created debian/README. source.
* Added patch 20_hack_flurry_ man_name for NAME section of
manpage for flurry hack.
* Changed my email address from <email address hidden> to
<email address hidden> in Maintainer field.
* Acknowledging NMU for 5.05.
* New Upstream Version
- Fixed intermittent failure in xscreensaver-command
Thanks to contribution by James Vega (Closes: 486603)
- Fixed another potential RANDR crash
* Drop patches applied upstream:
- 11_upstream_phosphor_ segfault_ win_size. patch
- 63_upstream_blinkbox- man.patch
- 64_upstream_topblock- man.patch
- 65_upstream_eruption- man.patch
- 66_upstream_truchet- man.patch
- 67_upstream_metaballs- man.patch
- 70_upstream_fix_local_ screenlock_ bypass. patch (Closes: #539699)
* Do not ship juggle any longer (merged with juggler3d)
* Ship new hacks: rubikblocks and surfaces
* 80_Makefile_in-clean- fix.patch: Workaround for make distclean
failure in some situations, probably autoconf 2.64 issue
* Ship the new "photopile" hack
* Delete two unused patches (52_ and 60_) from source
* Fix location of Norwegian Bokmål locale (no -> nb)
* Do not ship these hacks any longer (retired upstream):
bubbles, critical, flag, forest, glforestfire, lmorph, laser,
lightning, lisa, lissie, rotor, sphere, spiral, t3d, vines,
whirlygig, worm, mismunch
* 10_upstream_skip_retired_ hacks.patch: Fix hacks/Makefile.in and
hacks/glx/Makefile. in so that retired hacks are not built
* debian/control: Update FSF address
* Update to debhelper compat 7
* Fix typo in package description (Closes: #504424)
* Add missing hacks to package description (Closes: #481749)
* debian/control: Breaks gnome-screensaver < 2.26 since we are
using full paths in the desktop files
* Split debian/patches/ 20_hacks_ Makefile. patch into new
20_hacks_man_section. patch and 20_hacks_ maze_xpm_ libs.patch
* debian/patches/ 20_skip_ install- pam.patch:
Do not run install-pam since we use dh_installpam
* 11_upstream_phosphor_ segfault_ win_size. patch:
phospor hack segfaults on window resize (Closes: #505379)
* debian/split-hacks. {sh,config} : Configure which hacks go
in which packages instead of manually editing *.files
(Closes: #539937)
* Refresh 50_driver_screensaver- properties- desktop. patch so that
we do not change the .desktop file Category (Closes: #544837)
* debian/rules: Fix sequential build invokations
* debian/copyright: Major update (not 100% yet)
* Move jigsaw from xscreensaver-data-extra. files to
xscreensaver-gl-extra. files since it now is a glx hack
* Screensavers that uses images now rotates according to EXIF data
since this new upstream version (Closes: #314553)
* Reinstate flurry on xscreensaver-gl-extra since crashes were not
reproducible (Closes: #495633)
* Non-maintainer upload by the security team.
* Fix local screen lock bypass vulnerability (closes: #539699).
* New Upstream Version
* driver/XScreensaver. ad.in:
+ Use ISO time/date format in password dialog
+ Use url as default text method
+ remove dnalogo and flurry which are not installed
* remove xsublim hack since upstream no more installs it
* add desktop file comment to cubicgrid, hypnowheel and lcdscrub
* debian/patches: renamed, commented, refreshed patches and series
* debian/control: use Suggests xscreensaver instead of Enhances
for -data and -gl packages
* Fixed Exec and TryExec entries in desktop files.
* Fixed manpages warnings and bad-formatting.
* Fixed Vcs-Browser URI.
* New upstream release
* debian/patches:
+ delete patch for xinerama, is now merged upstream
+ add patch for hacks/Makefile.in
* debian/control: let the hacks packages "enhance" xscreensaver
and gnome-screensaver since they can be used independently
* use upstream xscreensaver-properties. desktop instead of our own
* move man pages to section 6x in a consistent way
* ship the lcdscrub man page
* factor out common stuff from hacks desktop files into one stub
file for easier mass modification
* add OnlyShowIn=GNOME to desktop files (fixes lintian warnings)
* add -randomize to truchet and xlyap desktop files
* add desktop file for m6502, abstractile and cwaves
* fixed up names in several desktop files
* use yelp to display man pages in Preferences dialog if available,
and do the right thing in a terminal window if not
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
