diff options
| -rwxr-xr-x | sysui/desktop/debian/postinst | 2 | ||||
| -rwxr-xr-x | sysui/desktop/debian/postrm | 2 | ||||
| -rw-r--r-- | sysui/desktop/freedesktop/freedesktop-menus.spec | 8 | ||||
| -rwxr-xr-x | sysui/desktop/share/create_tree.sh | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst index 715403fbaffc..604e67605297 100755 --- a/sysui/desktop/debian/postinst +++ b/sysui/desktop/debian/postinst @@ -31,7 +31,7 @@ if [ "$1" = "configure" ] ; then # first install update-menus fi # update icon-cache if already present - for theme in gnome hicolor locolor; do + for theme in gnome hicolor; do if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then # touch it, just in case we cannot find the binary... touch /usr/share/icons/$theme diff --git a/sysui/desktop/debian/postrm b/sysui/desktop/debian/postrm index adb9cf448e95..1cb32d37b3c3 100755 --- a/sysui/desktop/debian/postrm +++ b/sysui/desktop/debian/postrm @@ -11,7 +11,7 @@ if [ "$1" != "purge" ]; then if [ -x /usr/bin/update-menus ]; then update-menus fi - for theme in gnome hicolor locolor; do + for theme in gnome hicolor; do if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then # touch it, just in case we cannot find the binary... touch /usr/share/icons/$theme diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index f646bb7ff8ca..0292478f142d 100644 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -171,7 +171,7 @@ do done #run always -for theme in gnome hicolor locolor; do +for theme in gnome hicolor; do if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then # touch it, just in case we cannot find the binary... touch /usr/share/icons/$theme @@ -371,7 +371,7 @@ if [ "$1" = 0 ] ; then # only run when erasing the package - other cases handled fi #run always -for theme in gnome hicolor locolor; do +for theme in gnome hicolor; do if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then # touch it, just in case we cannot find the binary... touch /usr/share/icons/$theme @@ -411,9 +411,5 @@ done /usr/share/icons/hicolor/*/apps/*svg /usr/share/icons/hicolor/*/mimetypes/*png /usr/share/icons/hicolor/*/mimetypes/*svg -/usr/share/icons/locolor/*/apps/*png -/usr/share/icons/locolor/*/apps/*svg -/usr/share/icons/locolor/*/mimetypes/*png -/usr/share/icons/locolor/*/mimetypes/*svg /usr/share/mime/packages/* /usr/share/appdata/* diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 36dc4ff7a0e6..0de21a57fa15 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -19,7 +19,7 @@ umask 022 if [ "${KDEMAINDIR}" ]; then - for i in `cd "${ICON_SOURCE_DIR}"; find ${ICON_THEMES:-hicolor/???x??? hicolor/??x?? hicolor/scalable locolor} -name "*.png" -o -name "*.svg"` + for i in `cd "${ICON_SOURCE_DIR}"; find ${ICON_THEMES:-hicolor/???x??? hicolor/??x??} -name "*.png"; find hicolor/scalable/apps -name "*.svg"` do targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname ${i}` mkdir -p "${targetdir}" |