From 5c5941afa5ff7a82da35ddedbc8816c47ffa02c1 Mon Sep 17 00:00:00 2001 From: epsilonrt Date: Fri, 5 Oct 2018 11:45:20 +0200 Subject: [PATCH] Update packaging infos --- AUTHORS | 2 +- CMakeLists.txt | 22 +++++++++++++++------- include/piduino/arduino/Arduino.h | 2 +- include/piduino/arduino/HardwareSerial.h | 2 +- include/piduino/arduino/Print.h | 2 +- src/arduino/Print.cpp | 2 +- src/arduino/i2c/Wire.cpp | 2 +- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/AUTHORS b/AUTHORS index 12d0d29..ae2b7e9 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1 @@ -* Pascal JEAN gmail.com> +* Pascal JEAN piduino.org> diff --git a/CMakeLists.txt b/CMakeLists.txt index 3586b12..a3cbcf0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,14 @@ cmake_minimum_required (VERSION 3.5 FATAL_ERROR) project (PIDUINO) set (PROJECT_DESCRIPTION "C++ library for Pi boards with Arduino API") +set (PROJECT_DESCRIPTION_TEXT "\ + PiDuino is a C ++ library for Pi boards that allows the use of I/O like GPIO,\n\ + I2C, SPI, UART ... with an API as close as possible to the Arduino language.\n\ + The description of Pi cards uses a stored 'Object' model in a database that \n\ + allows to add new models of boards easily.\n\ + Supported SoC models are AllWinner H-Series and Broadcom BCM2708 through 2710." +) + string(TOLOWER ${CMAKE_PROJECT_NAME} PROJECT_NAME) # Appends the cmake/modules path to MAKE_MODULE_PATH variable. @@ -169,11 +177,11 @@ if (PIDUINO_WITH_DOXYGEN_DOC) endif() ### Packages generation -------------------------------------------------------- -set(CPACK_PACKAGE_VERSION "${PIDUINO_VERSION_MAJOR}.${PIDUINO_VERSION_MINOR}-${PIDUINO_VERSION_PATCH}") +set(CPACK_PACKAGE_VERSION "${PIDUINO_VERSION_MAJOR}.${PIDUINO_VERSION_MINOR}.${PIDUINO_VERSION_PATCH}") set(CPACK_PACKAGE_VERSION_MAJOR "${PIDUINO_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MINOR "${PIDUINO_VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "${PIDUINO_VERSION_PATCH}") -set(CPACK_PACKAGE_CONTACT "Pascal JEAN ") +set(CPACK_PACKAGE_CONTACT "Pascal JEAN ") set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING.LESSER") set(CPACK_GENERATOR "DEB") @@ -248,28 +256,28 @@ if (CPACK_GENERATOR STREQUAL "DEB") endif (dpkg_query) message(STATUS "Debian architecture ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}") - + set(CPACK_DEBIAN_LIB_PACKAGE_NAME "libpiduino") - set(CPACK_COMPONENT_LIB_DESCRIPTION "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (library)") + set(CPACK_COMPONENT_LIB_DESCRIPTION "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (library)\n${PROJECT_DESCRIPTION_TEXT}\n This package provides the shared libriairie itself.") set(CPACK_DEBIAN_LIB_FILE_NAME "lib${PROJECT_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb") 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 "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (development files)") + set(CPACK_COMPONENT_DEV_DESCRIPTION "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (development files)\n${PROJECT_DESCRIPTION_TEXT}\n This package provides the 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}),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 "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (documentation)") + set(CPACK_COMPONENT_DOC_DESCRIPTION "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (documentation)\n${PROJECT_DESCRIPTION_TEXT}\n This package provides the API 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 "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (utilities)") + set(CPACK_COMPONENT_UTILS_DESCRIPTION "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (utilities)\n${PROJECT_DESCRIPTION_TEXT}\n This package provides the command-line 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") diff --git a/include/piduino/arduino/Arduino.h b/include/piduino/arduino/Arduino.h index c945907..3d48818 100644 --- a/include/piduino/arduino/Arduino.h +++ b/include/piduino/arduino/Arduino.h @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Modified 2018 by Pascal JEAN (epsilonrt@gmail.com) for piduino library + Modified 2018 by Pascal JEAN (pascal.jean@piduino.org) for piduino library */ #ifndef Arduino_h #define Arduino_h diff --git a/include/piduino/arduino/HardwareSerial.h b/include/piduino/arduino/HardwareSerial.h index a408f80..bfb512a 100644 --- a/include/piduino/arduino/HardwareSerial.h +++ b/include/piduino/arduino/HardwareSerial.h @@ -19,7 +19,7 @@ Modified 28 September 2010 by Mark Sproul Modified 14 August 2012 by Alarus Modified 3 December 2013 by Matthijs Kooijman - Modified 2018 by Pascal JEAN (epsilonrt@gmail.com) for piduino library + Modified 2018 by Pascal JEAN (pascal.jean@piduino.org) for piduino library */ #ifndef HardwareSerial_h diff --git a/include/piduino/arduino/Print.h b/include/piduino/arduino/Print.h index 6c87513..7cd0de6 100644 --- a/include/piduino/arduino/Print.h +++ b/include/piduino/arduino/Print.h @@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Modified 2018 by Pascal JEAN (epsilonrt@gmail.com) for piduino library + Modified 2018 by Pascal JEAN (pascal.jean@piduino.org) for piduino library */ #ifndef Print_h diff --git a/src/arduino/Print.cpp b/src/arduino/Print.cpp index 54e24f4..f122034 100644 --- a/src/arduino/Print.cpp +++ b/src/arduino/Print.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Modified 23 November 2006 by David A. Mellis - Modified 2018 by Pascal JEAN (epsilonrt@gmail.com) for piduino library + Modified 2018 by Pascal JEAN (pascal.jean@piduino.org) for piduino library */ #include diff --git a/src/arduino/i2c/Wire.cpp b/src/arduino/i2c/Wire.cpp index 3b7b4d2..adce5c8 100644 --- a/src/arduino/i2c/Wire.cpp +++ b/src/arduino/i2c/Wire.cpp @@ -17,7 +17,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts - Modified 2018 by Pascal JEAN (epsilonrt@gmail.com) for piduino library + Modified 2018 by Pascal JEAN (pascal.jean@piduino.org) for piduino library */ #include