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

3 files changed, 42 insertions, 12 deletions

diff --git a/debian/lenny/tdebase/debian/tdebase-data-trinity.install b/debian/lenny/tdebase/debian/tdebase-data-trinity.install
index a6e7cb9ba..740f0b2ce 100644
--- a/debian/lenny/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/lenny/tdebase/debian/tdebase-data-trinity.install
@@ -1181,22 +1181,24 @@ 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/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/konqui.svgz
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
 debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
@@ -1213,12 +1215,20 @@ 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
diff --git a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
index a6e7cb9ba..740f0b2ce 100644
--- a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install
@@ -1181,22 +1181,24 @@ 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/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/konqui.svgz
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
 debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
@@ -1213,12 +1215,20 @@ 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
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
index a6e7cb9ba..740f0b2ce 100644
--- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install
@@ -1181,22 +1181,24 @@ 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/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/konqui.svgz
 debian/tmp/opt/trinity/share/wallpapers/konqui.svgz.desktop
 debian/tmp/opt/trinity/share/wallpapers/lineart.svgz
@@ -1213,12 +1215,20 @@ 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