[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kimageformats] src/imageformats: Rename webp.xml to kf5-imagesformats-webp.xml on installation
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-02-24 17:04:20
Message-ID: E1WHyx2-0005qt-Op () scm ! kde ! org
[Download RAW message or body]

Git commit 89a3e64c0eda9acefdd17782c5ade4d521615a9e by Alex Merry.
Committed on 20/02/2014 at 14:14.
Pushed by alexmerry into branch 'master'.

Rename webp.xml to kf5-imagesformats-webp.xml on installation

This prevents a clash with kde-runtime 4, and is a better naming scheme
anyway (to prevent accidental clashes with mime packages from other
software).

REVIEW: 115913

M  +1    -1    src/imageformats/CMakeLists.txt

http://commits.kde.org/kimageformats/89a3e64c0eda9acefdd17782c5ade4d521615a=
9e

diff --git a/src/imageformats/CMakeLists.txt b/src/imageformats/CMakeLists.=
txt
index e028deb..07ce79e 100644
--- a/src/imageformats/CMakeLists.txt
+++ b/src/imageformats/CMakeLists.txt
@@ -112,7 +112,7 @@ if (WebP_FOUND)
     )
     if (SharedMimeInfo_FOUND)
         # TODO: Remove when we can depend on shared-mime-info 1.3
-        install(FILES webp.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
+        install(FILES webp.xml DESTINATION ${XDG_MIME_INSTALL_DIR} RENAME =
kf5-imageformats-webp.xml)
         update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
     endif()
 endif()
[prev in list] [next in list] [prev in thread] [next in thread]