summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-12 01:00:48 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-12 01:00:48 +0200
commit2b8e592487bad2a7d5c747cf2435f91d3b256878 (patch)
tree4ee04e7c04ea62186ab9edd173a2f340cfb9d07a /ubuntu
parent8ef20fb122dcf4a0b12aa09ec0263d88940c700a (diff)
parente4466a3d6800d92b1b1b7e71e307f6698a4a3865 (diff)
downloadtde-packaging-2b8e592487bad2a7d5c747cf2435f91d3b256878.tar.gz
tde-packaging-2b8e592487bad2a7d5c747cf2435f91d3b256878.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install15
1 files changed, 10 insertions, 5 deletions
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index 21dafee6a..37a9eb42b 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
@@ -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
@@ -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
@@ -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
@@ -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