From cc07a1d3855b84336c87aff8a235383cfa5571a8 Mon Sep 17 00:00:00 2001 From: Jon Binney Date: Mon, 6 Jul 2020 17:56:25 -0700 Subject: [PATCH] Rebase from 'debian/noetic/fadecandy_msgs' --- CHANGELOG.rst | 3 +++ debian/changelog | 13 ------------- debian/changelog.em | 7 +++++++ debian/compat | 1 - debian/compat.em | 1 + debian/control | 12 ------------ 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, 43 insertions(+), 42 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 2ba123c..7044b6e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package fadecandy_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.2 (2020-07-06) +------------------ + 0.1.1 (2020-06-03) ------------------ diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index bff5dec..0000000 --- a/debian/changelog +++ /dev/null @@ -1,13 +0,0 @@ -ros-noetic-fadecandy-msgs (0.1.1-2buster) buster; urgency=high - - - - -- Jon Binney Wed, 03 Jun 2020 07:00:00 -0000 - -ros-noetic-fadecandy-msgs (0.1.0-2buster) buster; urgency=high - - * Initial release - - -- Jon Binney Thu, 28 May 2020 07:00:00 -0000 - - diff --git a/debian/changelog.em b/debian/changelog.em new file mode 100644 index 0000000..3585909 --- /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 ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/compat.em b/debian/compat.em new file mode 100644 index 0000000..7a87216 --- /dev/null +++ b/debian/compat.em @@ -0,0 +1 @@ +@(debhelper_version) diff --git a/debian/control b/debian/control deleted file mode 100644 index 5947f86..0000000 --- a/debian/control +++ /dev/null @@ -1,12 +0,0 @@ -Source: ros-noetic-fadecandy-msgs -Section: misc -Priority: optional -Maintainer: Jon Binney -Build-Depends: debhelper (>= 9.0.0), ros-noetic-catkin, ros-noetic-message-generation, ros-noetic-std-msgs -Homepage: -Standards-Version: 3.9.2 - -Package: ros-noetic-fadecandy-msgs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ros-noetic-message-runtime, ros-noetic-std-msgs -Description: ROS msgs for fadecandy LED controllers diff --git a/debian/control.em b/debian/control.em new file mode 100644 index 0000000..6d7b65c --- /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 0000000..a41fc55 --- /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 2fc7f56..0000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,3 +0,0 @@ -[git-buildpackage] -upstream-tag=release/noetic/fadecandy_msgs/0.1.1-2 -upstream-tree=tag diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em new file mode 100644 index 0000000..ad24a16 --- /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 597b760..1c02dd4 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/noetic/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/noetic/setup.sh" ]; then . "/opt/ros/noetic/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/noetic" \ - -DCMAKE_PREFIX_PATH="/opt/ros/noetic" + -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/noetic/setup.sh" ]; then . "/opt/ros/noetic/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/noetic/setup.sh" ]; then . "/opt/ros/noetic/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/noetic/setup.sh" ]; then . "/opt/ros/noetic/setup.sh"; fi && \ - dh_shlibdeps -l$(CURDIR)/debian/ros-noetic-fadecandy-msgs//opt/ros/noetic/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/noetic/setup.sh" ]; then . "/opt/ros/noetic/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 163aaf8..0000000 --- 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 0000000..9666bf4 --- /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 8bc9182..8c4c78b 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 607c4ef..3c14184 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ fadecandy_msgs - 0.1.1 + 0.1.2 ROS msgs for fadecandy LED controllers Jon Binney