Branch: master

9d54bb35 2014-10-12 04:24:26 Michele Calgaro 
Fixed TQtAssistant images in Debian/Ubuntu. This relates to bug 1859.
M debian/lenny/dependencies/tqt3/debian/tqt3-assistant.install
M debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.install
M ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install
 
diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.install b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.install
index f393e40..fa79785 100644
--- a/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.install
+++ b/debian/lenny/dependencies/tqt3/debian/tqt3-assistant.install
@@ -1,3 +1,4 @@
 usr/bin/tqassistant
 usr/share/tqt3/doc/html/assistant*html
 usr/share/tqt3/doc/html/assistant*dcf
+usr/share/tqt3/doc/html/assistant*png
diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.install
index f393e40..fa79785 100644
--- a/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.install
+++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-assistant.install
@@ -1,3 +1,4 @@
 usr/bin/tqassistant
 usr/share/tqt3/doc/html/assistant*html
 usr/share/tqt3/doc/html/assistant*dcf
+usr/share/tqt3/doc/html/assistant*png
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install
index f393e40..fa79785 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install
+++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-assistant.install
@@ -1,3 +1,4 @@
 usr/bin/tqassistant
 usr/share/tqt3/doc/html/assistant*html
 usr/share/tqt3/doc/html/assistant*dcf
+usr/share/tqt3/doc/html/assistant*png
b72b2f09 2014-10-12 04:24:41 Michele Calgaro 
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
A openbsd/14.0.0/dependencies/dbus-1-tqt/distinfo
A openbsd/14.0.0/dependencies/dbus-tqt/distinfo
A openbsd/14.0.0/dependencies/libart-lgpl/Makefile
A openbsd/14.0.0/dependencies/libart-lgpl/distinfo
A openbsd/14.0.0/dependencies/libart-lgpl/pkg/DESCR
A openbsd/14.0.0/dependencies/libart-lgpl/pkg/PLIST
A openbsd/14.0.0/tdebase/Makefile
A openbsd/14.0.0/tdebase/distinfo
A openbsd/14.0.0/tdebase/pkg/DESCR-konsole
A openbsd/14.0.0/tdebase/pkg/DESCR-main
A openbsd/14.0.0/tdebase/pkg/DESCR-tdm
A openbsd/14.0.0/tdebase/pkg/DESCR.tdeio-pim-plugins
A openbsd/14.0.0/tdebase/pkg/PFRAG.shared-main
A openbsd/14.0.0/tdebase/pkg/PLIST-konsole
A openbsd/14.0.0/tdebase/pkg/PLIST-main
A openbsd/14.0.0/tdebase/pkg/PLIST-tdeio-pim-plugins
A openbsd/14.0.0/tdebase/pkg/PLIST-tdm
A openbsd/14.0.0/tdelibs/distinfo
A redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
A redhat/extras/trinity-filesystem/trinity-filesystem-3.5.13.2.spec
A redhat/tdebase/trinity-tdebase-rpmlintrc
M debian/lenny/tdegraphics/debian/kamera-trinity.install
M debian/lenny/tdelibs/debian/tdelibs-data-trinity.install
M debian/squeeze/tdegraphics/debian/kamera-trinity.install
M debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
M openbsd/14.0.0/dependencies/arts/Makefile
M openbsd/14.0.0/dependencies/arts/distinfo
M openbsd/14.0.0/dependencies/dbus-1-tqt/Makefile
M openbsd/14.0.0/dependencies/dbus-tqt/Makefile
M openbsd/14.0.0/dependencies/tqt3/Makefile
M openbsd/14.0.0/dependencies/tqt3/distinfo
M openbsd/14.0.0/dependencies/tqtinterface/Makefile
M openbsd/14.0.0/dependencies/tqtinterface/distinfo
M openbsd/14.0.0/trinity.port.mk
M redhat/Makefile.r14
M redhat/Makefile.v3.5.13-sru
M redhat/build/build_rpm_package.sh
M redhat/build/get_latest_built_package_filename.sh
M redhat/build/get_rpm_package_name.sh
M redhat/dependencies/arts/arts-14.0.0.spec
M redhat/dependencies/arts/arts-3.5.13.2.spec
M redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
M redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.2.spec
M redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
M redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
M redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
M redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
M redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
M redhat/dependencies/tqt3/tqt3-14.0.0.spec
M redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
M redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
M redhat/extras/brp-check-trinity/brp-check-trinity.spec
M redhat/extras/fileshareset/fileshareset.spec
M redhat/tdebase/tdebase-14.0.0.spec
M redhat/tdebase/tdebase-3.5.13.2.spec
M redhat/tdelibs/tdelibs-14.0.0.spec
M redhat/tdelibs/tdelibs-3.5.13.2.spec
M redhat/tdemultimedia/tdemultimedia-14.0.0.spec
M redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
M ubuntu/maverick/tdegraphics/debian/kamera-trinity.install
M ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
R redhat/dependencies/arts/arts-3.5.13.2-pkgconfig_requires.patch
R redhat/dependencies/tqtinterface/tqtinterface-3.5.12-qtinterface-makefile.patch
R redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec
R redhat/dependencies/tqtinterface/tqtinterface-3.5.13-add_missing_endianness_defines.patch
R redhat/dependencies/tqtinterface/tqtinterface-3.5.13.1.spec
R redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
R redhat/extras/trinity-filesystem/trinity-filesystem.spec
R redhat/tdebase/plasma-desktop
R redhat/tdemultimedia/kdemultimedia-3.4.0-xdg.patch
R redhat/tdemultimedia/kdemultimedia-3.5.12.spec
R redhat/tdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch
R redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
R redhat/tdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch
R redhat/tdemultimedia/kdemultimedia-3.5.13-fix_mmx_detection.patch
R redhat/tdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch
R redhat/tdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch
R redhat/tdemultimedia/kdemultimedia-3.5.13.1.spec
R redhat/tdemultimedia/kdemultimedia-3.5.13.2-fix_gstreamer_1.0.patch
R redhat/tdemultimedia/kdemultimedia-3.5.13.spec
R redhat/tdemultimedia/kdemultimedia-3.5.7-pthread.patch
R redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_pulseaudio_mixer.patch
R redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch
R redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch
R redhat/tdemultimedia/tdemultimedia-3.5.13.2-kmix_pulseaudio.patch
 
diff --git a/debian/lenny/tdegraphics/debian/kamera-trinity.install b/debian/lenny/tdegraphics/debian/kamera-trinity.install
index 27e578b..f1ba0c9 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.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 c69d570..cd9ef92 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/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_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_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/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_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/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_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_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/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_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/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_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_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/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_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/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_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_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
diff --git a/debian/squeeze/tdegraphics/debian/kamera-trinity.install b/debian/squeeze/tdegraphics/debian/kamera-trinity.install
index 27e578b..f1ba0c9 100644
--- a/debian/squeeze/tdegraphics/debian/kamera-trinity.install
+++ b/debian/squeeze/tdegraphics/debian/kamera-trinity.install
@@ -9,10 +9,10 @@
 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/squeeze/tdelibs/debian/tdelibs-data-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
index 21dafee..0b4c643 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
+++ b/debian/squeeze/tdelibs/debian/tdelibs-data-trinity.install
 ** Diff limit reached (max: 250 lines) **