From 34452c4ea2ca132d1fc7ca241762e19fe47a2a71 Mon Sep 17 00:00:00 2001 From: Daniel Stonier Date: Tue, 15 Sep 2020 22:10:21 -0400 Subject: [PATCH] Rebase from 'debian/melodic/kobuki_driver' --- CHANGELOG.rst | 4 +- debian/changelog | 136 -------------------------- debian/changelog.em | 7 ++ debian/compat | 1 - debian/compat.em | 1 + debian/control | 13 --- debian/control.em | 14 +++ debian/copyright.em | 1 + debian/gbp.conf | 3 - debian/gbp.conf.em | 3 + debian/{rules => rules.em} | 20 ++-- debian/source/format | 1 - debian/source/format.em | 1 + debian/source/{options => options.em} | 3 +- package.xml | 2 +- 15 files changed, 42 insertions(+), 168 deletions(-) delete mode 100644 debian/changelog create mode 100644 debian/changelog.em delete mode 100644 debian/compat create mode 100644 debian/compat.em delete mode 100644 debian/control create mode 100644 debian/control.em create mode 100644 debian/copyright.em delete mode 100644 debian/gbp.conf create mode 100644 debian/gbp.conf.em rename debian/{rules => rules.em} (75%) delete mode 100644 debian/source/format create mode 100644 debian/source/format.em rename debian/source/{options => options.em} (81%) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0139fb7e..2f402d26 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,12 +3,12 @@ Changelog ========= 0.7.11 (2020-09-15) ------------------- +------------------- * [core] fix version macro pullution * [infra] fix cmake project version warnings 0.7.10 (2020-09-13) ------------------- +------------------- * [firmware] recommended version checking for 1.1.4 and 1.2.0 0.7.7 (2017-03-29) diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 35dfc5d7..00000000 --- a/debian/changelog +++ /dev/null @@ -1,136 +0,0 @@ -ros-melodic-kobuki-driver (0.7.11-1stretch) stretch; urgency=high - - * [core] fix version macro pullution - * [infra] fix cmake project version warnings - - -- Daniel Stonier Tue, 15 Sep 2020 04:00:00 -0000 - -ros-melodic-kobuki-driver (0.7.10-1stretch) stretch; urgency=high - - * [firmware] recommended version checking for 1.1.4 and 1.2.0 - - -- Daniel Stonier Sun, 13 Sep 2020 04:00:00 -0000 - -ros-melodic-kobuki-driver (0.7.7-1stretch) stretch; urgency=high - - * accel limiter variable initialisation bugfix - - -- Daniel Stonier Wed, 29 Mar 2017 04:00:00 -0000 - -ros-melodic-kobuki-driver (0.7.6-1stretch) stretch; urgency=high - - * doxygen updates - - -- Daniel Stonier Mon, 27 Mar 2017 04:00:00 -0000 - -ros-melodic-kobuki-driver (0.7.4-1stretch) stretch; urgency=high - - * drop spurious debugging cmake message that was throwing warnings - - -- Daniel Stonier Thu, 23 Feb 2017 05:00:00 -0000 - -ros-melodic-kobuki-driver (0.7.2-1stretch) stretch; urgency=high - - * Pose2D -> LegacyPose2D - - -- Daniel Stonier Wed, 09 Nov 2016 05:00:00 -0000 - -ros-melodic-kobuki-driver (0.7.1-1stretch) stretch; urgency=high - - * isnan -> std::isnan - - -- Daniel Stonier Fri, 06 May 2016 04:00:00 -0000 - -ros-melodic-kobuki-driver (0.6.3-1stretch) stretch; urgency=high - - * bugfix cliff header packet - - -- Daniel Stonier Fri, 06 May 2016 04:00:00 -0000 - -ros-melodic-kobuki-driver (0.6.2-1stretch) stretch; urgency=high - - * enable the cx11 compiler - - -- Daniel Stonier Sat, 09 Jan 2016 05:00:00 -0000 - -ros-melodic-kobuki-driver (0.6.0-1stretch) stretch; urgency=high - - * add linear and angular test plot image - * kobuki_driver : Updated doxygen. Issue #10 . - * Contributors: Younghun Ju, jihoonl - - -- Daniel Stonier Mon, 04 Aug 2014 04:00:00 -0000 - -ros-melodic-kobuki-driver (0.5.3-1stretch) stretch; urgency=high - - * Updated doxygen documentation. - - -- Daniel Stonier Fri, 06 Sep 2013 04:00:00 -0000 - -ros-melodic-kobuki-driver (0.5.2-1stretch) stretch; urgency=high - - * Documentation and other text files reviewed. - - -- Daniel Stonier Sat, 31 Aug 2013 04:00:00 -0000 - -ros-melodic-kobuki-driver (0.5.1-1stretch) stretch; urgency=high - - * Updated license info. - * Updated doxygen in the code. - * Update firmware_changelog.md. - - -- Daniel Stonier Fri, 30 Aug 2013 04:00:00 -0000 - -ros-melodic-kobuki-driver (0.5.0-1stretch) stretch; urgency=high - - * Added debug topic of raw control command of robot. - * Removed debugging message. - * Updated doxygen about factory-default value of PID gain. - * Add firmware version checking on PID commands. - * Updated protocol specification in doxygen about custom PID gain setting. - * Updated doxygen script to let user do something when authentification of repository is failed. - * Bump minor version for firmware (new version is 1.2.0). - * Improved packet integrity checking. Issue #245 . - * Added new protocol about custom PID gain setting. Issue #249 . - * Updated doxygen. - * Removed ros logging code. - * Removed meaningless buffer size check in serialization of command packet. - * Fixed typo; mayor --> major. - * Added integrity check for each packets. - * Removed old printf codes. - * Removed meaningless buffer size check in serialization of packets. - * Fixed typo on update_doxygen.bash script. - * Added extra url info on all packages. - * Added brief description of update_doxygen.bash script. - * Added convenient script for automated update of doxygen document to the github.io page. - * Updated doxygen. - * Updated old rnd email address. - * Removed SetPower command packet from doxygen. It is not for external powers and unnecessary for kobuki. - * Corrected typos on doxygen about external power. - * lock api for protecting data access with asynchronous getXXX calls. - * Fix URL to the previous changelog wiki - * Changelogs at package level - * Reset odometry also for heading - * Updated raw_control_command topic to publish recevied command velocity also. - * Added a debug topic that publish actual base command sent to robot. - * Added simple_keyop application to control kobuki directly from keyboard without ROS. - * Fixed broken synchronity of base control command caused by recent bugfix of acceleration limiter module. - * Added flexible logging features to using named logging system of ros/log4cxx. - * Reset odometry also works for heading (gyro). - * Do not use robot_pose_ekf; use imu for heading and encoders for position. - - -- Daniel Stonier Thu, 29 Aug 2013 04:00:00 -0000 - -ros-melodic-kobuki-driver (0.4.0-1stretch) stretch; urgency=high - - * Windows compatible. - * Update doxygen documentation for using wstool and for windows compilation. - * New scripts to help serve firmware and windows downloads from our file server. - * Delay demo program finish so kobuki can beep alive. - * Serial connection made much more robust. - * Install using wstool - * Update firmware_changelog.md with latest verions and rewrite with for markdown formatting. - - -- Daniel Stonier Fri, 09 Aug 2013 04:00:00 -0000 - - diff --git a/debian/changelog.em b/debian/changelog.em new file mode 100644 index 00000000..35859090 --- /dev/null +++ b/debian/changelog.em @@ -0,0 +1,7 @@ +@[for change_version, change_date, changelog, main_name, main_email in changelogs]@(Package) (@(change_version)@(DebianInc)@(Distribution)) @(Distribution); urgency=high + +@(changelog) + + -- @(main_name) <@(main_email)> @(change_date) + +@[end for] diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec635144..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/compat.em b/debian/compat.em new file mode 100644 index 00000000..7a87216d --- /dev/null +++ b/debian/compat.em @@ -0,0 +1 @@ +@(debhelper_version) diff --git a/debian/control b/debian/control deleted file mode 100644 index 2cdaafbd..00000000 --- a/debian/control +++ /dev/null @@ -1,13 +0,0 @@ -Source: ros-melodic-kobuki-driver -Section: misc -Priority: optional -Maintainer: Daniel Stonier -Build-Depends: debhelper (>= 9.0.0), ros-melodic-catkin, ros-melodic-ecl-build, ros-melodic-ecl-command-line, ros-melodic-ecl-console, ros-melodic-ecl-converters, ros-melodic-ecl-devices, ros-melodic-ecl-geometry, ros-melodic-ecl-mobile-robot, ros-melodic-ecl-sigslots, ros-melodic-ecl-time -Homepage: http://ros.org/wiki/kobuki_driver -Standards-Version: 3.9.2 - -Package: ros-melodic-kobuki-driver -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ros-melodic-ecl-command-line, ros-melodic-ecl-console, ros-melodic-ecl-converters, ros-melodic-ecl-devices, ros-melodic-ecl-geometry, ros-melodic-ecl-mobile-robot, ros-melodic-ecl-sigslots, ros-melodic-ecl-time -Description: C++ driver library for Kobuki: Pure C++ driver library for Kobuki. - This is for those who do not wish to use ROS on their systems. diff --git a/debian/control.em b/debian/control.em new file mode 100644 index 00000000..6d7b65c3 --- /dev/null +++ b/debian/control.em @@ -0,0 +1,14 @@ +Source: @(Package) +Section: misc +Priority: optional +Maintainer: @(Maintainer) +Build-Depends: debhelper (>= @(debhelper_version).0.0), @(', '.join(BuildDepends)) +Homepage: @(Homepage) +Standards-Version: 3.9.2 + +Package: @(Package) +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, @(', '.join(Depends)) +@[if Conflicts]Conflicts: @(', '.join(Conflicts))@\n@[end if]@ +@[if Replaces]Replaces: @(', '.join(Replaces))@\n@[end if]@ +Description: @(Description) diff --git a/debian/copyright.em b/debian/copyright.em new file mode 100644 index 00000000..a41fc555 --- /dev/null +++ b/debian/copyright.em @@ -0,0 +1 @@ +@(Copyright) \ No newline at end of file diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index c7ca9aee..00000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,3 +0,0 @@ -[git-buildpackage] -upstream-tag=release/melodic/kobuki_driver/0.7.11-1 -upstream-tree=tag diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em new file mode 100644 index 00000000..ad24a164 --- /dev/null +++ b/debian/gbp.conf.em @@ -0,0 +1,3 @@ +[git-buildpackage] +upstream-tag=@(release_tag) +upstream-tree=tag diff --git a/debian/rules b/debian/rules.em similarity index 75% rename from debian/rules rename to debian/rules.em index a436c8bb..1c02dd40 100755 --- a/debian/rules +++ b/debian/rules.em @@ -13,29 +13,29 @@ export DH_VERBOSE=1 # https://code.ros.org/trac/ros/ticket/2977 # https://code.ros.org/trac/ros/ticket/3842 export LDFLAGS= -export PKG_CONFIG_PATH=/opt/ros/melodic/lib/pkgconfig +export PKG_CONFIG_PATH=@(InstallationPrefix)/lib/pkgconfig # Explicitly enable -DNDEBUG, see: # https://github.com/ros-infrastructure/bloom/issues/327 export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG %: - dh $@ -v --buildsystem=cmake + dh $@@ -v --buildsystem=cmake override_dh_auto_configure: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \ + if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ dh_auto_configure -- \ -DCATKIN_BUILD_BINARY_PACKAGE="1" \ - -DCMAKE_INSTALL_PREFIX="/opt/ros/melodic" \ - -DCMAKE_PREFIX_PATH="/opt/ros/melodic" + -DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \ + -DCMAKE_PREFIX_PATH="@(InstallationPrefix)" override_dh_auto_build: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \ + if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ dh_auto_build override_dh_auto_test: @@ -43,19 +43,19 @@ override_dh_auto_test: # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. echo -- Running tests. Even if one of them fails the build is not canceled. - if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \ + if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ dh_auto_test || true override_dh_shlibdeps: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \ - dh_shlibdeps -l$(CURDIR)/debian/ros-melodic-kobuki-driver//opt/ros/melodic/lib/ + if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + dh_shlibdeps -l$(CURDIR)/debian/@(Package)/@(InstallationPrefix)/lib/ override_dh_auto_install: # In case we're installing to a non-standard location, look for a setup.sh # in the install tree that was dropped by catkin, and source it. It will # set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. - if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \ + if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ dh_auto_install diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/source/format.em b/debian/source/format.em new file mode 100644 index 00000000..9666bf41 --- /dev/null +++ b/debian/source/format.em @@ -0,0 +1 @@ +3.0 (@(format)) diff --git a/debian/source/options b/debian/source/options.em similarity index 81% rename from debian/source/options rename to debian/source/options.em index 8bc9182a..8c4c78b0 100644 --- a/debian/source/options +++ b/debian/source/options.em @@ -1,5 +1,6 @@ +@[if format and format == 'quilt']@ # Automatically add upstream changes to the quilt overlay. # http://manpages.ubuntu.com/manpages/trusty/man1/dpkg-source.1.html # This supports reusing the orig.tar.gz for debian increments. auto-commit - +@[end if] diff --git a/package.xml b/package.xml index 07a7f280..8bb274e1 100644 --- a/package.xml +++ b/package.xml @@ -1,6 +1,6 @@ kobuki_driver - 0.7.11 + 0.7.12 C++ driver library for Kobuki: Pure C++ driver library for Kobuki. This is for those who do not wish to use ROS on their systems.