merge

6 files changed, 6 insertions, 211 deletions

diff --git a/debian/lenny/tdebase/debian/tdebase-data-trinity.install b/debian/lenny/tdebase/debian/tdebase-data-trinity.install
index 352f8c4b4..8832c70f4 100644
--- a/debian/lenny/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/lenny/tdebase/debian/tdebase-data-trinity.install
@@ -1163,73 +1163,4 @@ debian/tmp/opt/trinity/share/sounds/KDE_Window_UnHide.ogg
 debian/tmp/opt/trinity/share/sounds/KDE_Window_UnMaximize.wav
 debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.ogg
 debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.wav
-debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg
-debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/aghi.jpg
-debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/airplane.jpg
-debian/tmp/opt/trinity/share/wallpapers/airplane.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg
-debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz
-debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/another-view.jpg
-debian/tmp/opt/trinity/share/wallpapers/another-view.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/aurora.svgz
-debian/tmp/opt/trinity/share/wallpapers/aurora.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg
-debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/celtic.svgz
-debian/tmp/opt/trinity/share/wallpapers/celtic.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/Chicken-Songs-2.jpg
-debian/tmp/opt/trinity/share/wallpapers/Chicken-Songs-2.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/default_blue.jpg
-debian/tmp/opt/trinity/share/wallpapers/default_blue.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/default_gears.jpg
-debian/tmp/opt/trinity/share/wallpapers/default_gears.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/floating-leaves.jpg
-debian/tmp/opt/trinity/share/wallpapers/floating-leaves.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/green_curtain.jpg
-debian/tmp/opt/trinity/share/wallpapers/green_curtain.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/globe.svgz
-debian/tmp/opt/trinity/share/wallpapers/globe.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/here-gear.svgz
-debian/tmp/opt/trinity/share/wallpapers/here-gear.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png
-debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png.desktop
-debian/tmp/opt/trinity/share/wallpapers/isadora.png
-debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop
-debian/tmp/opt/trinity/share/wallpapers/konqui.svgz
-debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
-debian/tmp/opt/trinity/share/wallpapers/lineart.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/moon.svgz
-debian/tmp/opt/trinity/share/wallpapers/moon.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg
-debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg
-debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/seaofconero.jpg
-debian/tmp/opt/trinity/share/wallpapers/seaofconero.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/soft-green.jpg
-debian/tmp/opt/trinity/share/wallpapers/soft-green.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/stelvio.jpg
-debian/tmp/opt/trinity/share/wallpapers/stelvio.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/stripes.jpg
-debian/tmp/opt/trinity/share/wallpapers/stripes.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/sunshine-after-the-rain.jpg
-debian/tmp/opt/trinity/share/wallpapers/sunshine-after-the-rain.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg
-debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg
-debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
-debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
-debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg
-debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg.desktop
-debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg
-debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg
-debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/world-desktop.jpg
-debian/tmp/opt/trinity/share/wallpapers/world-desktop.jpg.desktop
+debian/tmp/opt/trinity/share/wallpapers
diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control
index 8d9a4b0cd..e5a3ec6ce 100644
--- a/debian/lenny/tdelibs/debian/control
+++ b/debian/lenny/tdelibs/debian/control
@@ -43,6 +43,7 @@ Section: libs
 Architecture: all
 Replaces: kdelibs-data-trinity (<< 4:14.0.0~)
 Breaks: kdelibs-data-trinity (<< 4:14.0.0~)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:3.5.13.2)
 Depends: hicolor-icon-theme
 Provides: tdelibs-data
 Description: core shared data for all TDE applications
diff --git a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
index 352f8c4b4..8832c70f4 100644
--- a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
@@ -1163,73 +1163,4 @@ debian/tmp/opt/trinity/share/sounds/KDE_Window_UnHide.ogg
 debian/tmp/opt/trinity/share/sounds/KDE_Window_UnMaximize.wav
 debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.ogg
 debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.wav
-debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg
-debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/aghi.jpg
-debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/airplane.jpg
-debian/tmp/opt/trinity/share/wallpapers/airplane.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg
-debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz
-debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/another-view.jpg
-debian/tmp/opt/trinity/share/wallpapers/another-view.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/aurora.svgz
-debian/tmp/opt/trinity/share/wallpapers/aurora.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg
-debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/celtic.svgz
-debian/tmp/opt/trinity/share/wallpapers/celtic.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/Chicken-Songs-2.jpg
-debian/tmp/opt/trinity/share/wallpapers/Chicken-Songs-2.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/default_blue.jpg
-debian/tmp/opt/trinity/share/wallpapers/default_blue.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/default_gears.jpg
-debian/tmp/opt/trinity/share/wallpapers/default_gears.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/floating-leaves.jpg
-debian/tmp/opt/trinity/share/wallpapers/floating-leaves.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/green_curtain.jpg
-debian/tmp/opt/trinity/share/wallpapers/green_curtain.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/globe.svgz
-debian/tmp/opt/trinity/share/wallpapers/globe.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/here-gear.svgz
-debian/tmp/opt/trinity/share/wallpapers/here-gear.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png
-debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png.desktop
-debian/tmp/opt/trinity/share/wallpapers/isadora.png
-debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop
-debian/tmp/opt/trinity/share/wallpapers/konqui.svgz
-debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
-debian/tmp/opt/trinity/share/wallpapers/lineart.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/moon.svgz
-debian/tmp/opt/trinity/share/wallpapers/moon.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg
-debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg
-debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/seaofconero.jpg
-debian/tmp/opt/trinity/share/wallpapers/seaofconero.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/soft-green.jpg
-debian/tmp/opt/trinity/share/wallpapers/soft-green.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/stelvio.jpg
-debian/tmp/opt/trinity/share/wallpapers/stelvio.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/stripes.jpg
-debian/tmp/opt/trinity/share/wallpapers/stripes.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/sunshine-after-the-rain.jpg
-debian/tmp/opt/trinity/share/wallpapers/sunshine-after-the-rain.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg
-debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg
-debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
-debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
-debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg
-debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg.desktop
-debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg
-debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg
-debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/world-desktop.jpg
-debian/tmp/opt/trinity/share/wallpapers/world-desktop.jpg.desktop
+debian/tmp/opt/trinity/share/wallpapers
diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control
index 8d9a4b0cd..e5a3ec6ce 100644
--- a/debian/squeeze/tdelibs/debian/control
+++ b/debian/squeeze/tdelibs/debian/control
@@ -43,6 +43,7 @@ Section: libs
 Architecture: all
 Replaces: kdelibs-data-trinity (<< 4:14.0.0~)
 Breaks: kdelibs-data-trinity (<< 4:14.0.0~)
+Conflicts: kdebase-kio-plugins-trinity (<= 4:3.5.13.2)
 Depends: hicolor-icon-theme
 Provides: tdelibs-data
 Description: core shared data for all TDE applications
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index 352f8c4b4..8832c70f4 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -1163,73 +1163,4 @@ debian/tmp/opt/trinity/share/sounds/KDE_Window_UnHide.ogg
 debian/tmp/opt/trinity/share/sounds/KDE_Window_UnMaximize.wav
 debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.ogg
 debian/tmp/opt/trinity/share/sounds/KDE_Window_UnSticky.wav
-debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg
-debian/tmp/opt/trinity/share/wallpapers/All-Good-People-1.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/aghi.jpg
-debian/tmp/opt/trinity/share/wallpapers/aghi.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/airplane.jpg
-debian/tmp/opt/trinity/share/wallpapers/airplane.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg
-debian/tmp/opt/trinity/share/wallpapers/alta-badia.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz
-debian/tmp/opt/trinity/share/wallpapers/andes-venezolanos.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/another-view.jpg
-debian/tmp/opt/trinity/share/wallpapers/another-view.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/aurora.svgz
-debian/tmp/opt/trinity/share/wallpapers/aurora.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg
-debian/tmp/opt/trinity/share/wallpapers/blue-bend.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/celtic.svgz
-debian/tmp/opt/trinity/share/wallpapers/celtic.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/Chicken-Songs-2.jpg
-debian/tmp/opt/trinity/share/wallpapers/Chicken-Songs-2.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/default_blue.jpg
-debian/tmp/opt/trinity/share/wallpapers/default_blue.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/default_gears.jpg
-debian/tmp/opt/trinity/share/wallpapers/default_gears.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/floating-leaves.jpg
-debian/tmp/opt/trinity/share/wallpapers/floating-leaves.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/green_curtain.jpg
-debian/tmp/opt/trinity/share/wallpapers/green_curtain.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/globe.svgz
-debian/tmp/opt/trinity/share/wallpapers/globe.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/here-gear.svgz
-debian/tmp/opt/trinity/share/wallpapers/here-gear.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png
-debian/tmp/opt/trinity/share/wallpapers/horse-head-nebula.png.desktop
-debian/tmp/opt/trinity/share/wallpapers/isadora.png
-debian/tmp/opt/trinity/share/wallpapers/isadora.png.desktop
-debian/tmp/opt/trinity/share/wallpapers/konqui.svgz
-debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
-debian/tmp/opt/trinity/share/wallpapers/lineart.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/moon.svgz
-debian/tmp/opt/trinity/share/wallpapers/moon.svgz.desktop
-debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg
-debian/tmp/opt/trinity/share/wallpapers/mountain-lake.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg
-debian/tmp/opt/trinity/share/wallpapers/No-Ones-Laughing-3.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/seaofconero.jpg
-debian/tmp/opt/trinity/share/wallpapers/seaofconero.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/soft-green.jpg
-debian/tmp/opt/trinity/share/wallpapers/soft-green.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/stelvio.jpg
-debian/tmp/opt/trinity/share/wallpapers/stelvio.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/stripes.jpg
-debian/tmp/opt/trinity/share/wallpapers/stripes.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/sunshine-after-the-rain.jpg
-debian/tmp/opt/trinity/share/wallpapers/sunshine-after-the-rain.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg
-debian/tmp/opt/trinity/share/wallpapers/Time-For-Lunch-2.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg
-debian/tmp/opt/trinity/share/wallpapers/Totally-New-Product-1.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/Trinity4.png
-debian/tmp/opt/trinity/share/wallpapers/Trinity4.png.desktop
-debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg
-debian/tmp/opt/trinity/share/wallpapers/Trinity-lineart.svg.desktop
-debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg
-debian/tmp/opt/trinity/share/wallpapers/triplegears.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg
-debian/tmp/opt/trinity/share/wallpapers/Won-Ton-Soup-3.jpg.desktop
-debian/tmp/opt/trinity/share/wallpapers/world-desktop.jpg
-debian/tmp/opt/trinity/share/wallpapers/world-desktop.jpg.desktop
+debian/tmp/opt/trinity/share/wallpapers
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index 182174583..85867e617 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -44,9 +44,9 @@ Section: libs
 Architecture: all
 Replaces: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~)
 Breaks: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~)
+Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:3.5.13.2), kdebase-kio-plugins-trinity (<= 4:3.5.13.2)
 Depends: hicolor-icon-theme
 Provides: tdelibs-data
-Conflicts: tdelibs-data
 Description: core shared data for all TDE applications
  This package contains all the architecture independent data files
  commonly used by TDE applications. You need these data files to run