r21435 by mrdocs -

[scribus-commit]

Author: mrdocs
Date: Sun Aug 28 03:50:00 2016
New Revision: 21435

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21435
Log:
Resolves #14257 and #14256

Modified:
    branches/Version14x/Scribus/CMakeLists.txt
    branches/Version14x/Scribus/scribus.desktop

Modified: branches/Version14x/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21435&path=/branches/Version14x/Scribus/CMakeLists.txt
==============================================================================
--- branches/Version14x/Scribus/CMakeLists.txt	(original)
+++ branches/Version14x/Scribus/CMakeLists.txt	Sun Aug 28 03:50:00 2016
@@ -414,9 +414,6 @@
   set(CMAKE_INSTALL_RPATH ${PLUGINDIR})
 ENDIF (WANT_NORPATH OR WANT_DISTROBUILD)
 
-# Set the XDG mime stuff
-SET(MIMEDIR "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages/")
-SET(MIMELNKDIR "${CMAKE_INSTALL_DATAROOTDIR}/mimelnk/application/")
 
 ##############################################################################################################
 ########## Build Setup                                                                              ##########
@@ -948,11 +945,6 @@
   scribus.xml
   DESTINATION ${MIMEDIR}
 )
-#KDE workaround until it starts supporting freedesktop spec
-INSTALL(FILES
-  vnd.scribus.desktop
-  DESTINATION ${MIMELNKDIR}
-)
 
 #Install the desktop file
 INSTALL(FILES

Modified: branches/Version14x/Scribus/scribus.desktop
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21435&path=/branches/Version14x/Scribus/scribus.desktop
==============================================================================
--- branches/Version14x/Scribus/scribus.desktop	(original)
+++ branches/Version14x/Scribus/scribus.desktop	Sun Aug 28 03:50:00 2016
@@ -93,7 +93,7 @@
 TryExec=scribus
 Exec=scribus %f
 Terminal=false
-MimeType=application/vnd.scribus;
+#MimeType=application/vnd.scribus;
 Categories=Qt;Graphics;Publishing;
 StartupWMClass=scribus
 StartupNotify=false