Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

4 files changed, 10 insertions, 154 deletions

diff --git a/debian/lenny/kdeartwork/debian/control b/debian/lenny/kdeartwork/debian/control
index d9dbe942d..76adf5192 100644
--- a/debian/lenny/kdeartwork/debian/control
+++ b/debian/lenny/kdeartwork/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-trinity-dev, gawk, gettext, sharutils, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-trinity-dev, gawk, gettext, sharutils, kdebase-trinity-dev, kwin-trinity, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, xscreensaver, xscreensaver-gl, xscreensaver-data, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies, automake, autoconf, libtool, libltdl-dev
 Build-Conflicts: autoconf2.13, nvidia-glx
 Standards-Version: 3.8.4
 
@@ -162,7 +162,7 @@ Description: webcollage screensaver KDE3 hook
 Package: kscreensaver-xsavers-extra-trinity
 Architecture: all
 Section: kde
-Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra
+Depends: ${shlibs:Depends}, kscreensaver-xsavers-trinity, xscreensaver-data-extra, xscreensaver-gl-extra, rss-glx, fireflies
 Recommends: kwin-trinity, kscreensaver-trinity (= ${Source-Version})
 Description: KDE3 hooks for standard xscreensavers
  This package allows a smooth integration of the universe xscreensavers
diff --git a/debian/lenny/kdeartwork/debian/kscreensaver-xsavers-extra-trinity.install b/debian/lenny/kdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
index 5111c9cd6..a3a14e04c 100644
--- a/debian/lenny/kdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
+++ b/debian/lenny/kdeartwork/debian/kscreensaver-xsavers-extra-trinity.install
@@ -1,149 +1 @@
-kscreensaver/kxsconfig/ScreenSavers/anemone.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/antmaze.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/apollonian.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/apple2.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/atlantis.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/attraction.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/barcode.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/blaster.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/blitspin.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/blocktube.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/boing.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/bouboule.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/boxed.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/boxfit.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/bsod.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/bubbles.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/bumps.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/cage.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/carousel.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/ccurve.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/celtic.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/cloudlife.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/compass.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/coral.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/crackberg.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/critical.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/crystal.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/cube21.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/cubenetic.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/cynosure.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/dangerball.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/decayscreen.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/deluxe.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/demon.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/discrete.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/drift.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/epicycle.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/eruption.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/euler2d.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/extrusion.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/fadeplot.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/fireworkx.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/flag.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/flame.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/fliptext.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/flow.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/fluidballs.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/fontglide.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/forest.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/glforestfire.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/glhanoi.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/goop.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/grav.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/greynetic.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/halftone.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/halo.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/helix.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/hopalong.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/hyperball.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/hypercube.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/ifs.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/imsmap.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/interaggregate.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/interference.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/intermomentary.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/jigsaw.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/juggle.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/juggler3d.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/julia.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/klein.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/kumppa.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/lament.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/laser.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/lightning.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/lisa.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/lissie.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/lmorph.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/loop.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/maze.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/memscroller.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/menger.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/mismunch.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/moire2.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/moire.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/mountain.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/munch.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/nerverot.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/noof.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/noseguy.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/pacman.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/pedal.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/penetrate.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/petri.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/phosphor.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/piecewise.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/pinion.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/polyominoes.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/pong.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/providence.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/pyro.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/qix.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/rocks.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/rorschach.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/rotor.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/rubik.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/sballs.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/sierpinski.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/slip.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/speedmine.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/sphere.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/spiral.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/spotlight.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/sproingies.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/squiral.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/stairs.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/starfish.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/starwars.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/strange.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/substrate.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/t3d.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/tangram.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/thornbird.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/timetunnel.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/triangle.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/truchet.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/twang.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/vermiculate.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/vines.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/wander.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/whirlygig.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/worm.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/wormhole.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/xflame.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/xjack.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/xmatrix.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/xspirograph.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/xsublim.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/xteevee.desktop usr/share/applnk/System/ScreenSavers/
-kscreensaver/kxsconfig/ScreenSavers/zoom.desktop usr/share/applnk/System/ScreenSavers/
+kscreensaver/kxsconfig/ScreenSavers/* usr/share/applnk/System/ScreenSavers/
\ No newline at end of file
diff --git a/debian/lenny/kdeartwork/debian/rules b/debian/lenny/kdeartwork/debian/rules
index b7fa88b8f..1a593022d 100755
--- a/debian/lenny/kdeartwork/debian/rules
+++ b/debian/lenny/kdeartwork/debian/rules
@@ -19,3 +19,7 @@ DEB_DH_STRIP_ARGS  := --dbg-package=kdeartwork-trinity-dbg
 clean::
 	rm -f IconThemes/kdeclassic/22x22/actions/kde/kde.png
 	rm -f IconThemes/kdeclassic/32x32/actions/kde/kde.png
+	cd kscreensaver/kxsconfig/ && ./update_hacks.sh
+
+binary-install/kscreensaver-xsavers-extra-trinity::
+	rm -f debian/kscreensaver-xsavers-extra-trinity/usr/share/applnk/System/ScreenSavers/webcollage.desktop
diff --git a/debian/lenny/libraries/python-trinity/debian/rules b/debian/lenny/libraries/python-trinity/debian/rules
index 5745a4451..19e69c601 100755
--- a/debian/lenny/libraries/python-trinity/debian/rules
+++ b/debian/lenny/libraries/python-trinity/debian/rules
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
 DEB_CONFIGURE_PREFIX := /opt/trinity
 DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -43,7 +43,7 @@ build-%/configure-stamp: patch-stamp
 	dh_testdir
 	mkdir -p build-$*
 	cd build-$* && python$* ../configure.py \
-		-c -u -k /opt/trinity -o /opt/trinity/include/kde -n /opt/trinity/lib \
+		-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
 		-v /opt/trinity/share/sip/trinity -j $(SPLIT)
 	touch $@
 
@@ -51,7 +51,7 @@ dbg-build-%/configure-stamp: patch-stamp
 	dh_testdir
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* && python$*-dbg ../configure.py \
-		-c -u -k /opt/trinity -o /opt/trinity/include/kde -n /opt/trinity/lib \
+		-c -u -k /opt/trinity -o /opt/trinity/include -n /opt/trinity/lib \
 		-v /opt/trinity/share/sip/trinity -j $(SPLIT)
 	touch $@