reverted:
--- xscreensaver-5.08/debian/xscreensaver-gl-extra.files
+++ xscreensaver-5.08.orig/debian/xscreensaver-gl-extra.files
@@ -1,140 +0,0 @@
-usr/lib/xscreensaver/antmaze
-usr/lib/xscreensaver/atlantis
-usr/lib/xscreensaver/blocktube
-usr/lib/xscreensaver/boing
-usr/lib/xscreensaver/bouncingcow
-usr/lib/xscreensaver/boxed
-usr/lib/xscreensaver/cage
-usr/lib/xscreensaver/carousel
-usr/lib/xscreensaver/crackberg
-usr/lib/xscreensaver/cube21
-usr/lib/xscreensaver/cubenetic
-usr/lib/xscreensaver/cubicgrid
-usr/lib/xscreensaver/dangerball
-usr/lib/xscreensaver/extrusion
-usr/lib/xscreensaver/fliptext
-usr/lib/xscreensaver/glhanoi
-usr/lib/xscreensaver/glplanet
-usr/lib/xscreensaver/jigsaw
-usr/lib/xscreensaver/juggler3d
-usr/lib/xscreensaver/klein
-usr/lib/xscreensaver/hypnowheel
-usr/lib/xscreensaver/lament
-usr/lib/xscreensaver/menger
-usr/lib/xscreensaver/noof
-usr/lib/xscreensaver/photopile
-usr/lib/xscreensaver/pinion
-usr/lib/xscreensaver/providence
-usr/lib/xscreensaver/rubik
-usr/lib/xscreensaver/sballs
-usr/lib/xscreensaver/skytentacles
-usr/lib/xscreensaver/sproingies
-usr/lib/xscreensaver/stairs
-usr/lib/xscreensaver/starwars
-usr/lib/xscreensaver/tangram
-usr/lib/xscreensaver/timetunnel
-usr/share/man/man6/antmaze.6x
-usr/share/man/man6/atlantis.6x
-usr/share/man/man6/blocktube.6x
-usr/share/man/man6/boing.6x
-usr/share/man/man6/bouncingcow.6x
-usr/share/man/man6/boxed.6x
-usr/share/man/man6/cage.6x
-usr/share/man/man6/carousel.6x
-usr/share/man/man6/crackberg.6x
-usr/share/man/man6/cube21.6x
-usr/share/man/man6/cubenetic.6x
-usr/share/man/man6/cubicgrid.6x
-usr/share/man/man6/dangerball.6x
-usr/share/man/man6/extrusion.6x
-usr/share/man/man6/fliptext.6x
-usr/share/man/man6/glhanoi.6x
-usr/share/man/man6/glplanet.6x
-usr/share/man/man6/jigsaw.6x
-usr/share/man/man6/juggler3d.6x
-usr/share/man/man6/klein.6x
-usr/share/man/man6/hypnowheel.6x
-usr/share/man/man6/lament.6x
-usr/share/man/man6/menger.6x
-usr/share/man/man6/noof.6x
-usr/share/man/man6/photopile.6x
-usr/share/man/man6/pinion.6x
-usr/share/man/man6/providence.6x
-usr/share/man/man6/rubik.6x
-usr/share/man/man6/sballs.6x
-usr/share/man/man6/skytentacles.6x
-usr/share/man/man6/sproingies.6x
-usr/share/man/man6/stairs.6x
-usr/share/man/man6/starwars.6x
-usr/share/man/man6/tangram.6x
-usr/share/man/man6/timetunnel.6x
-usr/share/xscreensaver/config/antmaze.xml
-usr/share/xscreensaver/config/atlantis.xml
-usr/share/xscreensaver/config/blocktube.xml
-usr/share/xscreensaver/config/boing.xml
-usr/share/xscreensaver/config/bouncingcow.xml
-usr/share/xscreensaver/config/boxed.xml
-usr/share/xscreensaver/config/cage.xml
-usr/share/xscreensaver/config/carousel.xml
-usr/share/xscreensaver/config/crackberg.xml
-usr/share/xscreensaver/config/cube21.xml
-usr/share/xscreensaver/config/cubenetic.xml
-usr/share/xscreensaver/config/cubicgrid.xml
-usr/share/xscreensaver/config/dangerball.xml
-usr/share/xscreensaver/config/extrusion.xml
-usr/share/xscreensaver/config/fliptext.xml
-usr/share/xscreensaver/config/glhanoi.xml
-usr/share/xscreensaver/config/glplanet.xml
-usr/share/xscreensaver/config/hypnowheel.xml
-usr/share/xscreensaver/config/jigsaw.xml
-usr/share/xscreensaver/config/juggler3d.xml
-usr/share/xscreensaver/config/klein.xml
-usr/share/xscreensaver/config/lament.xml
-usr/share/xscreensaver/config/menger.xml
-usr/share/xscreensaver/config/noof.xml
-usr/share/xscreensaver/config/photopile.xml
-usr/share/xscreensaver/config/pinion.xml
-usr/share/xscreensaver/config/providence.xml
-usr/share/xscreensaver/config/rubik.xml
-usr/share/xscreensaver/config/sballs.xml
-usr/share/xscreensaver/config/skytentacles.xml
-usr/share/xscreensaver/config/sproingies.xml
-usr/share/xscreensaver/config/stairs.xml
-usr/share/xscreensaver/config/starwars.xml
-usr/share/xscreensaver/config/tangram.xml
-usr/share/xscreensaver/config/timetunnel.xml
-usr/share/applications/screensavers/antmaze.desktop
-usr/share/applications/screensavers/atlantis.desktop
-usr/share/applications/screensavers/blocktube.desktop
-usr/share/applications/screensavers/boing.desktop
-usr/share/applications/screensavers/bouncingcow.desktop
-usr/share/applications/screensavers/boxed.desktop
-usr/share/applications/screensavers/cage.desktop
-usr/share/applications/screensavers/carousel.desktop
-usr/share/applications/screensavers/crackberg.desktop
-usr/share/applications/screensavers/cube21.desktop
-usr/share/applications/screensavers/cubenetic.desktop
-usr/share/applications/screensavers/cubicgrid.desktop
-usr/share/applications/screensavers/dangerball.desktop
-usr/share/applications/screensavers/extrusion.desktop
-usr/share/applications/screensavers/fliptext.desktop
-usr/share/applications/screensavers/glhanoi.desktop
-usr/share/applications/screensavers/glplanet.desktop
-usr/share/applications/screensavers/hypnowheel.desktop
-usr/share/applications/screensavers/jigsaw.desktop
-usr/share/applications/screensavers/juggler3d.desktop
-usr/share/applications/screensavers/klein.desktop
-usr/share/applications/screensavers/lament.desktop
-usr/share/applications/screensavers/menger.desktop
-usr/share/applications/screensavers/noof.desktop
-usr/share/applications/screensavers/photopile.desktop
-usr/share/applications/screensavers/pinion.desktop
-usr/share/applications/screensavers/providence.desktop
-usr/share/applications/screensavers/rubik.desktop
-usr/share/applications/screensavers/sballs.desktop
-usr/share/applications/screensavers/skytentacles.desktop
-usr/share/applications/screensavers/sproingies.desktop
-usr/share/applications/screensavers/stairs.desktop
-usr/share/applications/screensavers/starwars.desktop
-usr/share/applications/screensavers/tangram.desktop
-usr/share/applications/screensavers/timetunnel.desktop
diff -u xscreensaver-5.08/debian/xscreensaver-gl.files xscreensaver-5.08/debian/xscreensaver-gl.files
--- xscreensaver-5.08/debian/xscreensaver-gl.files
+++ xscreensaver-5.08/debian/xscreensaver-gl.files
@@ -2,177 +2 @@
-usr/lib/xscreensaver/antinspect
-usr/lib/xscreensaver/antspotlight
-usr/lib/xscreensaver/atunnel
-usr/lib/xscreensaver/blinkbox
-usr/lib/xscreensaver/bubble3d
-usr/lib/xscreensaver/circuit
-usr/lib/xscreensaver/cubestorm
-usr/lib/xscreensaver/endgame
-usr/lib/xscreensaver/engine
-usr/lib/xscreensaver/flipflop
-usr/lib/xscreensaver/flipscreen3d
-usr/lib/xscreensaver/flyingtoasters
-usr/lib/xscreensaver/gears
-usr/lib/xscreensaver/gflux
-usr/lib/xscreensaver/glblur
-usr/lib/xscreensaver/glcells
-usr/lib/xscreensaver/gleidescope
-usr/lib/xscreensaver/glknots
-usr/lib/xscreensaver/glmatrix
-usr/lib/xscreensaver/glschool
-usr/lib/xscreensaver/glslideshow
-usr/lib/xscreensaver/glsnake
-usr/lib/xscreensaver/gltext
-usr/lib/xscreensaver/hypertorus
-usr/lib/xscreensaver/jigglypuff
-usr/lib/xscreensaver/lavalite
-usr/lib/xscreensaver/lockward
-usr/lib/xscreensaver/mirrorblob
-usr/lib/xscreensaver/moebius
-usr/lib/xscreensaver/moebiusgears
-usr/lib/xscreensaver/molecule
-usr/lib/xscreensaver/morph3d
-usr/lib/xscreensaver/pipes
-usr/lib/xscreensaver/polyhedra
-usr/lib/xscreensaver/polytopes
-usr/lib/xscreensaver/pulsar
-usr/lib/xscreensaver/queens
-usr/lib/xscreensaver/sierpinski3d
-usr/lib/xscreensaver/spheremonics
-usr/lib/xscreensaver/stonerview
-usr/lib/xscreensaver/superquadrics
-usr/lib/xscreensaver/topblock
-usr/lib/xscreensaver/voronoi
-usr/share/man/man6/antinspect.6x
-usr/share/man/man6/antspotlight.6x
-usr/share/man/man6/atunnel.6x
-usr/share/man/man6/blinkbox.6x
-usr/share/man/man6/bubble3d.6x
-usr/share/man/man6/circuit.6x
-usr/share/man/man6/cubestorm.6x
-usr/share/man/man6/endgame.6x
-usr/share/man/man6/engine.6x
-usr/share/man/man6/flipflop.6x
-usr/share/man/man6/flipscreen3d.6x
-usr/share/man/man6/flyingtoasters.6x
-usr/share/man/man6/gears.6x
-usr/share/man/man6/gflux.6x
-usr/share/man/man6/glblur.6x
-usr/share/man/man6/glcells.6x
-usr/share/man/man6/gleidescope.6x
-usr/share/man/man6/glknots.6x
-usr/share/man/man6/glmatrix.6x
-usr/share/man/man6/glschool.6x
-usr/share/man/man6/glslideshow.6x
-usr/share/man/man6/glsnake.6x
-usr/share/man/man6/gltext.6x
-usr/share/man/man6/hypertorus.6x
-usr/share/man/man6/jigglypuff.6x
-usr/share/man/man6/lavalite.6x
-usr/share/man/man6/lockward.6x
-usr/share/man/man6/mirrorblob.6x
-usr/share/man/man6/moebius.6x
-usr/share/man/man6/moebiusgears.6x
-usr/share/man/man6/molecule.6x
-usr/share/man/man6/morph3d.6x
-usr/share/man/man6/pipes.6x
-usr/share/man/man6/polyhedra.6x
-usr/share/man/man6/polytopes.6x
-usr/share/man/man6/pulsar.6x
-usr/share/man/man6/queens.6x
-usr/share/man/man6/sierpinski3d.6x
-usr/share/man/man6/spheremonics.6x
-usr/share/man/man6/stonerview.6x
-usr/share/man/man6/superquadrics.6x
-usr/share/man/man6/topblock.6x
-usr/share/man/man6/voronoi.6x
 usr/share/man/man6/xscreensaver-gl-helper.6
-usr/share/xscreensaver/config/antinspect.xml
-usr/share/xscreensaver/config/antspotlight.xml
-usr/share/xscreensaver/config/atunnel.xml
-usr/share/xscreensaver/config/blinkbox.xml
-usr/share/xscreensaver/config/bubble3d.xml
-usr/share/xscreensaver/config/circuit.xml
-usr/share/xscreensaver/config/cubestorm.xml
-usr/share/xscreensaver/config/endgame.xml
-usr/share/xscreensaver/config/engine.xml
-usr/share/xscreensaver/config/flipflop.xml
-usr/share/xscreensaver/config/flipscreen3d.xml
-usr/share/xscreensaver/config/flyingtoasters.xml
-usr/share/xscreensaver/config/gears.xml
-usr/share/xscreensaver/config/gflux.xml
-usr/share/xscreensaver/config/glblur.xml
-usr/share/xscreensaver/config/glcells.xml
-usr/share/xscreensaver/config/gleidescope.xml
-usr/share/xscreensaver/config/glknots.xml
-usr/share/xscreensaver/config/glmatrix.xml
-usr/share/xscreensaver/config/glschool.xml
-usr/share/xscreensaver/config/glslideshow.xml
-usr/share/xscreensaver/config/glsnake.xml
-usr/share/xscreensaver/config/gltext.xml
-usr/share/xscreensaver/config/hypertorus.xml
-usr/share/xscreensaver/config/jigglypuff.xml
-usr/share/xscreensaver/config/lavalite.xml
-usr/share/xscreensaver/config/lockward.xml
-usr/share/xscreensaver/config/lockward.xml
-usr/share/xscreensaver/config/mirrorblob.xml
-usr/share/xscreensaver/config/moebiusgears.xml
-usr/share/xscreensaver/config/moebiusgears.xml
-usr/share/xscreensaver/config/moebius.xml
-usr/share/xscreensaver/config/molecule.xml
-usr/share/xscreensaver/config/morph3d.xml
-usr/share/xscreensaver/config/pipes.xml
-usr/share/xscreensaver/config/polyhedra.xml
-usr/share/xscreensaver/config/polytopes.xml
-usr/share/xscreensaver/config/pulsar.xml
-usr/share/xscreensaver/config/queens.xml
-usr/share/xscreensaver/config/sierpinski3d.xml
-usr/share/xscreensaver/config/spheremonics.xml
-usr/share/xscreensaver/config/stonerview.xml
-usr/share/xscreensaver/config/superquadrics.xml
-usr/share/xscreensaver/config/topblock.xml
-usr/share/xscreensaver/config/voronoi.xml
-usr/share/applications/screensavers/antinspect.desktop
-usr/share/applications/screensavers/antspotlight.desktop
-usr/share/applications/screensavers/atunnel.desktop
-usr/share/applications/screensavers/blinkbox.desktop
-usr/share/applications/screensavers/bubble3d.desktop
-usr/share/applications/screensavers/circuit.desktop
-usr/share/applications/screensavers/cubestorm.desktop
-usr/share/applications/screensavers/endgame.desktop
-usr/share/applications/screensavers/engine.desktop
-usr/share/applications/screensavers/flipflop.desktop
-usr/share/applications/screensavers/flipscreen3d.desktop
-usr/share/applications/screensavers/flurry.desktop
-usr/share/applications/screensavers/flyingtoasters.desktop
-usr/share/applications/screensavers/gears.desktop
-usr/share/applications/screensavers/gflux.desktop
-usr/share/applications/screensavers/glblur.desktop
-usr/share/applications/screensavers/glcells.desktop
-usr/share/applications/screensavers/gleidescope.desktop
-usr/share/applications/screensavers/glknots.desktop
-usr/share/applications/screensavers/glmatrix.desktop
-usr/share/applications/screensavers/glschool.desktop
-usr/share/applications/screensavers/glslideshow.desktop
-usr/share/applications/screensavers/glsnake.desktop
-usr/share/applications/screensavers/gltext.desktop
-usr/share/applications/screensavers/hypertorus.desktop
-usr/share/applications/screensavers/jigglypuff.desktop
-usr/share/applications/screensavers/lavalite.desktop
-usr/share/applications/screensavers/lockward.desktop
-usr/share/applications/screensavers/mirrorblob.desktop
-usr/share/applications/screensavers/moebius.desktop
-usr/share/applications/screensavers/moebiusgears.desktop
-usr/share/applications/screensavers/molecule.desktop
-usr/share/applications/screensavers/morph3d.desktop
-usr/share/applications/screensavers/pipes.desktop
-usr/share/applications/screensavers/polyhedra.desktop
-usr/share/applications/screensavers/polytopes.desktop
-usr/share/applications/screensavers/pulsar.desktop
-usr/share/applications/screensavers/queens.desktop
-usr/share/applications/screensavers/sierpinski3d.desktop
-usr/share/applications/screensavers/spheremonics.desktop
-usr/share/applications/screensavers/stonerview.desktop
-usr/share/applications/screensavers/stonerview.desktop
-usr/share/applications/screensavers/superquadrics.desktop
-usr/share/applications/screensavers/topblock.desktop
-usr/share/applications/screensavers/voronoi.desktop
diff -u xscreensaver-5.08/debian/xscreensaver-data.files xscreensaver-5.08/debian/xscreensaver-data.files
--- xscreensaver-5.08/debian/xscreensaver-data.files
+++ xscreensaver-5.08/debian/xscreensaver-data.files
@@ -10,54 +9,0 @@
-usr/lib/xscreensaver/deco
-usr/lib/xscreensaver/distort
-usr/lib/xscreensaver/fiberlamp
-usr/lib/xscreensaver/fuzzyflakes
-usr/lib/xscreensaver/galaxy
-usr/lib/xscreensaver/metaballs
-usr/lib/xscreensaver/penrose
-usr/lib/xscreensaver/popsquares
-usr/lib/xscreensaver/ripples
-usr/lib/xscreensaver/shadebobs
-usr/lib/xscreensaver/slidescreen
-usr/lib/xscreensaver/sonar
-usr/lib/xscreensaver/swirl
-usr/lib/xscreensaver/xlyap
-usr/share/man/man6/deco.6x
-usr/share/man/man6/distort.6x
-usr/share/man/man6/fiberlamp.6x
-usr/share/man/man6/fuzzyflakes.6x
-usr/share/man/man6/galaxy.6x
-usr/share/man/man6/metaballs.6x
-usr/share/man/man6/penrose.6x
-usr/share/man/man6/ripples.6x
-usr/share/man/man6/shadebobs.6x
-usr/share/man/man6/slidescreen.6x
-usr/share/man/man6/sonar.6x
-usr/share/man/man6/swirl.6x
-usr/share/man/man6/xlyap.6x
-usr/share/xscreensaver/config/deco.xml
-usr/share/xscreensaver/config/distort.xml
-usr/share/xscreensaver/config/fiberlamp.xml
-usr/share/xscreensaver/config/fuzzyflakes.xml
-usr/share/xscreensaver/config/galaxy.xml
-usr/share/xscreensaver/config/metaballs.xml
-usr/share/xscreensaver/config/penrose.xml
-usr/share/xscreensaver/config/popsquares.xml
-usr/share/xscreensaver/config/ripples.xml
-usr/share/xscreensaver/config/shadebobs.xml
-usr/share/xscreensaver/config/slidescreen.xml
-usr/share/xscreensaver/config/sonar.xml
-usr/share/xscreensaver/config/swirl.xml
-usr/share/xscreensaver/config/xlyap.xml
-usr/share/applications/screensavers/deco.desktop
-usr/share/applications/screensavers/distort.desktop
-usr/share/applications/screensavers/fiberlamp.desktop
-usr/share/applications/screensavers/fuzzyflakes.desktop
-usr/share/applications/screensavers/galaxy.desktop
-usr/share/applications/screensavers/metaballs.desktop
-usr/share/applications/screensavers/penrose.desktop
-usr/share/applications/screensavers/ripples.desktop
-usr/share/applications/screensavers/shadebobs.desktop
-usr/share/applications/screensavers/slidescreen.desktop
-usr/share/applications/screensavers/sonar.desktop
-usr/share/applications/screensavers/swirl.desktop
-usr/share/applications/screensavers/xlyap.desktop
diff -u xscreensaver-5.08/debian/control xscreensaver-5.08/debian/control
--- xscreensaver-5.08/debian/control
+++ xscreensaver-5.08/debian/control
@@ -42,8 +42,7 @@
  is used by both xscreensaver and gnome-screensaver.
  .
  This is the selected set of non-GL screensavers shipped by default:
- deco, distort, fiberlamp, fuzzyflakes, galaxy, metaballs, penrose, 
- ripples, shadebobs, slidescreen, sonar, swirl.
+ fiberlamp and fuzzyflakes.
  .
  Mode display modes can be found in xscreensaver-data-extra, xscreensaver-gl
  and xscreensaver-gl-extra packages.
@@ -62,11 +61,12 @@
  xscreensaver and gnome-screensaver.
  .
  This is the set of non-GL screensavers not shipped by default:
- ant, anemone, anemotaxis, apollonian, apple2, attraction, barcode, blaster,
- blitspin, bouboule, boxfit, braid, bsod, bubbles, bumps, ccurve, celtic,
- cloudlife, compass, coral, critical, crystal, cynosure, decayscreen,
- deluxe, demon, discrete, drift, epicycle, eruption, euler2d, fadeplot,
- fireworkx, flag, flame, flow, fluidballs, fontglide, forest, goop, 
+ deco, distort, galaxy, metaballs, penrose, ripples, shadebobs, slidescreen, 
+ sonar, swirl, ant, anemone, anemotaxis, apollonian, apple2, attraction, 
+ barcode, blaster, blitspin, bouboule, boxfit, braid, bsod, bubbles, bumps, 
+ ccurve, celtic, cloudlife, compass, coral, critical, crystal, cynosure, 
+ decayscreen, deluxe, demon, discrete, drift, epicycle, eruption, euler2d, 
+ fadeplot, fireworkx, flag, flame, flow, fluidballs, fontglide, forest, goop, 
  grav, greynetic, halftone, halo, helix, hopalong, hyperball,
  hypercube, ifs, imsmap, interaggregate, interference, intermomentary, jigsqw, 
  juggle, julia, memscroller, mismunch, moire, moire2, mountain, munch, 
@@ -100,13 +100,8 @@
  used by both xscreensaver and gnome-screensaver.
  .
  This is the set of GL screensavers shipped by default:
- antinspect, antspotlight, atunnel, blinkbox, bubble3d, circuit, cubestorm,
- endgame, engine, flipflop, flipscreen3d, flurry, flyingtoasters, gears,
- gflux, glblur, glcells, gleidescope, glknots, glmatrix, glschool,
- glslideshow, glsnake, gltext, hypertorus, jigglypuff, lavalite, lockward,
- mirrorblog, moebius, boebiusgears, molecule, morph3d, pipes, polyhedra,
- polytopes, pulsar, queens, sierpinski3d, spheremonics, stonerview, 
- superquadrics, topblock, voronoi.
+ antspotlight,  glblur, glcells,  glmatrix, glschool,
+ glslideshow, gltext, and hypertorus.
  More GL screensavers can be found in the xscreensaver-gl-extra package.
  .
  Mode display modes can be found in the xscreensaver-data,
@@ -127,10 +122,15 @@
  by both xscreensaver and gnome-screensaver.
  .
  This is the set of GL screensavers not shipped by default with
- xscreensaver-gl: antmaze, atlantis, blocktube, boing, bouncingcow, boxed,
- cage, carousel, crackberg, cube21, cubenetic, dangerball, extrusion,
- fliptext, glforestfire, glhanoi, glplanet, juggler3d, klein, lament, menger,
- noof, pinion, providence, rubik, sballs, sproingies, staris, starwars,
+ xscreensaver-gl: antinspect, gleidescope, glknots, atunnel, blinkbox,
+ bubble3d, circuit, cubestorm, glsnake, jigglypuff, lavalite, lockward,
+ mirrorblog, moebius, boebiusgears, molecule, morph3d, pipes, polyhedra,
+ polytopes, pulsar, queens, sierpinski3d, spheremonics, stonerview, 
+ superquadrics, topblock, voronoi endgame, engine, flipflop, flipscreen3d,
+ flurry, flyingtoasters, gears, gflux, antmaze, atlantis, blocktube, boing,
+ bouncingcow, boxed, cage, carousel, crackberg, cube21, cubenetic, dangerball,
+ extrusion, fliptext, glforestfire, glhanoi, glplanet, juggler3d, klein, lament,
+ menger, noof, pinion, providence, rubik, sballs, sproingies, staris, starwars,
  tangram, timetunnel.
  .
  More display modes can be found in the xscreensaver-data,
diff -u xscreensaver-5.08/debian/changelog xscreensaver-5.08/debian/changelog
--- xscreensaver-5.08/debian/changelog
+++ xscreensaver-5.08/debian/changelog
@@ -1,3 +1,17 @@
+xscreensaver (5.08-0ubuntu4) karmic; urgency=low
+
+  * Install fewer screensavers by default. (LP: #385850)
+   - Move all screensavers except fiberlamp, fuzzyflakes,
+     antspotlight, glblur, glcells, glmatrix, glschool,
+     glslideshow, gltext, and hypertoru to the extra
+     packages.
+  * Add files install-hacks.sh, data, data-extra, gl, and 
+    gl-extra in debian inorder to simplfy moving screensavers
+    between packages. Patch sent to Debian:
+    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=539937 
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Tue, 04 Aug 2009 13:01:28 -0400
+
 xscreensaver (5.08-0ubuntu3) karmic; urgency=low
 
   * Added an apport package hook (LP: #398007) 
diff -u xscreensaver-5.08/debian/rules xscreensaver-5.08/debian/rules
--- xscreensaver-5.08/debian/rules
+++ xscreensaver-5.08/debian/rules
@@ -114,6 +114,7 @@
 	#for i in $$( ls debian/tmp/usr/share/man/man6/ ); do mv debian/tmp/usr/share/man/man6/$$i debian/tmp/usr/share/man/man6/$$( echo $$i )x; done 
 	for i in debian/tmp/usr/share/man/man6/*; do mv $${i} $${i}x; done
 	mv debian/tmp/usr/share/man/man6/xscreensaver-gl-helper.6x debian/tmp/usr/share/man/man6/xscreensaver-gl-helper.6
+	sh debian/install-hacks.sh
 	dh_movefiles -a
 	dh_install -a
 	# make sure we got everything that was installed
diff -u xscreensaver-5.08/debian/xscreensaver-data-extra.files xscreensaver-5.08/debian/xscreensaver-data-extra.files
--- xscreensaver-5.08/debian/xscreensaver-data-extra.files
+++ xscreensaver-5.08/debian/xscreensaver-data-extra.files
@@ -1,420 +1 @@
-usr/lib/xscreensaver/abstractile
-usr/lib/xscreensaver/anemone
-usr/lib/xscreensaver/anemotaxis
-usr/lib/xscreensaver/apollonian
-usr/lib/xscreensaver/apple2
-usr/lib/xscreensaver/attraction
-usr/lib/xscreensaver/barcode
-usr/lib/xscreensaver/blaster
-usr/lib/xscreensaver/blitspin
-usr/lib/xscreensaver/bouboule
-usr/lib/xscreensaver/boxfit
-usr/lib/xscreensaver/braid
-usr/lib/xscreensaver/bsod
-usr/lib/xscreensaver/bumps
-usr/lib/xscreensaver/ccurve
-usr/lib/xscreensaver/celtic
-usr/lib/xscreensaver/cloudlife
-usr/lib/xscreensaver/compass
-usr/lib/xscreensaver/coral
-usr/lib/xscreensaver/crystal
-usr/lib/xscreensaver/cwaves
-usr/lib/xscreensaver/cynosure
-usr/lib/xscreensaver/decayscreen
-usr/lib/xscreensaver/deluxe
-usr/lib/xscreensaver/demon
-usr/lib/xscreensaver/discrete
-usr/lib/xscreensaver/drift
-usr/lib/xscreensaver/epicycle
-usr/lib/xscreensaver/eruption
-usr/lib/xscreensaver/euler2d
-usr/lib/xscreensaver/fadeplot
-usr/lib/xscreensaver/fireworkx
-usr/lib/xscreensaver/flame
-usr/lib/xscreensaver/flow
-usr/lib/xscreensaver/fluidballs
-usr/lib/xscreensaver/fontglide
-usr/lib/xscreensaver/goop
-usr/lib/xscreensaver/grav
-usr/lib/xscreensaver/greynetic
-usr/lib/xscreensaver/halftone
-usr/lib/xscreensaver/halo
-usr/lib/xscreensaver/helix
-usr/lib/xscreensaver/hopalong
-usr/lib/xscreensaver/hyperball
-usr/lib/xscreensaver/hypercube
-usr/lib/xscreensaver/ifs
-usr/lib/xscreensaver/imsmap
-usr/lib/xscreensaver/interaggregate
-usr/lib/xscreensaver/interference
-usr/lib/xscreensaver/intermomentary
-usr/lib/xscreensaver/juggle
-usr/lib/xscreensaver/julia
-usr/lib/xscreensaver/kaleidescope
-usr/lib/xscreensaver/kumppa
-usr/lib/xscreensaver/lcdscrub
-usr/lib/xscreensaver/ljlatest
-usr/lib/xscreensaver/loop
-usr/lib/xscreensaver/m6502
-usr/lib/xscreensaver/maze
-usr/lib/xscreensaver/memscroller
-usr/lib/xscreensaver/moire
-usr/lib/xscreensaver/moire2
-usr/lib/xscreensaver/mountain
-usr/lib/xscreensaver/munch
-usr/lib/xscreensaver/nerverot
-usr/lib/xscreensaver/noseguy
-usr/lib/xscreensaver/pacman
-usr/lib/xscreensaver/pedal
-usr/lib/xscreensaver/penetrate
-usr/lib/xscreensaver/petri
-usr/lib/xscreensaver/phosphor
-usr/lib/xscreensaver/piecewise
-usr/lib/xscreensaver/polyominoes
-usr/lib/xscreensaver/pong
-usr/lib/xscreensaver/pyro
-usr/lib/xscreensaver/qix
-usr/lib/xscreensaver/rd-bomb
-usr/lib/xscreensaver/rocks
-usr/lib/xscreensaver/rorschach
-usr/lib/xscreensaver/rotzoomer
-usr/lib/xscreensaver/sierpinski
-usr/lib/xscreensaver/slip
-usr/lib/xscreensaver/speedmine
-usr/lib/xscreensaver/spotlight
-usr/lib/xscreensaver/squiral
-usr/lib/xscreensaver/starfish
-usr/lib/xscreensaver/strange
-usr/lib/xscreensaver/substrate
-usr/lib/xscreensaver/thornbird
-usr/lib/xscreensaver/triangle
-usr/lib/xscreensaver/truchet
-usr/lib/xscreensaver/twang
-usr/lib/xscreensaver/vermiculate
-usr/lib/xscreensaver/vidwhacker
-usr/lib/xscreensaver/wander
-usr/lib/xscreensaver/webcollage
-usr/lib/xscreensaver/webcollage-helper
-usr/lib/xscreensaver/whirlwindwarp
-usr/lib/xscreensaver/wormhole
-usr/lib/xscreensaver/xanalogtv
-usr/lib/xscreensaver/xflame
-usr/lib/xscreensaver/xjack
-usr/lib/xscreensaver/xmatrix
-usr/lib/xscreensaver/xrayswarm
-usr/lib/xscreensaver/xspirograph
-usr/lib/xscreensaver/xsublim
-usr/lib/xscreensaver/zoom
-usr/share/man/man6/abstractile.6x
-usr/share/man/man6/anemone.6x
-usr/share/man/man6/anemotaxis.6x
-usr/share/man/man6/apollonian.6x
-usr/share/man/man6/apple2.6x
-usr/share/man/man6/attraction.6x
-usr/share/man/man6/barcode.6x
-usr/share/man/man6/blaster.6x
-usr/share/man/man6/blitspin.6x
-usr/share/man/man6/bouboule.6x
-usr/share/man/man6/boxfit.6x
-usr/share/man/man6/braid.6x
-usr/share/man/man6/bsod.6x
-usr/share/man/man6/bumps.6x
-usr/share/man/man6/celtic.6x
-usr/share/man/man6/ccurve.6x
-usr/share/man/man6/cloudlife.6x
-usr/share/man/man6/compass.6x
-usr/share/man/man6/coral.6x
-usr/share/man/man6/crystal.6x
-usr/share/man/man6/cwaves.6x
-usr/share/man/man6/cynosure.6x
-usr/share/man/man6/decayscreen.6x
-usr/share/man/man6/deluxe.6x
-usr/share/man/man6/demon.6x
-usr/share/man/man6/discrete.6x
-usr/share/man/man6/drift.6x
-usr/share/man/man6/epicycle.6x
-usr/share/man/man6/eruption.6x
-usr/share/man/man6/euler2d.6x
-usr/share/man/man6/fadeplot.6x
-usr/share/man/man6/fireworkx.6x
-usr/share/man/man6/flame.6x
-usr/share/man/man6/flow.6x
-usr/share/man/man6/fluidballs.6x
-usr/share/man/man6/fontglide.6x
-usr/share/man/man6/goop.6x
-usr/share/man/man6/grav.6x
-usr/share/man/man6/greynetic.6x
-usr/share/man/man6/halftone.6x
-usr/share/man/man6/halo.6x
-usr/share/man/man6/helix.6x
-usr/share/man/man6/hopalong.6x
-usr/share/man/man6/hyperball.6x
-usr/share/man/man6/hypercube.6x
-usr/share/man/man6/ifs.6x
-usr/share/man/man6/imsmap.6x
-usr/share/man/man6/interaggregate.6x
-usr/share/man/man6/interference.6x
-usr/share/man/man6/intermomentary.6x
-usr/share/man/man6/juggle.6x
-usr/share/man/man6/julia.6x
-usr/share/man/man6/kaleidescope.6x
-usr/share/man/man6/kumppa.6x
-usr/share/man/man6/ljlatest.6x
-usr/share/man/man6/loop.6x
-usr/share/man/man6/maze.6x
-usr/share/man/man6/memscroller.6x
-usr/share/man/man6/moire.6x
-usr/share/man/man6/moire2.6x
-usr/share/man/man6/mountain.6x
-usr/share/man/man6/munch.6x
-usr/share/man/man6/nerverot.6x
-usr/share/man/man6/noseguy.6x
-usr/share/man/man6/pacman.6x
-usr/share/man/man6/pedal.6x
-usr/share/man/man6/penetrate.6x
-usr/share/man/man6/petri.6x
-usr/share/man/man6/phosphor.6x
-usr/share/man/man6/piecewise.6x
-usr/share/man/man6/polyominoes.6x
-usr/share/man/man6/pong.6x
-usr/share/man/man6/pyro.6x
-usr/share/man/man6/qix.6x
-usr/share/man/man6/rd-bomb.6x
-usr/share/man/man6/rocks.6x
-usr/share/man/man6/rorschach.6x
-usr/share/man/man6/rotzoomer.6x
-usr/share/man/man6/sierpinski.6x
-usr/share/man/man6/slip.6x
-usr/share/man/man6/speedmine.6x
-usr/share/man/man6/spotlight.6x
-usr/share/man/man6/squiral.6x
-usr/share/man/man6/starfish.6x
-usr/share/man/man6/strange.6x
-usr/share/man/man6/substrate.6x
-usr/share/man/man6/thornbird.6x
-usr/share/man/man6/triangle.6x
-usr/share/man/man6/truchet.6x
-usr/share/man/man6/twang.6x
-usr/share/man/man6/vermiculate.6x
-usr/share/man/man6/vidwhacker.6x
-usr/share/man/man6/wander.6x
-usr/share/man/man6/webcollage.6x
-usr/share/man/man6/whirlwindwarp.6x
-usr/share/man/man6/wormhole.6x
-usr/share/man/man6/xanalogtv.6x
-usr/share/man/man6/xflame.6x
-usr/share/man/man6/xjack.6x
-usr/share/man/man6/xmatrix.6x
-usr/share/man/man6/xrayswarm.6x
-usr/share/man/man6/xspirograph.6x
-usr/share/man/man6/xsublim.6x
-usr/share/man/man6/zoom.6x
 usr/share/xscreensaver/config/README
-usr/share/xscreensaver/config/abstractile.xml
-usr/share/xscreensaver/config/anemone.xml
-usr/share/xscreensaver/config/anemotaxis.xml
-usr/share/xscreensaver/config/apollonian.xml
-usr/share/xscreensaver/config/apple2.xml
-usr/share/xscreensaver/config/attraction.xml
-usr/share/xscreensaver/config/barcode.xml
-usr/share/xscreensaver/config/blaster.xml
-usr/share/xscreensaver/config/blitspin.xml
-usr/share/xscreensaver/config/bouboule.xml
-usr/share/xscreensaver/config/boxfit.xml
-usr/share/xscreensaver/config/braid.xml
-usr/share/xscreensaver/config/bsod.xml
-usr/share/xscreensaver/config/bumps.xml
-usr/share/xscreensaver/config/ccurve.xml
-usr/share/xscreensaver/config/celtic.xml
-usr/share/xscreensaver/config/cloudlife.xml
-usr/share/xscreensaver/config/compass.xml
-usr/share/xscreensaver/config/coral.xml
-usr/share/xscreensaver/config/crystal.xml
-usr/share/xscreensaver/config/cwaves.xml
-usr/share/xscreensaver/config/cynosure.xml
-usr/share/xscreensaver/config/decayscreen.xml
-usr/share/xscreensaver/config/deluxe.xml
-usr/share/xscreensaver/config/demon.xml
-usr/share/xscreensaver/config/discrete.xml
-usr/share/xscreensaver/config/drift.xml
-usr/share/xscreensaver/config/epicycle.xml
-usr/share/xscreensaver/config/eruption.xml
-usr/share/xscreensaver/config/euler2d.xml
-usr/share/xscreensaver/config/fadeplot.xml
-usr/share/xscreensaver/config/fireworkx.xml
-usr/share/xscreensaver/config/flame.xml
-usr/share/xscreensaver/config/flow.xml
-usr/share/xscreensaver/config/fluidballs.xml
-usr/share/xscreensaver/config/fontglide.xml
-usr/share/xscreensaver/config/goop.xml
-usr/share/xscreensaver/config/grav.xml
-usr/share/xscreensaver/config/greynetic.xml
-usr/share/xscreensaver/config/halftone.xml
-usr/share/xscreensaver/config/halo.xml
-usr/share/xscreensaver/config/helix.xml
-usr/share/xscreensaver/config/hopalong.xml
-usr/share/xscreensaver/config/hyperball.xml
-usr/share/xscreensaver/config/hypercube.xml
-usr/share/xscreensaver/config/ifs.xml
-usr/share/xscreensaver/config/imsmap.xml
-usr/share/xscreensaver/config/interaggregate.xml
-usr/share/xscreensaver/config/interference.xml
-usr/share/xscreensaver/config/intermomentary.xml
-usr/share/xscreensaver/config/juggle.xml
-usr/share/xscreensaver/config/julia.xml
-usr/share/xscreensaver/config/kaleidescope.xml
-usr/share/xscreensaver/config/kumppa.xml
-usr/share/xscreensaver/config/lcdscrub.xml
-usr/share/xscreensaver/config/loop.xml
-usr/share/xscreensaver/config/m6502.xml
-usr/share/xscreensaver/config/maze.xml
-usr/share/xscreensaver/config/memscroller.xml
-usr/share/xscreensaver/config/moire.xml
-usr/share/xscreensaver/config/moire2.xml
-usr/share/xscreensaver/config/mountain.xml
-usr/share/xscreensaver/config/munch.xml
-usr/share/xscreensaver/config/nerverot.xml
-usr/share/xscreensaver/config/noseguy.xml
-usr/share/xscreensaver/config/pacman.xml
-usr/share/xscreensaver/config/pedal.xml
-usr/share/xscreensaver/config/penetrate.xml
-usr/share/xscreensaver/config/petri.xml
-usr/share/xscreensaver/config/phosphor.xml
-usr/share/xscreensaver/config/piecewise.xml
-usr/share/xscreensaver/config/polyominoes.xml
-usr/share/xscreensaver/config/pong.xml
-usr/share/xscreensaver/config/pyro.xml
-usr/share/xscreensaver/config/qix.xml
-usr/share/xscreensaver/config/rd-bomb.xml
-usr/share/xscreensaver/config/rocks.xml
-usr/share/xscreensaver/config/rorschach.xml
-usr/share/xscreensaver/config/rotzoomer.xml
-usr/share/xscreensaver/config/sierpinski.xml
-usr/share/xscreensaver/config/slip.xml
-usr/share/xscreensaver/config/speedmine.xml
-usr/share/xscreensaver/config/spotlight.xml
-usr/share/xscreensaver/config/squiral.xml
-usr/share/xscreensaver/config/starfish.xml
-usr/share/xscreensaver/config/strange.xml
-usr/share/xscreensaver/config/substrate.xml
-usr/share/xscreensaver/config/thornbird.xml
-usr/share/xscreensaver/config/triangle.xml
-usr/share/xscreensaver/config/truchet.xml
-usr/share/xscreensaver/config/twang.xml
-usr/share/xscreensaver/config/vermiculate.xml
-usr/share/xscreensaver/config/vidwhacker.xml
-usr/share/xscreensaver/config/wander.xml
-usr/share/xscreensaver/config/webcollage.xml
-usr/share/xscreensaver/config/whirlwindwarp.xml
-usr/share/xscreensaver/config/wormhole.xml
-usr/share/xscreensaver/config/xanalogtv.xml
-usr/share/xscreensaver/config/xflame.xml
-usr/share/xscreensaver/config/xjack.xml
-usr/share/xscreensaver/config/xmatrix.xml
-usr/share/xscreensaver/config/xrayswarm.xml
-usr/share/xscreensaver/config/xspirograph.xml
-usr/share/xscreensaver/config/zoom.xml
-usr/share/applications/screensavers/abstractile.desktop
-usr/share/applications/screensavers/anemone.desktop
-usr/share/applications/screensavers/anemotaxis.desktop
-usr/share/applications/screensavers/apollonian.desktop
-usr/share/applications/screensavers/apple2.desktop
-usr/share/applications/screensavers/attraction.desktop
-usr/share/applications/screensavers/barcode.desktop
-usr/share/applications/screensavers/blaster.desktop
-usr/share/applications/screensavers/blitspin.desktop
-usr/share/applications/screensavers/bouboule.desktop
-usr/share/applications/screensavers/boxfit.desktop
-usr/share/applications/screensavers/braid.desktop
-usr/share/applications/screensavers/bsod.desktop
-usr/share/applications/screensavers/bumps.desktop
-usr/share/applications/screensavers/ccurve.desktop
-usr/share/applications/screensavers/celtic.desktop
-usr/share/applications/screensavers/cloudlife.desktop
-usr/share/applications/screensavers/compass.desktop
-usr/share/applications/screensavers/coral.desktop
-usr/share/applications/screensavers/crystal.desktop
-usr/share/applications/screensavers/cwaves.desktop
-usr/share/applications/screensavers/cynosure.desktop
-usr/share/applications/screensavers/decayscreen.desktop
-usr/share/applications/screensavers/deluxe.desktop
-usr/share/applications/screensavers/demon.desktop
-usr/share/applications/screensavers/discrete.desktop
-usr/share/applications/screensavers/drift.desktop
-usr/share/applications/screensavers/epicycle.desktop
-usr/share/applications/screensavers/eruption.desktop
-usr/share/applications/screensavers/euler2d.desktop
-usr/share/applications/screensavers/fadeplot.desktop
-usr/share/applications/screensavers/fireworkx.desktop
-usr/share/applications/screensavers/flame.desktop
-usr/share/applications/screensavers/flow.desktop
-usr/share/applications/screensavers/fluidballs.desktop
-usr/share/applications/screensavers/fontglide.desktop
-usr/share/applications/screensavers/goop.desktop
-usr/share/applications/screensavers/grav.desktop
-usr/share/applications/screensavers/greynetic.desktop
-usr/share/applications/screensavers/halftone.desktop
-usr/share/applications/screensavers/halo.desktop
-usr/share/applications/screensavers/helix.desktop
-usr/share/applications/screensavers/hopalong.desktop
-usr/share/applications/screensavers/hyperball.desktop
-usr/share/applications/screensavers/hypercube.desktop
-usr/share/applications/screensavers/ifs.desktop
-usr/share/applications/screensavers/imsmap.desktop
-usr/share/applications/screensavers/interaggregate.desktop
-usr/share/applications/screensavers/interference.desktop
-usr/share/applications/screensavers/intermomentary.desktop
-usr/share/applications/screensavers/juggle.desktop
-usr/share/applications/screensavers/julia.desktop
-usr/share/applications/screensavers/kaleidescope.desktop
-usr/share/applications/screensavers/kumppa.desktop
-usr/share/applications/screensavers/lcdscrub.desktop
-usr/share/applications/screensavers/loop.desktop
-usr/share/applications/screensavers/m6502.desktop
-usr/share/applications/screensavers/maze.desktop
-usr/share/applications/screensavers/memscroller.desktop
-usr/share/applications/screensavers/moire.desktop
-usr/share/applications/screensavers/moire2.desktop
-usr/share/applications/screensavers/mountain.desktop
-usr/share/applications/screensavers/munch.desktop
-usr/share/applications/screensavers/nerverot.desktop
-usr/share/applications/screensavers/noseguy.desktop
-usr/share/applications/screensavers/pacman.desktop
-usr/share/applications/screensavers/pedal.desktop
-usr/share/applications/screensavers/penetrate.desktop
-usr/share/applications/screensavers/petri.desktop
-usr/share/applications/screensavers/phosphor.desktop
-usr/share/applications/screensavers/piecewise.desktop
-usr/share/applications/screensavers/polyominoes.desktop
-usr/share/applications/screensavers/pong.desktop
-usr/share/applications/screensavers/pyro.desktop
-usr/share/applications/screensavers/qix.desktop
-usr/share/applications/screensavers/rd-bomb.desktop
-usr/share/applications/screensavers/rocks.desktop
-usr/share/applications/screensavers/rorschach.desktop
-usr/share/applications/screensavers/rotzoomer.desktop
-usr/share/applications/screensavers/sierpinski.desktop
-usr/share/applications/screensavers/slip.desktop
-usr/share/applications/screensavers/speedmine.desktop
-usr/share/applications/screensavers/spotlight.desktop
-usr/share/applications/screensavers/squiral.desktop
-usr/share/applications/screensavers/starfish.desktop
-usr/share/applications/screensavers/strange.desktop
-usr/share/applications/screensavers/substrate.desktop
-usr/share/applications/screensavers/thornbird.desktop
-usr/share/applications/screensavers/triangle.desktop
-usr/share/applications/screensavers/truchet.desktop
-usr/share/applications/screensavers/twang.desktop
-usr/share/applications/screensavers/vermiculate.desktop
-usr/share/applications/screensavers/vidwhacker.desktop
-usr/share/applications/screensavers/wander.desktop
-usr/share/applications/screensavers/webcollage.desktop
-usr/share/applications/screensavers/whirlwindwarp.desktop
-usr/share/applications/screensavers/wormhole.desktop
-usr/share/applications/screensavers/xanalogtv.desktop
-usr/share/applications/screensavers/xflame.desktop
-usr/share/applications/screensavers/xjack.desktop
-usr/share/applications/screensavers/xmatrix.desktop
-usr/share/applications/screensavers/xrayswarm.desktop
-usr/share/applications/screensavers/xspirograph.desktop
-usr/share/applications/screensavers/zoom.desktop
only in patch2:
unchanged:
--- xscreensaver-5.08.orig/debian/gl
+++ xscreensaver-5.08/debian/gl
@@ -0,0 +1,8 @@
+antspotlight
+glblur
+glcells
+glmatrix
+glschool
+glslideshow
+gltext
+hypertorus
only in patch2:
unchanged:
--- xscreensaver-5.08.orig/debian/data-extra
+++ xscreensaver-5.08/debian/data-extra
@@ -0,0 +1,118 @@
+abstractile
+cwaves
+deco
+distort
+galaxy
+m6502
+metaballs
+penrose
+popsquares
+ripples
+shadebobs
+slidescreen
+sonar
+swirl
+xlyap
+anemone
+anemotaxis
+apollonian
+apple2
+attraction
+barcode
+blaster
+blitspin
+bouboule
+boxfit
+braid
+bsod
+bumps
+ccurve
+celtic
+cloudlife
+compass
+coral
+crystal
+cynosure
+decayscreen
+deluxe
+demon
+discrete
+drift
+epicycle
+eruption
+euler2d
+fadeplot
+fireworkx
+flame
+flow
+fluidballs
+fontglide
+goop
+grav
+greynetic
+halftone
+halo
+helix
+hopalong
+hyperball
+hypercube
+ifs
+imsmap
+interaggregate
+interference
+intermomentary
+juggle
+julia
+kaleidescope
+kumppa
+lcdscrub
+ljlatest
+loop
+maze
+memscroller
+moire
+moire2
+mountain
+munch
+nerverot
+noseguy
+pacman
+pedal
+penetrate
+petri
+phosphor
+piecewise
+polyominoes
+pong
+pyro
+qix
+rd-bomb
+rocks
+rorschach
+rotzoomer
+sierpinski
+slip
+speedmine
+spotlight
+squiral
+starfish
+strange
+substrate
+thornbird
+triangle
+truchet
+twang
+vermiculate
+vidwhacker
+wander
+webcollage
+webcollage-helper
+whirlwindwarp
+wormhole
+xanalogtv
+xflame
+xjack
+xmatrix
+xrayswarm
+xspirograph
+zoom
only in patch2:
unchanged:
--- xscreensaver-5.08.orig/debian/install-hacks.sh
+++ xscreensaver-5.08/debian/install-hacks.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+DATA_FILES=$(cat debian/data)
+DATA_EXTRA_FILES=$(cat debian/data-extra)
+GL_FILES=$(cat debian/gl)
+GL_EXTRA_FILES=$(cat debian/gl-extra)
+
+move_files ()
+{
+    for hacks in $*; do \
+      dh_install debian/tmp/usr/lib/xscreensaver/$hacks \
+        -p$PACKAGE
+      dh_install debian/tmp/usr/share/man/man6/$hacks.6x \
+        -p$PACKAGE
+      dh_install debian/tmp/usr/share/xscreensaver/config/$hacks.xml \
+        -p$PACKAGE
+      dh_install debian/tmp/usr/share/applications/screensavers/$hacks.desktop \
+        -p$PACKAGE
+    done
+}
+
+PACKAGE="xscreensaver-data"
+move_files $DATA_FILES
+
+PACKAGE="xscreensaver-data-extra"
+move_files $DATA_EXTRA_FILES
+
+PACKAGE="xscreensaver-gl"
+move_files $GL_FILES
+
+PACKAGE="xscreensaver-gl-extra"
+move_files $GL_EXTRA_FILES
only in patch2:
unchanged:
--- xscreensaver-5.08.orig/debian/gl-extra
+++ xscreensaver-5.08/debian/gl-extra
@@ -0,0 +1,71 @@
+antinspect
+atunnel
+blinkbox
+bubble3d
+circuit
+cubestorm
+endgame
+engine
+flipflop
+flipscreen3d
+flyingtoasters
+gears
+gflux
+gleidescopev
+glknots
+glsnake
+jigglypuff
+lavalite
+lockward
+mirrorblob
+moebius
+moebiusgears
+molecule
+morph3d
+pipes
+polyhedra
+polytopes
+pulsar
+queens
+sierpinski3d
+spheremonics
+stonerview
+superquadrics
+topblock
+voronoi
+antmaze
+atlantis
+blocktube
+boing
+bouncingcow
+boxed
+cage
+carousel
+crackberg
+cube21
+cubenetic
+dangerball
+extrusion
+fliptext
+glhanoi
+glplanet
+juggler3d
+klein
+lament
+menger
+noof
+photopile
+pinion
+providence
+rubik
+sballs
+sproingies
+stairs
+starwars
+tangram
+timetunnel
+cubicgrid
+hypnowheel
+skytentacles
+jigsaw
+flurry
only in patch2:
unchanged:
--- xscreensaver-5.08.orig/debian/data
+++ xscreensaver-5.08/debian/data
@@ -0,0 +1,2 @@
+fiberlamp
+fuzzyflakes