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

2 files changed, 30 insertions, 25 deletions

diff --git a/debian/lenny/tdegraphics/debian/kamera-trinity.install b/debian/lenny/tdegraphics/debian/kamera-trinity.install
index 27e578bbe..f1ba0c99b 100644
--- a/debian/lenny/tdegraphics/debian/kamera-trinity.install
+++ b/debian/lenny/tdegraphics/debian/kamera-trinity.install
@@ -9,10 +9,10 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kamera/index.docbook
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/tdeioslave/camera
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/camera_test.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/camera.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/camera.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/camera.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/camera.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/camera.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/camera.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/camera-photo.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/camera-photo.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/camera-photo.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/places/camera-photo.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/camera-photo.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/places/camera-photo.png
 debian/tmp/opt/trinity/share/services/camera.protocol
diff --git a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
index c69d5700b..cd9ef92e5 100644
--- a/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
@@ -2097,7 +2097,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/filesave.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/fill.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/filter.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/find.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/finish.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/go-last.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/flag.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/folder_new.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/fontsizedown.png
@@ -2177,7 +2177,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/music_quarternote.pn
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/music_sixteenthnote.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/news_subscribe.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/news_unsubscribe.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/next.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/go-next.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/no.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/ok.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/openterm.png
@@ -2198,7 +2198,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/presence_away.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/presence_offline.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/presence_online.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/presence_unknown.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/previous.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/go-previous.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/project_open.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/queue.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/rebuild.png
@@ -2219,7 +2219,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/show_side_panel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/signature.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/spellcheck.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/stamp.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/start.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/go-first.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/stop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/switchuser.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/actions/tab_breakoff.png
@@ -2335,7 +2335,8 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/hdd_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/hdd_unmount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/ipod_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/ipod_unmount.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/joystick.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/input-joystick.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/input-gaming.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/memory.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/memory_stick_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/devices/memory_stick_unmount.png
@@ -2564,7 +2565,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/filesave.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/fill.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/filter.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/find.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/finish.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/go-last.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/folder_new.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/folder.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/fontsizedown.png
@@ -2642,7 +2643,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/music_quarternote.pn
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/music_sixteenthnote.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/news_subscribe.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/news_unsubscribe.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/next.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/go-next.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/openterm.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/paintbrush.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/pencil.png
@@ -2655,7 +2656,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/player_play.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/player_rew.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/player_start.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/player_stop.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/previous.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/go-previous.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/project_open.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/queue.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/rebuild.png
@@ -2677,7 +2678,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/showmenu.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/show_side_panel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/signature.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/spellcheck.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/start.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/go-first.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/stop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/switchuser.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/actions/text_block.png
@@ -2767,7 +2768,8 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/hdd_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/hdd_unmount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/ipod_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/ipod_unmount.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/joystick.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/input-joystick.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/input-gaming.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/memory_stick_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/memory_stick_unmount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/devices/modem.png
@@ -2943,7 +2945,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/filesaveas.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/filesave.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/filter.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/find.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/finish.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/go-last.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/folder_new.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/fonts.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/forward.png
@@ -3006,7 +3008,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/music_halfnote.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/music_natur.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/music_quarternote.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/music_sixteenthnote.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/next.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/go-next.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/openterm.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/player_eject.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/player_end.png
@@ -3021,7 +3023,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/presence_away.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/presence_offline.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/presence_online.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/presence_unknown.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/previous.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/go-previous.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/project_open.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/queue.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/rebuild.png
@@ -3041,7 +3043,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/share.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/show_side_panel.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/signature.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/spellcheck.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/start.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/go-first.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/stop.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/switchuser.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/actions/text_block.png
@@ -3147,7 +3149,8 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/hdd_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/hdd_unmount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/ipod_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/ipod_unmount.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/joystick.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/input-joystick.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/input-gaming.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/memory.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/memory_stick_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/devices/memory_stick_unmount.png
@@ -3328,12 +3331,12 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/lock.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/mail_new.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/mail_post_to.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/misc.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/next.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/go-next.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/player_playlist.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/presence_away.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/presence_offline.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/presence_online.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/previous.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/go-previous.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/reload_all_tabs.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/reload_page.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/actions/reload.png
@@ -3401,7 +3404,8 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/hdd_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/hdd_unmount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/ipod_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/ipod_unmount.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/joystick.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/input-joystick.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/input-gaming.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/memory.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/memory_stick_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/devices/memory_stick_unmount.png
@@ -3611,7 +3615,8 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/hdd_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/hdd_unmount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/ipod_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/ipod_unmount.png
-debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/joystick.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/input-joystick.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/input-gaming.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/memory.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/memory_stick_mount.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/devices/memory_stick_unmount.png