Fixes debian package creation issues

CMakeLists.txt

@@ -18,7 +18,7 @@
 cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
 
 project (PIDUINO)
-set (PROJECT_DESCRIPTION "Library and tools for embedded development")
+set (PROJECT_DESCRIPTION "C++ library for Pi boards with Arduino API")
 string(TOLOWER ${CMAKE_PROJECT_NAME} PROJECT_NAME)
 
 # Appends the cmake/modules path to MAKE_MODULE_PATH variable.
@@ -216,42 +216,60 @@ if (CPACK_GENERATOR STREQUAL "DEB")
       string(SUBSTRING ${libgcc1_ver} 0 ${libgcc1_ver_dash} libgcc1_ver)
     endif (libgcc1_ver_dash)
 
-    execute_process(COMMAND ${dpkg_query} --showformat=\${Version} --show libsqlite3-0 OUTPUT_VARIABLE libsqlite3_ver OUTPUT_STRIP_TRAILING_WHITESPACE)
-    string(FIND ${libsqlite3_ver} "-" libsqlite3_ver_dash)
-    #message ("libsqlite3_ver_dash=${libsqlite3_ver_dash}")
-    #message ("libsqlite3_ver=${libsqlite3_ver}")
-    if (libsqlite3_ver_dash)
-      string(SUBSTRING ${libsqlite3_ver} 0 ${libsqlite3_ver_dash} libsqlite3_ver)
-    endif (libsqlite3_ver_dash)
+    execute_process(COMMAND ${dpkg_query} --showformat=\${Version} --show libstdc++6 OUTPUT_VARIABLE libstdcpp6_ver OUTPUT_STRIP_TRAILING_WHITESPACE)
+    string(FIND ${libstdcpp6_ver} "-" libstdcpp6_ver_dash)
+    #message ("libstdcpp6_ver_dash=${libstdcpp6_ver_dash}")
+    #message ("libstdcpp6_ver=${libstdcpp6_ver}")
+    if (libstdcpp6_ver_dash)
+      string(SUBSTRING ${libstdcpp6_ver} 0 ${libstdcpp6_ver_dash} libstdcpp6_ver)
+    endif (libstdcpp6_ver_dash)
+
+    execute_process(COMMAND ${dpkg_query} --showformat=\${Version} --show libcppdb0 OUTPUT_VARIABLE libcppdb0_ver OUTPUT_STRIP_TRAILING_WHITESPACE)
+    string(FIND ${libcppdb0_ver} "-" libcppdb0_ver_dash)
+    #message ("libcppdb0_ver_dash=${libcppdb0_ver_dash}")
+    #message ("libcppdb0_ver=${libcppdb0_ver}")
+    if (libcppdb0_ver_dash)
+      string(SUBSTRING ${libcppdb0_ver} 0 ${libcppdb0_ver_dash} libcppdb0_ver)
+    endif (libcppdb0_ver_dash)
+
+    execute_process(COMMAND ${dpkg_query} --showformat=\${Version} --show libudev1 OUTPUT_VARIABLE libudev1_ver OUTPUT_STRIP_TRAILING_WHITESPACE)
+    string(FIND ${libudev1_ver} "-" libudev1_ver_dash)
+    #message ("libudev1_ver_dash=${libudev1_ver_dash}")
+    #message ("libudev1_ver=${libudev1_ver}")
+    if (libudev1_ver_dash)
+      string(SUBSTRING ${libudev1_ver} 0 ${libudev1_ver_dash} libudev1_ver)
+    endif (libudev1_ver_dash)
 
     #message ("libc6_ver=${libc6_ver}")
     #message ("libgcc1_ver=${libgcc1_ver}")
-    #message ("libsqlite3_ver=${libsqlite3_ver}")
+    #message ("libstdcpp6_ver=${libstdcpp6_ver}")
+    #message ("libcppdb0_ver=${libcppdb0_ver}")
+    #message ("libudev1_ver=${libudev1_ver}")
   endif (dpkg_query)
 
   message(STATUS "Debian architecture ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
 
   set(CPACK_DEBIAN_LIB_PACKAGE_NAME "libpiduino")
-  set(CPACK_COMPONENT_LIB_DESCRIPTION "${PROJECT_DESCRIPTION} (library)")
+  set(CPACK_COMPONENT_LIB_DESCRIPTION "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (library)")
   set(CPACK_DEBIAN_LIB_FILE_NAME "lib${PROJECT_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
-  set(CPACK_DEBIAN_LIB_PACKAGE_DEPENDS "libc6 (>= ${libc6_ver}), libgcc1 (>= ${libgcc1_ver}), libsqlite3 (>= ${libsqlite3_ver})")
+  set(CPACK_DEBIAN_LIB_PACKAGE_DEPENDS "libc6,libgcc1,libstdc++6,libcppdb0,libcppdb-sqlite3-0,libudev1")
   set(CPACK_DEBIAN_LIB_PACKAGE_SECTION "libs")
 
   set(CPACK_DEBIAN_DEV_PACKAGE_NAME "libpiduino-dev")
-  set(CPACK_COMPONENT_DEV_DESCRIPTION "${PROJECT_DESCRIPTION} (development files)")
+  set(CPACK_COMPONENT_DEV_DESCRIPTION "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (development files)")
   set(CPACK_DEBIAN_DEV_FILE_NAME "lib${PROJECT_NAME}-dev_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
-  set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "${CPACK_DEBIAN_LIB_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION}), cmake, bash, git-core, pkg-config${libgps_dev_depends}")
+  set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "${CPACK_DEBIAN_LIB_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION}),pkg-config,git-core")
   set(CPACK_DEBIAN_DEV_PACKAGE_SECTION "libdevel")
   #set(CPACK_PACKAGE_DESCRIPTION_FILE "${PIDUINO_SRC_DIR}/doc/README-deb.md")
 
   set(CPACK_DEBIAN_DOC_PACKAGE_NAME "libpiduino-doc")
-  set(CPACK_COMPONENT_DOC_DESCRIPTION "${PROJECT_DESCRIPTION} (documentation)")
+  set(CPACK_COMPONENT_DOC_DESCRIPTION "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (documentation)")
   set(CPACK_DEBIAN_DOC_FILE_NAME "lib${PROJECT_NAME}-doc_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
   set(CPACK_DEBIAN_DOC_PACKAGE_DEPENDS "${CPACK_DEBIAN_DEV_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})")
   set(CPACK_DEBIAN_DOC_PACKAGE_SECTION "libdevel")
 
   set(CPACK_DEBIAN_UTILS_PACKAGE_NAME "piduino-utils")
-  set(CPACK_COMPONENT_UTILS_DESCRIPTION "${PROJECT_DESCRIPTION} (utilities)")
+  set(CPACK_COMPONENT_UTILS_DESCRIPTION "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (utilities)")
   set(CPACK_DEBIAN_UTILS_FILE_NAME "${PROJECT_NAME}-utils_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
   set(CPACK_DEBIAN_UTILS_PACKAGE_DEPENDS "${CPACK_DEBIAN_LIB_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION})")
   set(CPACK_DEBIAN_UTILS_PACKAGE_SECTION "utils")

utils/piduino-utils.project

@@ -110,6 +110,7 @@
     <File Name="pido/exception.cpp"/>
     <File Name="pido/main.cpp"/>
     <File Name="pido/pido.1.in"/>
+    <File Name="pido/CMakeLists.txt"/>
   </VirtualDirectory>
   <Dependencies Name="Debug"/>
   <Dependencies Name="Release"/>

utils/pinfo/CMakeLists.txt

@@ -134,7 +134,7 @@ else()
 endif()
 
 install(TARGETS ${PROJECT_NAME} DESTINATION "${INSTALL_BIN_DIR}" 
-        PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT} SETUID COMPONENT utils)
+        PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT} COMPONENT utils)
 
 install(FILES
   "${CMAKE_BINARY_DIR}/${TARGET_MANPAGE_NAME}"