[SCM] Packaging of KVIrc branch, master, updated. debian/4.1.3+20110929.svn5980-1-29-gc2c81cf

[Mark Purcell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kvirc.git;a=commitdiff;h=0311c18

The following commit has been merged in the master branch:
commit 0311c188803ddc1cf921dd50a970c00963d8a6fc
Author: Mark Purcell <msp at debian.org>
Date:   Sun Mar 3 10:26:12 2013 +1100

    New Upstream Release
---
 CMakeLists.txt                  |    4 ++--
 cmake/kvirc4.desktop.cmake      |    2 +-
 data/icons/32x32/CMakeLists.txt |    3 +++
 data/mimetypes/CMakeLists.txt   |   22 ++--------------------
 data/protocols/CMakeLists.txt   |   10 ++++++++--
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fa151d..95c2d78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,8 +237,8 @@ ELSE()
 		ENDIF()
 		IF(CMAKE_COMPILER_IS_GNUCXX)
 			#force gdb options
-			SET(CMAKE_CXX_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
-			SET(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math")
+			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math -ggdb")
+			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -DNDEBUG --no-enforce-eh-specs -pipe --exec-charset=UTF-8 --input-charset=UTF-8 --no-implement-inlines --unit-at-a-time --fast-math -ggdb")
 			INCLUDE(CheckCXXCompilerFlag)
 			CHECK_CXX_COMPILER_FLAG("-fvisibility-inlines-hidden" CXX_HAS_VIH_FLAG)
 			#gcc doesn't support visibility on PE/win32
diff --git a/cmake/kvirc4.desktop.cmake b/cmake/kvirc4.desktop.cmake
index 255e4c7..ee0cd03 100644
--- a/cmake/kvirc4.desktop.cmake
+++ b/cmake/kvirc4.desktop.cmake
@@ -16,4 +16,4 @@ Exec=${KVIRC_BINARYNAME} -m %u
 Icon=kvirc
 Type=Application
 MimeType=application/x-kva;application/x-kvt;
-Categories=Qt;Network;IRCClient;
+Categories=Qt;KDE;Network;IRCClient;
diff --git a/data/icons/32x32/CMakeLists.txt b/data/icons/32x32/CMakeLists.txt
index a754fbb..ff8a896 100644
--- a/data/icons/32x32/CMakeLists.txt
+++ b/data/icons/32x32/CMakeLists.txt
@@ -19,6 +19,9 @@ IF(UNIX)
 		# Assume linux
 		INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps/)
 		INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/mimetypes/)
+		# Install xpm for ${CMAKE_INSTALL_PREFIX}/share/menu/kvirc
+		FILE(GLOB files "*.xpm")
+		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps/)
 	ENDIF()
 ELSEIF(WIN32)
 	INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/32x32/apps/)
diff --git a/data/mimetypes/CMakeLists.txt b/data/mimetypes/CMakeLists.txt
index 8a1b8a5..02de1da 100644
--- a/data/mimetypes/CMakeLists.txt
+++ b/data/mimetypes/CMakeLists.txt
@@ -1,20 +1,2 @@
-IF(KDE4_FOUND)
-	INCLUDE(MacroEnsureVersion)
-
-	macro_ensure_version("4.2.0" ${KDE_VERSION} KDE_4_2_FOUND)
-
-	# for KDE 4.2 we require at least version 0.23
-	IF(KDE_4_2_FOUND)
-		SET(SHARED_MIME_INFO_MINIMUM_VERSION "0.23")
-	ENDIF(KDE_4_2_FOUND)
-
-	# now to shared mime info
-	FIND_PACKAGE(SharedMimeInfo)
-
-	IF(SHARED_MIME_INFO_FOUND AND IS_DIRECTORY ${XDG_MIME_INSTALL_DIR})
-		INSTALL(FILES kvirc.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
-		update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
-	ENDIF(SHARED_MIME_INFO_FOUND AND IS_DIRECTORY ${XDG_MIME_INSTALL_DIR})
-
-	INSTALL(FILES kvirc.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kvirc)
-ENDIF(KDE4_FOUND)
+INSTALL(FILES kvirc.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
+INSTALL(FILES kvirc.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kvirc)
diff --git a/data/protocols/CMakeLists.txt b/data/protocols/CMakeLists.txt
index 66fc389..ce1d555 100644
--- a/data/protocols/CMakeLists.txt
+++ b/data/protocols/CMakeLists.txt
@@ -1,4 +1,10 @@
 IF(KDE4_FOUND)
-	INSTALL(FILES _irc.protocol DESTINATION ${SERVICES_INSTALL_DIR})
-	INSTALL(FILES _irc6.protocol DESTINATION ${SERVICES_INSTALL_DIR})
+	INSTALL(FILES _irc.protocol
+          DESTINATION ${SERVICES_INSTALL_DIR}
+          RENAME irc.protocol
+          )
+	INSTALL(FILES _irc6.protocol
+          DESTINATION ${SERVICES_INSTALL_DIR}
+          RENAME irc6.protocol
+          )
 ENDIF(KDE4_FOUND)

-- 
Packaging of KVIrc