Rebase from 'debian/humble/nao_meshes'

ros-naoqi · Nov 22, 2023 · 7b76a4b · 7b76a4b
1 parent 5b7a559
commit 7b76a4b
Show file tree

Hide file tree

Showing 17 changed files with 59 additions and 161 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package nao_meshes
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+2.1.1 (2023-11-22)
+------------------
+* Download and install directly in bin dir
+* Update status badges
+* Contributors: Victor Paléologue
+
 2.1.0 (2023-11-15)
 ------------------
 * Workaround running installer in CI

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(ament_cmake REQUIRED)
 # When getting a new binay, the MD5 might change, and the folder hierarchy too
 # read comments below to adapt
 
-set(TMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/tmp)
+set(TMP_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(INSTALLER_PATH ${TMP_DIR}/installer.run)
 
 if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "$i.86$")

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # nao_meshes2
 
-This package allows you to install the Aldebaran Pepper meshes for ROS2
+This package allows you to install the Aldebaran NAO meshes for ROS2
 
 When building a binary package, please make sure that with the installer the user has to agree to
 Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License
@@ -16,8 +16,7 @@ of the meshes as this could result in heavy cloning.
 
 ## Status
 
-ROS Distro | Binary Status | Source status |
-|-------------------|-------------------|-------------------|
-Humble | |
-Galactic | [![Build Status](https://build.ros2.org/job/Gbin_uF64__nao_meshes__ubuntu_focal_amd64__binary/badge/icon)](https://build.ros2.org/job/Gbin_uF64__nao_meshes__ubuntu_focal_amd64__binary/) | [![Build Status](https://build.ros2.org/job/Gsrc_uF__nao_meshes__ubuntu_focal__source/badge/icon)](https://build.ros2.org/job/Gsrc_uF__nao_meshes__ubuntu_focal__source/)
-Foxy | [![Build Status](https://build.ros2.org/job/Fbin_uF64__nao_meshes__ubuntu_focal_amd64__binary/badge/icon)](https://build.ros2.org/job/Fbin_uF64__nao_meshes__ubuntu_focal_amd64__binary/) | [![Build Status](https://build.ros2.org/job/Fsrc_uF__nao_meshes__ubuntu_focal__source/badge/icon)](https://build.ros2.org/job/Fsrc_uF__nao_meshes__ubuntu_focal__source/)
+ROS Distro | Binary Status | Source status | GitHub Status |
+|-------------------|-------------------|-------------------|--------------------|
+Humble | [![ros2-humble-jammy-bin-status-badge](https://build.ros2.org/job/Hbin_uJ64__nao_meshes__ubuntu_jammy_amd64__binary/badge/icon)](https://build.ros2.org/job/Hbin_uJ64__nao_meshes__ubuntu_jammy_amd64__binary) | [![ros2-humble-jammy-src-status-badge](https://build.ros2.org/job/Hsrc_uJ__nao_meshes__ubuntu_jammy__source/badge/icon)](https://build.ros2.org/job/Hsrc_uJ__nao_meshes__ubuntu_jammy__source) | [![ros2-humble-jammy](https://github.com/ros-naoqi/nao_meshes2/actions/workflows/humble_jammy.yml/badge.svg?branch=main)](https://github.com/ros-naoqi/nao_meshes2/actions/workflows/humble_jammy.yml)
+Iron | [![ros2-iron-jammy-bin-status-badge](https://build.ros2.org/job/Ibin_uJ64__nao_meshes__ubuntu_jammy_amd64__binary/badge/icon)](https://build.ros2.org/job/Ibin_uJ64__nao_meshes__ubuntu_jammy_amd64__binary) | [![ros2-iron-jammy-src-status-badge](https://build.ros2.org/job/Isrc_uJ__nao_meshes__ubuntu_jammy__source/badge/icon)](https://build.ros2.org/job/Isrc_uJ__nao_meshes__ubuntu_jammy__source) | [![ros2-iron-jammy](https://github.com/ros-naoqi/nao_meshes2/actions/workflows/iron_jammy.yml/badge.svg?branch=main)](https://github.com/ros-naoqi/nao_meshes2/actions/workflows/iron_jammy.yml)
diff --git a/debian/changelog b/debian/changelog
diff --git a/debian/changelog.em 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
diff --git a/debian/compat.em b/debian/compat.em
@@ -0,0 +1 @@
+@(debhelper_version)
diff --git a/debian/control b/debian/control
diff --git a/debian/control.em 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 → debian/copyright.em b/debian/copyright → debian/copyright.em
@@ -1,7 +1,11 @@
 Format: Bloom subset of https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: nao_meshes
+Upstream-Name: @(Name)
+@[if BugTracker]Upstream-Contact: @(BugTracker)@\n@[end if]@
+@[if Source]Source: @(Source)@\n@[end if]@
+@[for License, Text in Licenses]@
 
 Files: See file headers in repository for details
 Copyright: See package copyright in source code for details
-License: Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License
- See repository for full license text
+License: @(License)
+ @(Text)
+@[end for]@
diff --git a/debian/gbp.conf b/debian/gbp.conf
diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em
@@ -0,0 +1,3 @@
+[git-buildpackage]
+upstream-tag=@(release_tag)
+upstream-tree=tag
diff --git a/debian/rules → debian/rules.em b/debian/rules → debian/rules.em
@@ -13,7 +13,7 @@ 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/humble/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
@@ -24,44 +24,44 @@ endif
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 %:
-	dh $@ -v --buildsystem=cmake --builddirectory=.obj-$(DEB_HOST_GNU_TYPE)
+	dh $@@ -v --buildsystem=cmake --builddirectory=.obj-$(DEB_HOST_GNU_TYPE)
 
 override_dh_auto_configure:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree and source it.  It will set things like
 	# CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/humble/setup.sh" ]; then . "/opt/ros/humble/setup.sh"; fi && \
+	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
 	dh_auto_configure -- \
-		-DCMAKE_INSTALL_PREFIX="/opt/ros/humble" \
-		-DAMENT_PREFIX_PATH="/opt/ros/humble" \
-		-DCMAKE_PREFIX_PATH="/opt/ros/humble" \
+		-DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \
+		-DAMENT_PREFIX_PATH="@(InstallationPrefix)" \
+		-DCMAKE_PREFIX_PATH="@(InstallationPrefix)" \
 		$(BUILD_TESTING_ARG)
 
 override_dh_auto_build:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree and source it.  It will set things like
 	# CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/humble/setup.sh" ]; then . "/opt/ros/humble/setup.sh"; fi && \
+	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
 	dh_auto_build
 
 override_dh_auto_test:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree 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/humble/setup.sh" ]; then . "/opt/ros/humble/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 and source it.  It will set things like
 	# CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/humble/setup.sh" ]; then . "/opt/ros/humble/setup.sh"; fi && \
-	dh_shlibdeps -l$(CURDIR)/debian/ros-humble-nao-meshes//opt/ros/humble/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 and source it.  It will set things like
 	# CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/humble/setup.sh" ]; then . "/opt/ros/humble/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
diff --git a/debian/source/format.em b/debian/source/format.em
@@ -0,0 +1 @@
+3.0 (@(format))
diff --git a/debian/source/options → debian/source/options.em b/debian/source/options → 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
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>nao_meshes</name>
-  <version>2.1.0</version>
+  <version>2.1.1</version>
   <description>ROS2 Meshes for the NAO robot</description>
   <author email="[email protected]">Maxime Busy</author>