diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,25 +194,14 @@ configure_file("${CMAKE_CURRENT_SOURCE_D configure_file("${CMAKE_CURRENT_SOURCE_DIR}/misc/program_name.png" "${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.png" COPYONLY) -find_program(XDG-DESKTOP-MENU xdg-desktop-menu) -find_program(XDG-ICON-RESOURCE xdg-icon-resource) - if (UNIX) # first copy files to share/serialplot/ install(FILES ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.desktop - ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.png - DESTINATION share/${PROGRAM_NAME}) - - # install copyright file (in debian format) + DESTINATION share/applications/) install(FILES - ${CMAKE_SOURCE_DIR}/debian/copyright - DESTINATION share/doc/${PROGRAM_NAME}/) - - install(CODE " - execute_process(COMMAND ${XDG-DESKTOP-MENU} install --novendor ${CMAKE_INSTALL_PREFIX}/share/${PROGRAM_NAME}/${PROGRAM_NAME}.desktop) - execute_process(COMMAND ${XDG-ICON-RESOURCE} install --novendor --size 256 ${CMAKE_INSTALL_PREFIX}/share/${PROGRAM_NAME}/${PROGRAM_NAME}.png) -") + ${CMAKE_BINARY_DIR}/${PROGRAM_NAME}.png + DESTINATION share/icons/hicolor/256x256/apps/) endif (UNIX) # uninstalling @@ -223,9 +212,7 @@ configure_file( if (UNIX) add_custom_target(uninstall - COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake - COMMAND ${XDG-DESKTOP-MENU} uninstall --novendor ${PROGRAM_NAME}.desktop - COMMAND ${XDG-ICON-RESOURCE} uninstall --novendor --size 256 ${PROGRAM_NAME}) + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) endif (UNIX) # packaging @@ -237,10 +224,6 @@ endif (UNIX) include(InstallRequiredSystemLibraries) -# configure debian scripts -configure_file(${CMAKE_SOURCE_DIR}/debian/postinst.in ${CMAKE_BINARY_DIR}/debian/postinst) -configure_file(${CMAKE_SOURCE_DIR}/debian/postrm.in ${CMAKE_BINARY_DIR}/debian/postrm) - set(CPACK_PACKAGE_NAME "${PROGRAM_NAME}") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Small and simple software for plotting data from serial port") set(CPACK_PACKAGE_CONTACT "Hasan Yavuz Özderya ") @@ -257,9 +240,6 @@ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Sm if (NOT QWT_USE_STATIC) set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libqwt6-qt5 (>= 6.1.1)") endif (NOT QWT_USE_STATIC) -set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA - "${CMAKE_BINARY_DIR}/debian/postinst" - "${CMAKE_BINARY_DIR}/debian/postrm") if (UNIX) set(CPACK_PACKAGE_EXECUTABLES "${PROGRAM_NAME}") diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 --- a/debian/copyright +++ /dev/null @@ -1,26 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: serialplot -Source: https://bitbucket.org/hyOzd/serialplot - -Files: * -Copyright: Copyright © 2015 Hasan Yavuz Özderya -License: GPL-3+ - This program is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 3 of the License, or (at your option) any later - version. - . - This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more - details. - . - You should have received a copy of the GNU General Public - License along with this package; if not, see - . - . - On Debian systems, the full text of the GNU General Public - License version 3 can be found in the file - `/usr/share/common-licenses/GPL-3'. \ No newline at end of file diff --git a/debian/postinst.in b/debian/postinst.in deleted file mode 100755 --- a/debian/postinst.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -xdg-desktop-menu install --novendor /usr/share/serialplot/@PROGRAM_NAME@.desktop -xdg-icon-resource install --novendor --size 256 /usr/share/@PROGRAM_NAME@/@PROGRAM_NAME@.png diff --git a/debian/postrm.in b/debian/postrm.in deleted file mode 100755 --- a/debian/postrm.in +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -xdg-desktop-menu uninstall --novendor @PROGRAM_NAME@.desktop -xdg-icon-resource uninstall --novendor --size 256 @PROGRAM_NAME@