From 0724fb03b6f7ee0e73dfd65805581f7095d960e6 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 25 Feb 2022 17:11:53 +0100 Subject: [PATCH 1/5] Jammy support --- jammy/debian/changelog | 5 ++++ jammy/debian/compat | 1 + jammy/debian/control | 1 + jammy/debian/copyright | 1 + jammy/debian/ignition-tools.install | 1 + jammy/debian/libignition-tools-dev.install | 1 + jammy/debian/rules | 1 + jammy/debian/source | 1 + jammy/debian/tests | 1 + jammy/debian/watch | 1 + ubuntu/debian/control | 30 ++++++++++++--------- ubuntu/debian/debian_copyright_2022 | 31 ++++++++++++++++++++++ ubuntu/debian/tests/build | 13 +++++++++ ubuntu/debian/tests/control | 3 +++ ubuntu/debian/watch | 5 ++++ 15 files changed, 84 insertions(+), 12 deletions(-) create mode 100644 jammy/debian/changelog create mode 100644 jammy/debian/compat create mode 120000 jammy/debian/control create mode 120000 jammy/debian/copyright create mode 120000 jammy/debian/ignition-tools.install create mode 120000 jammy/debian/libignition-tools-dev.install create mode 120000 jammy/debian/rules create mode 120000 jammy/debian/source create mode 120000 jammy/debian/tests create mode 120000 jammy/debian/watch create mode 100644 ubuntu/debian/debian_copyright_2022 create mode 100755 ubuntu/debian/tests/build create mode 100644 ubuntu/debian/tests/control create mode 100644 ubuntu/debian/watch diff --git a/jammy/debian/changelog b/jammy/debian/changelog new file mode 100644 index 0000000..bbfda83 --- /dev/null +++ b/jammy/debian/changelog @@ -0,0 +1,5 @@ +ignition-tools (1.4.1-1~jammy) jammy; urgency=medium + + * First release for jammy + + -- Jose Luis Rivero Fri, 25 Feb 2022 17:07:14 +0100 diff --git a/jammy/debian/compat b/jammy/debian/compat new file mode 100644 index 0000000..b1bd38b --- /dev/null +++ b/jammy/debian/compat @@ -0,0 +1 @@ +13 diff --git a/jammy/debian/control b/jammy/debian/control new file mode 120000 index 0000000..5f3fb7f --- /dev/null +++ b/jammy/debian/control @@ -0,0 +1 @@ +../../ubuntu/debian/control \ No newline at end of file diff --git a/jammy/debian/copyright b/jammy/debian/copyright new file mode 120000 index 0000000..8266515 --- /dev/null +++ b/jammy/debian/copyright @@ -0,0 +1 @@ +../../ubuntu/debian/copyright \ No newline at end of file diff --git a/jammy/debian/ignition-tools.install b/jammy/debian/ignition-tools.install new file mode 120000 index 0000000..97283da --- /dev/null +++ b/jammy/debian/ignition-tools.install @@ -0,0 +1 @@ +../../ubuntu/debian/ignition-tools.install \ No newline at end of file diff --git a/jammy/debian/libignition-tools-dev.install b/jammy/debian/libignition-tools-dev.install new file mode 120000 index 0000000..d2a51be --- /dev/null +++ b/jammy/debian/libignition-tools-dev.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-tools-dev.install \ No newline at end of file diff --git a/jammy/debian/rules b/jammy/debian/rules new file mode 120000 index 0000000..c234c18 --- /dev/null +++ b/jammy/debian/rules @@ -0,0 +1 @@ +../../ubuntu/debian/rules \ No newline at end of file diff --git a/jammy/debian/source b/jammy/debian/source new file mode 120000 index 0000000..8fb4c09 --- /dev/null +++ b/jammy/debian/source @@ -0,0 +1 @@ +../../ubuntu/debian/source \ No newline at end of file diff --git a/jammy/debian/tests b/jammy/debian/tests new file mode 120000 index 0000000..d163274 --- /dev/null +++ b/jammy/debian/tests @@ -0,0 +1 @@ +../../ubuntu/debian/tests \ No newline at end of file diff --git a/jammy/debian/watch b/jammy/debian/watch new file mode 120000 index 0000000..40c9b2c --- /dev/null +++ b/jammy/debian/watch @@ -0,0 +1 @@ +../../ubuntu/debian/watch \ No newline at end of file diff --git a/ubuntu/debian/control b/ubuntu/debian/control index b902011..c809c31 100644 --- a/ubuntu/debian/control +++ b/ubuntu/debian/control @@ -1,16 +1,16 @@ Source: ignition-tools -Standards-Version: 3.9.8 Maintainer: Jose Luis Rivero Section: science Priority: optional -Build-Depends: debhelper (>= 9~), - gem2deb, +Build-Depends: debhelper (>= 11), cmake, pkg-config, - libbackward-cpp-dev + libbackward-cpp-dev, + ruby XS-Ruby-Versions: all -Vcs-Browser: https://bitbucket.org/ignitionrobotics/ign-tools-release -Vcs-Hg: https://bitbucket.org/ignitionrobotics/ign-tools-release +Vcs-Browser: https://github.com/ignitionrobotics/ignition-tools +Vcs-Git: https://github.com/ignitionrobotics/ignition-tools.git +Standards-Version: 4.5.1 Homepage: http://ignitionrobotics.org/ Package: ignition-tools @@ -21,9 +21,12 @@ XB-Ruby-Versions: ${ruby:Versions} Depends: ruby | ruby-interpreter, ${misc:Depends} Multi-Arch: same -Description: Ignition entry point for using all the suite of ignition tools - Ignition tools is a component in the ignition framework, a set of libraries - designed to rapidly develop robot applications. +Description: Entry point for using all the suite of ignition tools - app + Ignition tools provide the ign command line tool that accepts multiple + subcommands. Each subcommand is implemented in a plugin that belongs to a + specific Ignition project. + . + Package contains the ign app Package: libignition-tools-dev Architecture: any @@ -32,6 +35,9 @@ Depends: cmake, ignition-tools, ${misc:Depends} Multi-Arch: same -Description: CMake/Pkgconfig Support for rest of the suite of ignition tools - Ignition tools is a component in the ignition framework, a set of libraries - designed to rapidly develop robot applications. +Description: Entry point for using all the suite of ignition tools - cmake support + Ignition tools provide the ign command line tool that accepts multiple + subcommands. Each subcommand is implemented in a plugin that belongs to a + specific Ignition project. + . + Package contains the cmake helpers diff --git a/ubuntu/debian/debian_copyright_2022 b/ubuntu/debian/debian_copyright_2022 new file mode 100644 index 0000000..5b516ad --- /dev/null +++ b/ubuntu/debian/debian_copyright_2022 @@ -0,0 +1,31 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ignition-tools +Upstream-Contact: https://github.com/ignitionrobotics/ign-tools/issues +Source: https://github.com/ignitionrobotics/ign-tools +Files-Excluded: NEWS .github codecov.yml + +Files: * +Copyright: 2009, Dimitri van Heesch + 2009-2012, Emmanuel Roullit + 2003-2008, Greg Valure + 2012-2019, Open Source Robotics Foundation +License: Apache-2.0 + +License: Apache-2.0 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the full text of the Apache Software License version 2 can + be found in the file `/usr/share/common-licenses/Apache-2.0'. diff --git a/ubuntu/debian/tests/build b/ubuntu/debian/tests/build new file mode 100755 index 0000000..a93e458 --- /dev/null +++ b/ubuntu/debian/tests/build @@ -0,0 +1,13 @@ +#!/bin/sh +# autopkgtest check: very few things to test without other subcommands +# (C) 2021 Jose Luis Rivero +# Author: Jose Luis Rivero + +set -e + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +# Check the presence of ign tool in PATH +which ign +echo "check ign: OK" diff --git a/ubuntu/debian/tests/control b/ubuntu/debian/tests/control new file mode 100644 index 0000000..8174df1 --- /dev/null +++ b/ubuntu/debian/tests/control @@ -0,0 +1,3 @@ +Tests: build +Restrictions: superficial +Depends: @ diff --git a/ubuntu/debian/watch b/ubuntu/debian/watch new file mode 100644 index 0000000..301a20f --- /dev/null +++ b/ubuntu/debian/watch @@ -0,0 +1,5 @@ +version=4 +opts=filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%,\ + dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,repacksuffix=+dfsg \ + https://github.com/ignitionrobotics/ign-tools/tags \ + (?:.*?/)@PACKAGE@.*_(\d[\d.]*)\.tar\.gz From 9d88383c0450d4d24ad36edd013535dd713eb476 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 25 Feb 2022 17:13:31 +0100 Subject: [PATCH 2/5] Use osrf version --- jammy/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jammy/debian/changelog b/jammy/debian/changelog index bbfda83..25b0579 100644 --- a/jammy/debian/changelog +++ b/jammy/debian/changelog @@ -1,3 +1,9 @@ +ignition-tools (1.4.1+osrf-1~jammy) jammy; urgency=medium + + * ignition-tools 1.4.1+osrf-1 release + + -- Jose Luis Rivero Fri, 25 Feb 2022 17:13:24 +0100 + ignition-tools (1.4.1-1~jammy) jammy; urgency=medium * First release for jammy From 81e42d7d9758a6390409eb5ee6369c54296a3f27 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 25 Feb 2022 17:47:47 +0100 Subject: [PATCH 3/5] Lack of gem2deb for dh-ruby helper --- ubuntu/debian/control | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ubuntu/debian/control b/ubuntu/debian/control index c809c31..3ada815 100644 --- a/ubuntu/debian/control +++ b/ubuntu/debian/control @@ -4,9 +4,10 @@ Section: science Priority: optional Build-Depends: debhelper (>= 11), cmake, - pkg-config, + gem2deb, libbackward-cpp-dev, - ruby + ruby, + pkg-config XS-Ruby-Versions: all Vcs-Browser: https://github.com/ignitionrobotics/ignition-tools Vcs-Git: https://github.com/ignitionrobotics/ignition-tools.git From 7be794a2aa5ef387e6ccbc906c38c0b027593710 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 25 Feb 2022 18:19:18 +0100 Subject: [PATCH 4/5] Change format to quilt --- ubuntu/debian/source/format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/debian/source/format b/ubuntu/debian/source/format index 89ae9db..163aaf8 100644 --- a/ubuntu/debian/source/format +++ b/ubuntu/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) From 24007c3e05edc288506f67256a3a40a79bb6a15c Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 25 Feb 2022 18:19:44 +0100 Subject: [PATCH 5/5] Do not use with-ruby --- ubuntu/debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ubuntu/debian/rules b/ubuntu/debian/rules index 1a12e4a..9dc52cb 100755 --- a/ubuntu/debian/rules +++ b/ubuntu/debian/rules @@ -1,6 +1,5 @@ #!/usr/bin/make -f - .PHONY: override_dh_auto_configure override_dh_auto_configure: @@ -8,4 +7,4 @@ override_dh_auto_configure: -DUSE_SYSTEM_BACKWARDCPP=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo %: - dh $@ --buildsystem=cmake --with ruby + dh $@ --buildsystem=cmake