From cfcb382c703a5d123628b616f3d3d51d069f844c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20Pal=C3=A9ologue?= Date: Mon, 20 Nov 2023 17:51:20 +0100 Subject: [PATCH] Generated debian files for bullseye --- debian/changelog | 121 ++++++++++++++++++++++++++ debian/changelog.em | 7 -- debian/compat | 1 + debian/compat.em | 1 - debian/control | 12 +++ debian/control.em | 14 --- debian/{copyright.em => copyright} | 10 +-- debian/gbp.conf | 3 + debian/gbp.conf.em | 3 - debian/{rules.em => rules} | 22 ++--- debian/source/format | 1 + debian/source/format.em | 1 - debian/source/{options.em => options} | 3 +- 13 files changed, 153 insertions(+), 46 deletions(-) create mode 100644 debian/changelog delete mode 100644 debian/changelog.em create mode 100644 debian/compat delete mode 100644 debian/compat.em create mode 100644 debian/control delete mode 100644 debian/control.em rename debian/{copyright.em => copyright} (50%) create mode 100644 debian/gbp.conf delete mode 100644 debian/gbp.conf.em rename debian/{rules.em => rules} (72%) create mode 100644 debian/source/format delete mode 100644 debian/source/format.em rename debian/source/{options.em => options} (81%) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..3bb7af2 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,121 @@ +ros-iron-nao-meshes (2.1.0-1bullseye) bullseye; urgency=high + + * Workaround running installer in CI + * Fix build on GitHub Actions + * Add CI + * Interactive agreement by default + Explicit option in command line to agree to license. + Improved interaction and messages. + * Update maintainers + * Rename README to README.md + * Fix error in CMakeLists.txt + * Upgrade nao_meshes package for ROS2 + * Contributors: Maxime Busy, Victor Paleologue, Victor Paléologue, mbusy + + -- Victor Paleologue Tue, 14 Nov 2023 23:00:00 -0000 + +ros-iron-nao-meshes (0.1.13-1bullseye) bullseye; urgency=high + + * Update ERROR_FILE to ERROR_FILE_CMD in CMakeLists to avoid build crash + * Contributors: mbusy + + -- Victor Paleologue Tue, 06 Sep 2022 22:00:00 -0000 + +ros-iron-nao-meshes (0.1.12-1bullseye) bullseye; urgency=high + + * add Maxime Busy as maintainer (#7 ) + * update maintainer (#5 ) + * Contributors: Maxime Busy, Mikael Arguedas + + -- Victor Paleologue Tue, 07 Jan 2020 23:00:00 -0000 + +ros-iron-nao-meshes (0.1.11-1bullseye) bullseye; urgency=high + + * fixed folder path + added install rule for texture folder + * Update package.xml + added myself as a maintainer as requested by vrabaud + * Contributors: Arguedas Mikael, Mikael Arguedas + + -- Victor Paleologue Tue, 02 Feb 2016 23:00:00 -0000 + +ros-iron-nao-meshes (0.1.10-1bullseye) bullseye; urgency=high + + * fixed folder name in CMakeLists + * Contributors: Mikael Arguedas + + -- Victor Paleologue Wed, 27 Jan 2016 23:00:00 -0000 + +ros-iron-nao-meshes (0.1.9-1bullseye) bullseye; urgency=high + + * update MD5 checksum for new installers + * Contributors: Mikael Arguedas + + -- Victor Paleologue Sat, 23 Jan 2016 23:00:00 -0000 + +ros-iron-nao-meshes (0.1.8-1bullseye) bullseye; urgency=high + + * update md5 for 0.6.7 installers + * Update README + * Contributors: Mikael ARGUEDAS, Vincent Rabaud + + -- Victor Paleologue Wed, 26 Nov 2014 23:00:00 -0000 + +ros-iron-nao-meshes (0.1.7-1bullseye) bullseye; urgency=high + + * update MD5 for 0.6.6 installer + * add a changelog + * Contributors: Vincent Rabaud, margueda + + -- Victor Paleologue Thu, 02 Oct 2014 22:00:00 -0000 + +ros-iron-nao-meshes (0.1.5-1bullseye) bullseye; urgency=high + + * new way of finding the architecture + * Contributors: Vincent Rabaud + + -- Victor Paleologue Wed, 03 Sep 2014 22:00:00 -0000 + +ros-iron-nao-meshes (0.1.4-1bullseye) bullseye; urgency=high + + * last try to fix 32 bit + * Contributors: Vincent Rabaud + + -- Victor Paleologue Tue, 02 Sep 2014 22:00:00 -0000 + +ros-iron-nao-meshes (0.1.3-1bullseye) bullseye; urgency=high + + * installer 0.6.5 and better debug info for 32 bits + * add debug symbols ... + * Contributors: Vincent Rabaud + + -- Victor Paleologue Tue, 02 Sep 2014 22:00:00 -0000 + +ros-iron-nao-meshes (0.1.2-1bullseye) bullseye; urgency=high + + * handle 32 bit and use the 0.6.4 archive + * add an inactivity timeout (to maybe solve quantal issues) + * add java dependency as the installer uses java + * the license should reflect the content not the code + * Contributors: Vincent Rabaud + + -- Victor Paleologue Thu, 28 Aug 2014 22:00:00 -0000 + +ros-iron-nao-meshes (0.1.1-1bullseye) bullseye; urgency=high + + * rename the templates file + * install the meshes to nao_description for now + * get the proper URL for the installer, and devel cleanups + fixes #1 + * update the maintainer's email address + * Contributors: Vincent Rabaud + + -- Victor Paleologue Tue, 26 Aug 2014 22:00:00 -0000 + +ros-iron-nao-meshes (0.1.0-1bullseye) bullseye; urgency=high + + * adding everything to use meshes from devel space and to create a binary + * Contributors: Vincent Rabaud + + -- Victor Paleologue Mon, 25 Aug 2014 22:00:00 -0000 + + diff --git a/debian/changelog.em b/debian/changelog.em deleted file mode 100644 index 3585909..0000000 --- a/debian/changelog.em +++ /dev/null @@ -1,7 +0,0 @@ -@[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 new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/compat.em b/debian/compat.em deleted file mode 100644 index 7a87216..0000000 --- a/debian/compat.em +++ /dev/null @@ -1 +0,0 @@ -@(debhelper_version) diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..b4b7f3b --- /dev/null +++ b/debian/control @@ -0,0 +1,12 @@ +Source: ros-iron-nao-meshes +Section: misc +Priority: optional +Maintainer: Victor Paleologue +Build-Depends: debhelper (>= 9.0.0), default-jdk, ros-iron-ament-cmake, ros-iron-ros-workspace +Homepage: http://github.com/ros-naoqi/nao_meshes2/ +Standards-Version: 3.9.2 + +Package: ros-iron-nao-meshes +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ros-iron-ros-workspace +Description: ROS2 Meshes for the NAO robot diff --git a/debian/control.em b/debian/control.em deleted file mode 100644 index 6d7b65c..0000000 --- a/debian/control.em +++ /dev/null @@ -1,14 +0,0 @@ -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 similarity index 50% rename from debian/copyright.em rename to debian/copyright index bc82fd5..8390b48 100644 --- a/debian/copyright.em +++ b/debian/copyright @@ -1,11 +1,7 @@ Format: Bloom subset of https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: @(Name) -@[if BugTracker]Upstream-Contact: @(BugTracker)@\n@[end if]@ -@[if Source]Source: @(Source)@\n@[end if]@ -@[for License, Text in Licenses]@ +Upstream-Name: nao_meshes Files: See file headers in repository for details Copyright: See package copyright in source code for details -License: @(License) - @(Text) -@[end for]@ +License: Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License + See repository for full license text diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..f44a00a --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[git-buildpackage] +upstream-tag=release/iron/nao_meshes/2.1.0-1 +upstream-tree=tag diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em deleted file mode 100644 index ad24a16..0000000 --- a/debian/gbp.conf.em +++ /dev/null @@ -1,3 +0,0 @@ -[git-buildpackage] -upstream-tag=@(release_tag) -upstream-tree=tag diff --git a/debian/rules.em b/debian/rules similarity index 72% rename from debian/rules.em rename to debian/rules index 2ab7b14..9736d55 100755 --- a/debian/rules.em +++ b/debian/rules @@ -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=@(InstallationPrefix)/lib/pkgconfig +export PKG_CONFIG_PATH=/opt/ros/iron/lib/pkgconfig # Explicitly enable -DNDEBUG, see: # https://github.com/ros-infrastructure/bloom/issues/327 export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG @@ -24,24 +24,24 @@ 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 "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/iron/setup.sh" ]; then . "/opt/ros/iron/setup.sh"; fi && \ dh_auto_configure -- \ - -DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \ - -DAMENT_PREFIX_PATH="@(InstallationPrefix)" \ - -DCMAKE_PREFIX_PATH="@(InstallationPrefix)" \ + -DCMAKE_INSTALL_PREFIX="/opt/ros/iron" \ + -DAMENT_PREFIX_PATH="/opt/ros/iron" \ + -DCMAKE_PREFIX_PATH="/opt/ros/iron" \ $(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 "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/iron/setup.sh" ]; then . "/opt/ros/iron/setup.sh"; fi && \ dh_auto_build override_dh_auto_test: @@ -49,19 +49,19 @@ override_dh_auto_test: # 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 "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/iron/setup.sh" ]; then . "/opt/ros/iron/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 "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ - dh_shlibdeps -l$(CURDIR)/debian/@(Package)/@(InstallationPrefix)/lib/ + if [ -f "/opt/ros/iron/setup.sh" ]; then . "/opt/ros/iron/setup.sh"; fi && \ + dh_shlibdeps -l$(CURDIR)/debian/ros-iron-nao-meshes//opt/ros/iron/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 "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \ + if [ -f "/opt/ros/iron/setup.sh" ]; then . "/opt/ros/iron/setup.sh"; fi && \ dh_auto_install diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/format.em b/debian/source/format.em deleted file mode 100644 index 9666bf4..0000000 --- a/debian/source/format.em +++ /dev/null @@ -1 +0,0 @@ -3.0 (@(format)) diff --git a/debian/source/options.em b/debian/source/options similarity index 81% rename from debian/source/options.em rename to debian/source/options index 8c4c78b..8bc9182 100644 --- a/debian/source/options.em +++ b/debian/source/options @@ -1,6 +1,5 @@ -@[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] +