Merge lp://qastaging/~cyphermox/ubuntu/precise/xscreensaver/merge-5.15-2 into lp://qastaging/ubuntu/precise/xscreensaver

Makefile.in (+1/-0)
OSX/English.lproj/SaverRunner.nib/designable.nib (+1790/-0)
OSX/English.lproj/SaverTester.nib/classes.nib (+0/-27)
OSX/English.lproj/SaverTester.nib/info.nib (+0/-20)
OSX/Makefile (+8/-7)
OSX/PrefsReader.m (+5/-4)
OSX/SaverRunner.h (+27/-0)
OSX/SaverRunner.m (+524/-0)
OSX/SaverRunner.plist (+32/-0)
OSX/SaverTester.h (+0/-21)
OSX/SaverTester.m (+0/-352)
OSX/SaverTester.plist (+0/-32)
OSX/XScreenSaver.plist (+3/-3)
OSX/XScreenSaverConfigSheet.m (+56/-17)
OSX/XScreenSaverView.h (+2/-1)
OSX/XScreenSaverView.m (+10/-2)
OSX/bindist.rtf (+2/-2)
OSX/jwxyz.m (+2/-2)
OSX/update-info-plist.pl (+19/-14)
README (+13/-1)
configure (+14/-1)
configure.in (+12/-0)
debian/changelog (+126/-80)
debian/control (+2/-2)
debian/patches/10_upstream_skip_retired_hacks.patch (+5/-5)
debian/patches/53_XScreenSaver.ad.in.patch (+16/-16)
debian/rules (+3/-1)
debian/screensavers-desktop-files/companioncube.desktop (+6/-0)
debian/screensavers-desktop-files/hilbert.desktop (+6/-0)
debian/screensavers-desktop-files/tronbit.desktop (+6/-0)
debian/split-hacks.config (+3/-0)
debian/xscreensaver.postrm (+1/-0)
driver/XScreenSaver.ad.in (+14/-6)
driver/XScreenSaver_ad.h (+9/-4)
driver/demo-Gtk-widgets.c (+2/-2)
driver/lock.c (+3/-0)
driver/test-passwd.c (+1/-1)
driver/xscreensaver-demo.glade2 (+27/-2)
driver/xscreensaver-demo.man (+91/-74)
driver/xscreensaver-getimage-file (+344/-9)
driver/xscreensaver-getimage.man (+7/-4)
driver/xscreensaver-text (+9/-6)
driver/xscreensaver.c (+20/-10)
driver/xscreensaver.man (+76/-67)
hacks/apollonian.c (+12/-8)
hacks/apple2-main.c (+26/-5)
hacks/bsod.c (+2/-2)
hacks/ccurve.c (+1/-0)
hacks/check-configs.pl (+3/-2)
hacks/config/README (+2/-2)
hacks/config/apple2.xml (+3/-1)
hacks/config/companioncube.xml (+52/-0)
hacks/config/dangerball.xml (+1/-1)
hacks/config/glmatrix.xml (+3/-1)
hacks/config/hilbert.xml (+73/-0)
hacks/config/ifs.xml (+20/-1)
hacks/config/phosphor.xml (+24/-18)
hacks/config/polyhedra.xml (+1/-0)
hacks/config/tronbit.xml (+37/-0)
hacks/config/xmatrix.xml (+9/-8)
hacks/fps.c (+14/-2)
hacks/fps.h (+2/-2)
hacks/glx/Makefile.in (+85/-7)
hacks/glx/carousel.c (+5/-6)
hacks/glx/companion.c (+613/-0)
hacks/glx/companion_disc.c (+9593/-0)
hacks/glx/companion_heart.c (+653/-0)
hacks/glx/companion_quad.c (+389/-0)
hacks/glx/companioncube.man (+85/-0)
hacks/glx/fps-gl.c (+2/-2)
hacks/glx/glmatrix.c (+0/-2)
hacks/glx/glmatrix.man (+2/-3)
hacks/glx/glslideshow.c (+5/-6)
hacks/glx/hilbert.c (+1147/-0)
hacks/glx/hilbert.man (+103/-0)
hacks/glx/juggler3d.c (+14/-0)
hacks/glx/menger.c (+2/-0)
hacks/glx/photopile.c (+15/-24)
hacks/glx/polyhedra.c (+10/-0)
hacks/glx/sierpinski3d.c (+3/-0)
hacks/glx/tronbit.c (+553/-0)
hacks/glx/tronbit.man (+79/-0)
hacks/glx/tronbit_idle1.c (+247/-0)
hacks/glx/tronbit_idle2.c (+175/-0)
hacks/glx/tronbit_no.c (+1087/-0)
hacks/glx/tronbit_yes.c (+31/-0)
hacks/glx/vrml2gl.pl (+361/-0)
hacks/glx/wfront2gl.pl (+131/-129)
hacks/images/molecules/capsaicin.pdb (+49/-0)
hacks/lcdscrub.man (+1/-1)
hacks/munge-ad.pl (+3/-2)
hacks/phosphor.c (+41/-7)
hacks/screenhack.c (+1/-1)
hacks/strange.c (+1/-0)
hacks/substrate.c (+1/-0)
hacks/thornbird.c (+0/-1)
hacks/webcollage (+267/-148)
hacks/xlockmore.c (+11/-1)
hacks/xlockmore.h (+7/-5)
hacks/xlockmoreI.h (+4/-2)
hacks/xmatrix.c (+1/-1)
hacks/xmatrix.man (+2/-3)
po/POTFILES.in (+4/-1)
po/pt_BR.po (+131/-106)
setup.com (+0/-1)
utils/minixpm.c (+2/-0)
utils/version.h (+1/-1)
xscreensaver.spec (+1/-1)
xscreensaver.xcodeproj/project.pbxproj (+851/-121)