From 16bd8563767f3910f7d609dc2fe1ff10a5a8f36c Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 9 Oct 2023 15:51:17 -0500 Subject: [PATCH 1/3] Bump to gz-cmake4 Signed-off-by: Addisu Z. Taddese --- focal/debian/changelog | 77 --------------------------- focal/debian/compat | 1 - focal/debian/control | 1 - focal/debian/copyright | 1 - focal/debian/format | 1 - focal/debian/libgz-cmake3-dev.install | 1 - focal/debian/rules | 1 - focal/debian/source | 1 - jammy/debian/changelog | 76 +------------------------- ubuntu/debian/compat | 2 +- ubuntu/debian/control | 16 ++---- ubuntu/debian/tests/build | 6 +-- 12 files changed, 9 insertions(+), 175 deletions(-) delete mode 100644 focal/debian/changelog delete mode 120000 focal/debian/compat delete mode 120000 focal/debian/control delete mode 120000 focal/debian/copyright delete mode 120000 focal/debian/format delete mode 120000 focal/debian/libgz-cmake3-dev.install delete mode 120000 focal/debian/rules delete mode 120000 focal/debian/source diff --git a/focal/debian/changelog b/focal/debian/changelog deleted file mode 100644 index eb5ff22..0000000 --- a/focal/debian/changelog +++ /dev/null @@ -1,77 +0,0 @@ -gz-cmake3 (3.4.1-1~focal) focal; urgency=medium - - * gz-cmake3 3.4.1-1 release - - -- Addisu Z. Taddese Tue, 26 Sep 2023 14:15:43 -0500 - -gz-cmake3 (3.4.0-1~focal) focal; urgency=medium - - * gz-cmake3 3.4.0-1 release - - -- Addisu Z. Taddese Fri, 25 Aug 2023 12:04:21 -0500 - -gz-cmake3 (3.3.1-1~focal) focal; urgency=medium - - * gz-cmake3 3.3.1-1 release - - -- Addisu Z. Taddese Thu, 03 Aug 2023 12:21:16 -0500 - -gz-cmake3 (3.3.0-1~focal) focal; urgency=medium - - * gz-cmake3 3.3.0-1 release - - -- Steve Peters Tue, 11 Jul 2023 02:42:02 +0000 - -gz-cmake3 (3.2.2-1~focal) focal; urgency=medium - - * gz-cmake3 3.2.2-1 release - - -- Michael Carroll Mon, 26 Jun 2023 11:19:10 -0500 - -gz-cmake3 (3.2.1-1~focal) focal; urgency=medium - - * gz-cmake3 3.2.1-1 release - - -- Michael Carroll Tue, 30 May 2023 11:33:14 -0500 - -gz-cmake3 (3.2.0-1~focal) focal; urgency=medium - - * gz-cmake3 3.2.0-1 release - - -- Michael Carroll Fri, 19 May 2023 13:59:37 -0500 - -gz-cmake3 (3.1.0-1~focal) focal; urgency=medium - - * gz-cmake3 3.1.0-1 release - - -- Jose Luis Rivero Fri, 21 Apr 2023 17:42:53 +0200 - -gz-cmake3 (3.0.1-1~focal) focal; urgency=medium - - * gz-cmake3 3.0.1-1 release - - -- Jose Luis Rivero Thu, 17 Nov 2022 20:33:47 +0100 - -gz-cmake3 (3.0.0-1~focal) focal; urgency=medium - - * gz-cmake3 3.0.0-1 release - - -- Nate Koenig Thu, 22 Sep 2022 10:16:30 -0700 - -gz-cmake3 (3.0.0~pre1-2~focal) focal; urgency=medium - - * gz-cmake3 3.0.0~pre1-2 release - - -- Louise Poubel Tue, 30 Aug 2022 10:18:23 -0700 - -gz-cmake3 (3.0.0~pre1-1~focal) focal; urgency=medium - - * gz-cmake3 3.0.0~pre1-1 release - - -- Louise Poubel Tue, 30 Aug 2022 10:01:13 -0700 - -gz-cmake3 (2.999.999-1~focal) focal; urgency=medium - - * Stub to be removed after first entry - - -- Louise Poubel Wed, 06 Apr 2022 17:27:45 -0700 diff --git a/focal/debian/compat b/focal/debian/compat deleted file mode 120000 index 1f617f4..0000000 --- a/focal/debian/compat +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/compat \ No newline at end of file diff --git a/focal/debian/control b/focal/debian/control deleted file mode 120000 index 5f3fb7f..0000000 --- a/focal/debian/control +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/control \ No newline at end of file diff --git a/focal/debian/copyright b/focal/debian/copyright deleted file mode 120000 index 8266515..0000000 --- a/focal/debian/copyright +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/copyright \ No newline at end of file diff --git a/focal/debian/format b/focal/debian/format deleted file mode 120000 index 6886dc4..0000000 --- a/focal/debian/format +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/source/format \ No newline at end of file diff --git a/focal/debian/libgz-cmake3-dev.install b/focal/debian/libgz-cmake3-dev.install deleted file mode 120000 index 010f017..0000000 --- a/focal/debian/libgz-cmake3-dev.install +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/libgz-cmake-dev.install \ No newline at end of file diff --git a/focal/debian/rules b/focal/debian/rules deleted file mode 120000 index c234c18..0000000 --- a/focal/debian/rules +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/rules \ No newline at end of file diff --git a/focal/debian/source b/focal/debian/source deleted file mode 120000 index 8fb4c09..0000000 --- a/focal/debian/source +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/source \ No newline at end of file diff --git a/jammy/debian/changelog b/jammy/debian/changelog index 0d83dad..6f9d340 100644 --- a/jammy/debian/changelog +++ b/jammy/debian/changelog @@ -1,77 +1,5 @@ -gz-cmake3 (3.4.1-1~jammy) jammy; urgency=medium - - * gz-cmake3 3.4.1-1 release - - -- Addisu Z. Taddese Tue, 26 Sep 2023 14:15:43 -0500 - -gz-cmake3 (3.4.0-1~jammy) jammy; urgency=medium - - * gz-cmake3 3.4.0-1 release - - -- Addisu Z. Taddese Fri, 25 Aug 2023 12:04:21 -0500 - -gz-cmake3 (3.3.1-1~jammy) jammy; urgency=medium - - * gz-cmake3 3.3.1-1 release - - -- Addisu Z. Taddese Thu, 03 Aug 2023 12:21:17 -0500 - -gz-cmake3 (3.3.0-1~jammy) jammy; urgency=medium - - * gz-cmake3 3.3.0-1 release - - -- Steve Peters Tue, 11 Jul 2023 02:42:02 +0000 - -gz-cmake3 (3.2.2-1~jammy) jammy; urgency=medium - - * gz-cmake3 3.2.2-1 release - - -- Michael Carroll Mon, 26 Jun 2023 11:19:10 -0500 - -gz-cmake3 (3.2.1-1~jammy) jammy; urgency=medium - - * gz-cmake3 3.2.1-1 release - - -- Michael Carroll Tue, 30 May 2023 11:33:14 -0500 - -gz-cmake3 (3.2.0-1~jammy) jammy; urgency=medium - - * gz-cmake3 3.2.0-1 release - - -- Michael Carroll Fri, 19 May 2023 13:59:37 -0500 - -gz-cmake3 (3.1.0-1~jammy) jammy; urgency=medium - - * gz-cmake3 3.1.0-1 release - - -- Jose Luis Rivero Fri, 21 Apr 2023 17:42:53 +0200 - -gz-cmake3 (3.0.1-1~jammy) jammy; urgency=medium - - * gz-cmake3 3.0.1-1 release - - -- Jose Luis Rivero Thu, 17 Nov 2022 20:33:47 +0100 - -gz-cmake3 (3.0.0-1~jammy) jammy; urgency=medium - - * gz-cmake3 3.0.0-1 release - - -- Nate Koenig Thu, 22 Sep 2022 10:16:30 -0700 - -gz-cmake3 (3.0.0~pre1-2~jammy) jammy; urgency=medium - - * gz-cmake3 3.0.0~pre1-2 release - - -- Louise Poubel Tue, 30 Aug 2022 10:18:22 -0700 - -gz-cmake3 (3.0.0~pre1-1~jammy) jammy; urgency=medium - - * gz-cmake3 3.0.0~pre1-1 release - - -- Louise Poubel Tue, 30 Aug 2022 10:01:13 -0700 - -gz-cmake3 (2.999.999-1~jammy) jammy; urgency=medium +gz-cmake4 (3.999.999-1~jammy) jammy; urgency=medium * Stub to be removed after first entry - -- Louise Poubel Wed, 06 Apr 2022 17:27:45 -0700 + -- Addisu Z. Taddese Tue, 9 Oct 2023 14:15:43 -0500 diff --git a/ubuntu/debian/compat b/ubuntu/debian/compat index ec63514..b1bd38b 100644 --- a/ubuntu/debian/compat +++ b/ubuntu/debian/compat @@ -1 +1 @@ -9 +13 diff --git a/ubuntu/debian/control b/ubuntu/debian/control index 0811b0e..05ddfdf 100644 --- a/ubuntu/debian/control +++ b/ubuntu/debian/control @@ -1,21 +1,19 @@ -Source: gz-cmake3 +Source: gz-cmake4 Maintainer: Jose Luis Rivero Section: science Priority: optional Build-Depends: cmake, pkg-config, - debhelper (>= 11) + debhelper (>= 13) Vcs-Browser: https://github.com/gazebosim/gz-cmake Vcs-Git: https://github.com/gazebosim/gz-cmake.git Standards-Version: 4.5.1 Homepage: http://gazebosim.org/ -Package: libgz-cmake3-dev +Package: libgz-cmake4-dev Architecture: any Section: libdevel Depends: cmake, ${misc:Depends} -Breaks: libignition-cmake3-dev (<< 2.999.999+nightly+git20220630+1rea69f3cd041c33f9c65946e71f0f199220bd8966-1) -Replaces: libignition-cmake3-dev (<< 2.999.999+nightly+git20220630+1rea69f3cd041c33f9c65946e71f0f199220bd8966-1) Multi-Arch: same Description: Gazebo CMake Library - Development files CMake modules to be used by the Gazebo projects. @@ -24,11 +22,3 @@ Description: Gazebo CMake Library - Development files third party projects against them. It provides modules that are used to find dependencies of Gazebo projects and generate cmake targets for consumers of Gazebo projects to link against. - -Package: libignition-cmake3-dev -Depends: libgz-cmake3-dev, ${misc:Depends} -Architecture: all -Priority: optional -Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. diff --git a/ubuntu/debian/tests/build b/ubuntu/debian/tests/build index 5b60680..d16ef37 100755 --- a/ubuntu/debian/tests/build +++ b/ubuntu/debian/tests/build @@ -17,10 +17,10 @@ cmake_minimum_required(VERSION 3.5) project(test VERSION 1.0.0) #============================================================================ -# Find gz-cmake3 +# Find gz-cmake4 #============================================================================ -# If you get an error at this line, you need to install gz-cmake3 -find_package(gz-cmake3 REQUIRED) +# If you get an error at this line, you need to install gz-cmake4 +find_package(gz-cmake4 REQUIRED) #============================================================================ # Set up the project From b43ded6f1287916dc862da7497270cebfb68e52e Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 9 Oct 2023 15:54:49 -0500 Subject: [PATCH 2/3] Bumps in ionic : ci_matching_branch/bump_ionic_gz-cmake4 Signed-off-by: Addisu Z. Taddese --- .../{libgz-cmake3-dev.examples => libgz-cmake4-dev.examples} | 0 .../debian/{libgz-cmake3-dev.install => libgz-cmake4-dev.install} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename jammy/debian/{libgz-cmake3-dev.examples => libgz-cmake4-dev.examples} (100%) rename jammy/debian/{libgz-cmake3-dev.install => libgz-cmake4-dev.install} (100%) diff --git a/jammy/debian/libgz-cmake3-dev.examples b/jammy/debian/libgz-cmake4-dev.examples similarity index 100% rename from jammy/debian/libgz-cmake3-dev.examples rename to jammy/debian/libgz-cmake4-dev.examples diff --git a/jammy/debian/libgz-cmake3-dev.install b/jammy/debian/libgz-cmake4-dev.install similarity index 100% rename from jammy/debian/libgz-cmake3-dev.install rename to jammy/debian/libgz-cmake4-dev.install From e44df2d949cc71f9c6b480dd0d3d80f208171359 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 12 Oct 2023 16:27:19 -0500 Subject: [PATCH 3/3] Fix destdir The destdir is set to `debian/` instead of `debian/tmp`, which the `.install` file expects. This is due to the activation of the single-binary addon to `dh`. Signed-off-by: Addisu Z. Taddese --- jammy/debian/changelog | 2 +- jammy/debian/compat | 2 +- ubuntu/debian/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 120000 jammy/debian/compat diff --git a/jammy/debian/changelog b/jammy/debian/changelog index 6f9d340..3cc043e 100644 --- a/jammy/debian/changelog +++ b/jammy/debian/changelog @@ -2,4 +2,4 @@ gz-cmake4 (3.999.999-1~jammy) jammy; urgency=medium * Stub to be removed after first entry - -- Addisu Z. Taddese Tue, 9 Oct 2023 14:15:43 -0500 + -- Addisu Z. Taddese Mon, 9 Oct 2023 14:15:43 -0500 diff --git a/jammy/debian/compat b/jammy/debian/compat deleted file mode 100644 index b1bd38b..0000000 --- a/jammy/debian/compat +++ /dev/null @@ -1 +0,0 @@ -13 diff --git a/jammy/debian/compat b/jammy/debian/compat new file mode 120000 index 0000000..1f617f4 --- /dev/null +++ b/jammy/debian/compat @@ -0,0 +1 @@ +../../ubuntu/debian/compat \ No newline at end of file diff --git a/ubuntu/debian/rules b/ubuntu/debian/rules index 66c63c8..7724d01 100755 --- a/ubuntu/debian/rules +++ b/ubuntu/debian/rules @@ -12,6 +12,6 @@ override_dh_auto_configure: override_dh_auto_install: # Remove artifacts installed by testing - dh_auto_install + dh_auto_install --destdir=debian/tmp find . -type d -name install | xargs rm -rf find . -type d -empty -delete