Fix package conflicts from prior commit

(cherry picked from commit a4f9c37a2acdcb704a3a799c2230e8d8f858af27)

1 files changed, 69 insertions, 0 deletions

diff --git a/debian/lenny/tdeartwork/debian/rules b/debian/lenny/tdeartwork/debian/rules
index 272ae85ec..71a0ca38d 100755
--- a/debian/lenny/tdeartwork/debian/rules
+++ b/debian/lenny/tdeartwork/debian/rules
@@ -37,4 +37,73 @@ clean::
 	cd tdescreensaver/kxsconfig/ && ./update_hacks.sh
 
 binary-install/tdescreensaver-xsavers-extra-trinity::
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/antinspect.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/antspotlight.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/atunnel.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/blinkbox.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/braid.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/bubble3d.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/circuit.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/cubestorm.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/deco.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/distort.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/endgame.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/engine.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/fiberlamp.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/fireflies.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/flipflop.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/flipscreen3d.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/flyingtoasters.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/fuzzyflakes.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/galaxy.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/gears.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/gflux.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/glblur.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/gleidescope.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/glknots.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/glmatrix.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/glslideshow.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/glsnake.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/gltext.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/hypertorus.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/jigglypuff.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/lavalite.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/metaballs.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/mirrorblob.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/moebius.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/molecule.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/morph3d.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/penrose.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/pipes.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/polyhedra.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/polytopes.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/popsquares.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/pulsar.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/queens.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/ripples.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/shadebobs.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/sierpinski3d.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/slidescreen.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/sonar.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/spheremonics.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/stonerview.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/superquadrics.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/swirl.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/xlyap.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/m6502.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/glschool.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/moebiusgears.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/glcells.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/abstractile.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/lockward.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/cwaves.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/topblock.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/voronoi.desktop
+
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/cubicgrid.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/hypnowheel.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/lcdscrub.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/photopile.desktop
+	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/skytentacles.desktop
+
 	rm -f debian/tdescreensaver-xsavers-extra-trinity/opt/trinity/share/applnk/System/ScreenSavers/webcollage.desktop