RPM Packaging: update tdelibs, tdebase

diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index c8e6f1a..95d57df 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -227,7 +227,7 @@
 
 # OpenSuse 11.4 Theme
 %if "%{?suse_version}" == "1140"
-Requires:	hicolor-icon-theme-branding
+Requires:	hicolor-icon-theme-branding = 11.4
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
@@ -235,7 +235,7 @@
 %if "%{?suse_version}" == "1220"
 Requires:	wallpaper-branding
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
+Requires:	hicolor-icon-theme-branding = 12.2
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
@@ -243,7 +243,7 @@
 %if "%{?suse_version}" == "1230"
 Requires:	wallpaper-branding
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
+Requires:	hicolor-icon-theme-branding = 12.3
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
@@ -251,7 +251,7 @@
 %if "%{?suse_version}" == "1310"
 Requires:	wallpaper-branding
 %define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
-Requires:	hicolor-icon-theme-branding
+Requires:	hicolor-icon-theme-branding = 13.1
 %define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
 %endif
 
@@ -3127,7 +3127,7 @@
 ##########
 
 %package -n trinity-ktip
-Summary:	useful tips for TDE
+Summary:	Useful tips for TDE
 Group:		Applications/Utilities
 Requires:	%{name}-data = %{version}-%{release}
 
@@ -3673,7 +3673,7 @@
 for i in {16,22};              do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/history.png             hicolor/"$i"x"$i"/apps/kcmhistory.png           ;done
 for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/places/network.png              hicolor/"$i"x"$i"/apps/kcmnetpref.png           ;done
 for i in {16,32,48,64,128};    do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png         hicolor/"$i"x"$i"/apps/kcmkdnssd.png            ;done
-for i in {16,22,32,48,64};     do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/joystick.png            hicolor/"$i"x"$i"/apps/kcmjoystick.png          ;done
+for i in {16,22,32,48,64};     do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/input-joystick.png      hicolor/"$i"x"$i"/apps/kcmjoystick.png          ;done
 for i in {16,32,48,64,128};    do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/mouse.png               hicolor/"$i"x"$i"/apps/kcmmouse.png             ;done
 for i in {16,22,32,48,64,128}; do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/system.png              hicolor/"$i"x"$i"/apps/kcmmedia.png             ;done
 for i in {16,22,32};           do cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png           hicolor/"$i"x"$i"/apps/kcmcrypto.png            ;done
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 09f64bc..93bd2f7 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -266,6 +266,9 @@
 BuildRequires:	ca-certificates
 Requires:		ca-certificates
 %endif
+%if "%{cacert}" != ""
+Requires:		%{cacert}
+%endif
 
 # XRANDR support
 #  On RHEL5, xrandr library is too old.

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

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/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 c41eadc..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
@@ -2565,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
@@ -2643,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
@@ -2656,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
@@ -2678,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
@@ -2945,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
@@ -3008,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
@@ -3023,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
@@ -3043,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
@@ -3331,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
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/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
 ** Diff limit reached (max: 250 lines) **