From 1b33a8db37f026ac7eb344d1d77a8514a21b55fe Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 11 Mar 2022 19:08:25 +0100 Subject: [PATCH 1/3] Support for jammy --- jammy/debian/changelog | 5 + jammy/debian/compat | 1 + jammy/debian/control | 1 + jammy/debian/copyright | 1 + jammy/debian/libignition-gui6-dev.install | 1 + jammy/debian/libignition-gui6.install | 1 + jammy/debian/rules | 1 + jammy/debian/source | 1 + jammy/debian/watch | 1 + ubuntu/debian/control | 20 +- ubuntu/debian/debian_copyright_2022 | 339 ++++++++++++++++++++++ ubuntu/debian/rules | 17 +- ubuntu/debian/watch | 5 + 13 files changed, 376 insertions(+), 18 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/libignition-gui6-dev.install create mode 120000 jammy/debian/libignition-gui6.install create mode 120000 jammy/debian/rules create mode 120000 jammy/debian/source create mode 120000 jammy/debian/watch create mode 100644 ubuntu/debian/debian_copyright_2022 create mode 100644 ubuntu/debian/watch diff --git a/jammy/debian/changelog b/jammy/debian/changelog new file mode 100644 index 0000000..6edb3f0 --- /dev/null +++ b/jammy/debian/changelog @@ -0,0 +1,5 @@ +ignition-gui6 (6.4.0-1~jammy) jammy; urgency=medium + + * First release for jammy + + -- Jose Luis Rivero Fri, 11 Mar 2022 19:01:26 +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..e9a51f1 --- /dev/null +++ b/jammy/debian/copyright @@ -0,0 +1 @@ +../../ubuntu/debian/debian_copyright_2022 \ No newline at end of file diff --git a/jammy/debian/libignition-gui6-dev.install b/jammy/debian/libignition-gui6-dev.install new file mode 120000 index 0000000..4daa5ad --- /dev/null +++ b/jammy/debian/libignition-gui6-dev.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-gui-dev.install \ No newline at end of file diff --git a/jammy/debian/libignition-gui6.install b/jammy/debian/libignition-gui6.install new file mode 120000 index 0000000..5d30c24 --- /dev/null +++ b/jammy/debian/libignition-gui6.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-gui.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/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 09b7ec8..4d6ee66 100644 --- a/ubuntu/debian/control +++ b/ubuntu/debian/control @@ -1,11 +1,10 @@ Source: ignition-gui6 -Standards-Version: 3.9.8 Maintainer: Jose Luis Rivero Section: science Priority: optional Build-Depends: cmake, pkg-config, - debhelper (>= 9), + debhelper (>= 11), doxygen, libtinyxml2-dev, libprotoc-dev, @@ -35,8 +34,9 @@ Build-Depends: cmake, libignition-tools-dev, libignition-transport11-dev, libignition-msgs8-dev (>= 8.2.0) -Vcs-Browser: https://github.com/ignition-release/ign-gui6-release +Vcs-Browser: https://github.com/ignitionrobotics/ignition-gui Vcs-Git: https://github.com/ignition-release/ign-gui6-release +Standards-Version: 4.5.1 Homepage: http://ignitionrobotics.org/ Package: libignition-gui6 @@ -44,10 +44,14 @@ Architecture: any Section: libs Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libignition-gui6-6 (<= 6.3.0+ds) +Replaces: libignition-gui6-6 (<= 6.3.0+ds) Multi-Arch: same Description: Ignition Gui classes and functions for robot apps - Shared library - Ignition Gui is a component in the ignition framework, a set of libraries - designed to rapidly develop robot applications. + Ignition Gui is a component in the ignition framework, a set of libraries + designed to rapidly develop robot applications. + . + Package contains the main libraries Package: libignition-gui6-dev Architecture: any @@ -86,5 +90,7 @@ Depends: libtinyxml2-dev, ${misc:Depends} Multi-Arch: same Description: Ignition Gui classes and functions for robot apps - Development files - Ignition Gui is a component in the ignition framework, a set of libraries - designed to rapidly develop robot applications. + Ignition Gui is a component in the ignition framework, a set of libraries + designed to rapidly develop robot applications. + . + Package for development libraries and headers. diff --git a/ubuntu/debian/debian_copyright_2022 b/ubuntu/debian/debian_copyright_2022 new file mode 100644 index 0000000..179d1d5 --- /dev/null +++ b/ubuntu/debian/debian_copyright_2022 @@ -0,0 +1,339 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ignition-gui +Upstream-Contact: https://github.com/ignitionrobotics/ign-gui/issues +Source: https://github.com/ignitionrobotics/ign-gui +Files-Excluded: .github + test/gtest + +Files: * +Copyright: 2012-2021, Open Source Robotics Foundation +License: Apache-2 + +Files: debian/* +Copyright: 2012-2022, Jose Luis Rivero +License: Apache-2 + +Files: api.md.in + tutorials.md.in +Copyright: 2012-2021, Open Source Robotics Foundation +License: CC-BY-4 + +License: Apache-2 + See '/usr/share/common-licenses/Apache-2.0'. + +License: CC-BY-4 + By exercising the Licensed Rights (defined below), You accept and agree + to be bound by the terms and conditions of this Creative Commons + Attribution 4.0 International Public License ("Public License"). To the + extent this Public License may be interpreted as a contract, You are + granted the Licensed Rights in consideration of Your acceptance of + these terms and conditions, and the Licensor grants You such rights in + consideration of benefits the Licensor receives from making the + Licensed Material available under these terms and conditions. + . + . + Section 1 -- Definitions. + . + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + . + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + . + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + . + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + . + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + . + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + . + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + . + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + . + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + . + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + . + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + . + . + Section 2 -- Scope. + . + a. License grant. + . + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + . + a. reproduce and Share the Licensed Material, in whole or + in part; and + . + b. produce, reproduce, and Share Adapted Material. + . + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + . + 3. Term. The term of this Public License is specified in Section + 6(a). + . + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + . + 5. Downstream recipients. + . + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + . + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + . + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + . + b. Other rights. + . + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + . + 2. Patent and trademark rights are not licensed under this + Public License. + . + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + . + . + Section 3 -- License Conditions. + . + Your exercise of the Licensed Rights is expressly made subject to the + following conditions. + . + a. Attribution. + . + 1. If You Share the Licensed Material (including in modified + form), You must: + . + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + . + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + . + ii. a copyright notice; + . + iii. a notice that refers to this Public License; + . + iv. a notice that refers to the disclaimer of + warranties; + . + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + . + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + . + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + . + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + . + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + . + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + . + . + Section 4 -- Sui Generis Database Rights. + . + Where the Licensed Rights include Sui Generis Database Rights that + apply to Your use of the Licensed Material: + . + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + . + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + . + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + . + For the avoidance of doubt, this Section 4 supplements and does not + replace Your obligations under this Public License where the Licensed + Rights include other Copyright and Similar Rights. + . + . + Section 5 -- Disclaimer of Warranties and Limitation of Liability. + . + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + . + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + . + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + . + . + Section 6 -- Term and Termination. + . + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + . + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + . + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + . + 2. upon express reinstatement by the Licensor. + . + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + . + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + . + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + . + . + Section 7 -- Other Terms and Conditions. + . + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + . + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + . + . + Section 8 -- Interpretation. + . + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + . + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + . + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + . + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. diff --git a/ubuntu/debian/rules b/ubuntu/debian/rules index c4fcf90..49ec22a 100755 --- a/ubuntu/debian/rules +++ b/ubuntu/debian/rules @@ -1,21 +1,16 @@ #!/usr/bin/make -f -# -*- makefile -*- -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -.PHONY: override_dh_auto_configure \ - override_dh_auto_test %: - dh $@ --parallel + dh $@ override_dh_auto_configure: dh_auto_configure -- \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -# test cannot run in parallel override_dh_auto_test: true -# dh_auto_test --max-parallel=1 + +# No way of using xfvb to run tests consistently +# xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" \ +# dh_auto_test --no-parallel -- \ +# ARGS='-E UNIT_Application_TEST\|UNIT_Helpers_TEST\|INTEGRATION_ExamplesBuild_TEST\|UNIT_ign_TEST\|INTEGRATION_camera_tracking\|INTEGRATION_minimal_scene\|INTEGRATION_transport_scene_manager\INTEGRATION_marker_manager\INTEGRATION_scene3d' diff --git a/ubuntu/debian/watch b/ubuntu/debian/watch new file mode 100644 index 0000000..ff195d2 --- /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=+ds \ + https://github.com/ignitionrobotics/ign-gui/tags \ + (?:.*?/)@PACKAGE@.*_(\d[\d.]*)\.tar\.gz From e1ee14e2a89ff37d1da44ef6da5ce6af1c0436c4 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 11 Mar 2022 19:23:14 +0100 Subject: [PATCH 2/3] There are no excluded files in our releasing --- ubuntu/debian/debian_copyright_2022 | 2 -- 1 file changed, 2 deletions(-) diff --git a/ubuntu/debian/debian_copyright_2022 b/ubuntu/debian/debian_copyright_2022 index 179d1d5..272d1ff 100644 --- a/ubuntu/debian/debian_copyright_2022 +++ b/ubuntu/debian/debian_copyright_2022 @@ -2,8 +2,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ignition-gui Upstream-Contact: https://github.com/ignitionrobotics/ign-gui/issues Source: https://github.com/ignitionrobotics/ign-gui -Files-Excluded: .github - test/gtest Files: * Copyright: 2012-2021, Open Source Robotics Foundation From 953d81486b050efffbdb5f5391f8701b829cf756 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 11 Mar 2022 19:25:23 +0100 Subject: [PATCH 3/3] Add overrides --- bionic/debian/libignition-gui6.lintian-overrides | 1 + focal/debian/libignition-gui6.lintian-overrides | 1 + jammy/debian/libignition-gui6.lintian-overrides | 1 + ubuntu/debian/libignition-gui.lintian-overrides | 1 + 4 files changed, 4 insertions(+) create mode 120000 bionic/debian/libignition-gui6.lintian-overrides create mode 120000 focal/debian/libignition-gui6.lintian-overrides create mode 120000 jammy/debian/libignition-gui6.lintian-overrides create mode 100644 ubuntu/debian/libignition-gui.lintian-overrides diff --git a/bionic/debian/libignition-gui6.lintian-overrides b/bionic/debian/libignition-gui6.lintian-overrides new file mode 120000 index 0000000..7de4f32 --- /dev/null +++ b/bionic/debian/libignition-gui6.lintian-overrides @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-gui.lintian-overrides \ No newline at end of file diff --git a/focal/debian/libignition-gui6.lintian-overrides b/focal/debian/libignition-gui6.lintian-overrides new file mode 120000 index 0000000..7de4f32 --- /dev/null +++ b/focal/debian/libignition-gui6.lintian-overrides @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-gui.lintian-overrides \ No newline at end of file diff --git a/jammy/debian/libignition-gui6.lintian-overrides b/jammy/debian/libignition-gui6.lintian-overrides new file mode 120000 index 0000000..7de4f32 --- /dev/null +++ b/jammy/debian/libignition-gui6.lintian-overrides @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-gui.lintian-overrides \ No newline at end of file diff --git a/ubuntu/debian/libignition-gui.lintian-overrides b/ubuntu/debian/libignition-gui.lintian-overrides new file mode 100644 index 0000000..fe8d880 --- /dev/null +++ b/ubuntu/debian/libignition-gui.lintian-overrides @@ -0,0 +1 @@ +custom-library-search-path RUNPATH *