From 900e2da29b615acdbb40f09fbcd7b2cff2b3750b Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Fri, 13 Oct 2023 12:53:07 -0500 Subject: [PATCH] Bumps in ionic : ci_matching_branch/bump_ionic_gz-math8 (#1) Signed-off-by: Addisu Z. Taddese --- focal/debian/changelog | 54 ---------- focal/debian/compat | 1 - focal/debian/control | 1 - focal/debian/copyright | 1 - focal/debian/docs | 1 - focal/debian/format | 1 - focal/debian/rules | 1 - focal/debian/source | 1 - focal/debian/tests | 1 - focal/debian/watch | 1 - jammy/debian/changelog | 53 +--------- jammy/debian/compat | 2 +- jammy/debian/libgz-math7-dev.install | 1 - jammy/debian/libgz-math7-eigen3-dev.install | 1 - jammy/debian/libgz-math7.install | 1 - .../debian/libgz-math8-dev.install | 0 .../debian/libgz-math8-eigen3-dev.install | 0 .../debian/libgz-math8.install | 0 jammy/debian/python3-gz-math7.install | 1 - .../debian/python3-gz-math8.install | 0 jammy/debian/ruby-gz-math7.install | 1 - .../debian/ruby-gz-math8.install | 0 ubuntu/debian/compat | 2 +- ubuntu/debian/control | 98 ++++--------------- ubuntu/debian/rules | 8 +- ubuntu/debian/tests/build | 2 +- 26 files changed, 28 insertions(+), 205 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/docs delete mode 120000 focal/debian/format delete mode 120000 focal/debian/rules delete mode 120000 focal/debian/source delete mode 120000 focal/debian/tests delete mode 120000 focal/debian/watch mode change 100644 => 120000 jammy/debian/compat delete mode 120000 jammy/debian/libgz-math7-dev.install delete mode 120000 jammy/debian/libgz-math7-eigen3-dev.install delete mode 120000 jammy/debian/libgz-math7.install rename focal/debian/libgz-math7-dev.install => jammy/debian/libgz-math8-dev.install (100%) rename focal/debian/libgz-math7-eigen3-dev.install => jammy/debian/libgz-math8-eigen3-dev.install (100%) rename focal/debian/libgz-math7.install => jammy/debian/libgz-math8.install (100%) delete mode 120000 jammy/debian/python3-gz-math7.install rename focal/debian/python3-gz-math7.install => jammy/debian/python3-gz-math8.install (100%) delete mode 120000 jammy/debian/ruby-gz-math7.install rename focal/debian/ruby-gz-math7.install => jammy/debian/ruby-gz-math8.install (100%) diff --git a/focal/debian/changelog b/focal/debian/changelog deleted file mode 100644 index 163be66..0000000 --- a/focal/debian/changelog +++ /dev/null @@ -1,54 +0,0 @@ -gz-math7 (7.3.0-1~focal) focal; urgency=medium - - * gz-math7 7.3.0-1 release - - -- Addisu Z. Taddese Tue, 29 Aug 2023 14:44:03 -0500 - -gz-math7 (7.2.0-1~focal) focal; urgency=medium - - * gz-math7 7.2.0-1 release - - -- Addisu Z. Taddese Wed, 14 Jun 2023 23:20:19 -0500 - -gz-math7 (7.1.0-1~focal) focal; urgency=medium - - * gz-math7 7.1.0-1 release - - -- Nate Koenig Tue, 15 Nov 2022 10:49:05 -0800 - -gz-math7 (7.0.2-1~focal) focal; urgency=medium - - * gz-math7 7.0.2-1 release - - -- Nate Koenig Mon, 26 Sep 2022 05:14:47 -0700 - -gz-math7 (7.0.1-1~focal) focal; urgency=medium - - * gz-math7 7.0.1-1 release - - -- Nate Koenig Fri, 23 Sep 2022 08:45:41 -0700 - -gz-math7 (7.0.0-1~focal) focal; urgency=medium - - * gz-math7 7.0.0-1 release - - -- Nate Koenig Thu, 22 Sep 2022 14:10:21 -0700 - -gz-math7 (7.0.0~pre2-1~focal) focal; urgency=medium - - * gz-math7 7.0.0~pre2-1 release - - -- Jose Luis Rivero Thu, 15 Sep 2022 18:02:34 +0200 - -gz-math7 (7.0.0~pre1-1~focal) focal; urgency=medium - - * gz-math7 7.0.0~pre1-1 release - - -- Louise Poubel Tue, 30 Aug 2022 11:57:06 -0700 - -gz-math7 (6.999.999-1~focal) focal; urgency=medium - - * Stub to be removed after first entry - - -- Louise Poubel Thu, 29 Oct 2020 11:21:29 -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/docs b/focal/debian/docs deleted file mode 120000 index 1220cdb..0000000 --- a/focal/debian/docs +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/docs \ 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/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/focal/debian/tests b/focal/debian/tests deleted file mode 120000 index 37e73de..0000000 --- a/focal/debian/tests +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/tests/ \ No newline at end of file diff --git a/focal/debian/watch b/focal/debian/watch deleted file mode 120000 index 40c9b2c..0000000 --- a/focal/debian/watch +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/watch \ No newline at end of file diff --git a/jammy/debian/changelog b/jammy/debian/changelog index d1e38bc..eb277dd 100644 --- a/jammy/debian/changelog +++ b/jammy/debian/changelog @@ -1,53 +1,6 @@ -gz-math7 (7.3.0-1~jammy) jammy; urgency=medium +gz-math8 (7.999.999-1~jammy) jammy; urgency=medium - * gz-math7 7.3.0-1 release + * Stub to be removed after first entry - -- Addisu Z. Taddese Tue, 29 Aug 2023 14:44:04 -0500 + -- Addisu Z. Taddese Mon, 09 Oct 2023 16:43:37 -0500 -gz-math7 (7.2.0-1~jammy) jammy; urgency=medium - - * gz-math7 7.2.0-1 release - - -- Addisu Z. Taddese Wed, 14 Jun 2023 23:20:19 -0500 - -gz-math7 (7.1.0-1~jammy) jammy; urgency=medium - - * gz-math7 7.1.0-1 release - - -- Nate Koenig Tue, 15 Nov 2022 10:49:05 -0800 - -gz-math7 (7.0.2-1~jammy) jammy; urgency=medium - - * gz-math7 7.0.2-1 release - - -- Nate Koenig Mon, 26 Sep 2022 05:14:47 -0700 - -gz-math7 (7.0.1-1~jammy) jammy; urgency=medium - - * gz-math7 7.0.1-1 release - - -- Nate Koenig Fri, 23 Sep 2022 08:45:41 -0700 - -gz-math7 (7.0.0-1~jammy) jammy; urgency=medium - - * gz-math7 7.0.0-1 release - - -- Nate Koenig Thu, 22 Sep 2022 14:10:21 -0700 - -gz-math7 (7.0.0~pre2-1~jammy) jammy; urgency=medium - - * gz-math7 7.0.0~pre2-1 release - - -- Jose Luis Rivero Thu, 15 Sep 2022 18:02:34 +0200 - -gz-math7 (7.0.0~pre1-1~jammy) jammy; urgency=medium - - * gz-math7 7.0.0~pre1-1 release - - -- Louise Poubel Tue, 30 Aug 2022 11:57:06 -0700 - -gz-math7 (6.999.999-1~jammy) jammy; urgency=medium - - * First release for jammy - - -- Jose Luis Rivero Fri, 11 Mar 2022 17:45:02 +0100 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/jammy/debian/libgz-math7-dev.install b/jammy/debian/libgz-math7-dev.install deleted file mode 120000 index fe86c23..0000000 --- a/jammy/debian/libgz-math7-dev.install +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/libgz-math-dev.install \ No newline at end of file diff --git a/jammy/debian/libgz-math7-eigen3-dev.install b/jammy/debian/libgz-math7-eigen3-dev.install deleted file mode 120000 index 69ba720..0000000 --- a/jammy/debian/libgz-math7-eigen3-dev.install +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/libgz-math-eigen3-dev.install \ No newline at end of file diff --git a/jammy/debian/libgz-math7.install b/jammy/debian/libgz-math7.install deleted file mode 120000 index 04c0165..0000000 --- a/jammy/debian/libgz-math7.install +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/libgz-math.install \ No newline at end of file diff --git a/focal/debian/libgz-math7-dev.install b/jammy/debian/libgz-math8-dev.install similarity index 100% rename from focal/debian/libgz-math7-dev.install rename to jammy/debian/libgz-math8-dev.install diff --git a/focal/debian/libgz-math7-eigen3-dev.install b/jammy/debian/libgz-math8-eigen3-dev.install similarity index 100% rename from focal/debian/libgz-math7-eigen3-dev.install rename to jammy/debian/libgz-math8-eigen3-dev.install diff --git a/focal/debian/libgz-math7.install b/jammy/debian/libgz-math8.install similarity index 100% rename from focal/debian/libgz-math7.install rename to jammy/debian/libgz-math8.install diff --git a/jammy/debian/python3-gz-math7.install b/jammy/debian/python3-gz-math7.install deleted file mode 120000 index 35d11ad..0000000 --- a/jammy/debian/python3-gz-math7.install +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/python3-gz-math.install \ No newline at end of file diff --git a/focal/debian/python3-gz-math7.install b/jammy/debian/python3-gz-math8.install similarity index 100% rename from focal/debian/python3-gz-math7.install rename to jammy/debian/python3-gz-math8.install diff --git a/jammy/debian/ruby-gz-math7.install b/jammy/debian/ruby-gz-math7.install deleted file mode 120000 index 71a6c05..0000000 --- a/jammy/debian/ruby-gz-math7.install +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/ruby-gz-math.install \ No newline at end of file diff --git a/focal/debian/ruby-gz-math7.install b/jammy/debian/ruby-gz-math8.install similarity index 100% rename from focal/debian/ruby-gz-math7.install rename to jammy/debian/ruby-gz-math8.install diff --git a/ubuntu/debian/compat b/ubuntu/debian/compat index 7f8f011..b1bd38b 100644 --- a/ubuntu/debian/compat +++ b/ubuntu/debian/compat @@ -1 +1 @@ -7 +13 diff --git a/ubuntu/debian/control b/ubuntu/debian/control index d3c3bf7..8eae448 100644 --- a/ubuntu/debian/control +++ b/ubuntu/debian/control @@ -1,14 +1,14 @@ -Source: gz-math7 +Source: gz-math8 Maintainer: Jose Luis Rivero Section: science Priority: extra Build-Depends: cmake, - debhelper (>= 11), + debhelper (>= 13), dh-python, doxygen, libeigen3-dev, - libgz-cmake3-dev, - libgz-utils2-dev, + libgz-cmake4-dev, + libgz-utils3-dev, python3, python3-dev, python3-distutils, @@ -22,13 +22,11 @@ Homepage: https://github.com/gazebo-release/gz-math XS-Ruby-Versions: all X-Python3-Version: >= 3.2 -Package: libgz-math7 +Package: libgz-math8 Architecture: any Section: libs Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libignition-math7 (<< 6.999.999+nightly+git20220630+1rd15c9b2c302f41dcb4acc039a830c8b1092627b2-1) -Replaces: libignition-math7 (<< 6.999.999+nightly+git20220630+1rd15c9b2c302f41dcb4acc039a830c8b1092627b2-1) Multi-Arch: same Description: Gazebo Math Library - Shared library A small, fast, and high performance math library. This library is a @@ -39,15 +37,13 @@ Description: Gazebo Math Library - Shared library encapsulate all the essentials, such as common math data types, console logging, 3D mesh management, and asynchronous message passing. -Package: libgz-math7-dev +Package: libgz-math8-dev Architecture: any Section: libdevel -Depends: libgz-math7 (= ${binary:Version}), - libgz-cmake3-dev, - libgz-utils2-dev, +Depends: libgz-math8 (= ${binary:Version}), + libgz-cmake4-dev, + libgz-utils3-dev, ${misc:Depends} -Breaks: libignition-math7-dev (<< 6.999.999+nightly+git20220630+1rd15c9b2c302f41dcb4acc039a830c8b1092627b2-1) -Replaces: libignition-math7-dev (<< 6.999.999+nightly+git20220630+1rd15c9b2c302f41dcb4acc039a830c8b1092627b2-1) Multi-Arch: same Description: Gazebo Math Library - Development files A small, fast, and high performance math library. This library is a @@ -58,14 +54,12 @@ Description: Gazebo Math Library - Development files encapsulate all the essentials, such as common math data types, console logging, 3D mesh management, and asynchronous message passing. -Package: libgz-math7-eigen3-dev +Package: libgz-math8-eigen3-dev Architecture: any Section: libdevel -Depends: libgz-math7-dev (= ${binary:Version}), +Depends: libgz-math8-dev (= ${binary:Version}), libeigen3-dev, ${misc:Depends} -Breaks: libignition-math7-eigen-dev (<< 6.999.999+nightly+git20220630+1rd15c9b2c302f41dcb4acc039a830c8b1092627b2-1) -Replaces: libignition-math7-eigen-dev (<< 6.999.999+nightly+git20220630+1rd15c9b2c302f41dcb4acc039a830c8b1092627b2-1) Multi-Arch: same Description: Gazebo Math Library - Eigen3 Development files A small, fast, and high performance math library. This library is a @@ -78,16 +72,14 @@ Description: Gazebo Math Library - Eigen3 Development files . The package contains the development files relative to Eigen -Package: python3-gz-math7 +Package: python3-gz-math8 Architecture: any -Depends: libgz-math7 (= ${binary:Version}), +Depends: libgz-math8 (= ${binary:Version}), python3-distutils, python3-pybind11, ${misc:Depends}, ${python3:Depends} -Breaks: python3-ignition-math7 (<< 6.999.999+nightly+git20220630+1rd15c9b2c302f41dcb4acc039a830c8b1092627b2-1) -Replaces: python3-ignition-math7 (<< 6.999.999+nightly+git20220630+1rd15c9b2c302f41dcb4acc039a830c8b1092627b2-1) -Enhances: libgz-math7 +Enhances: libgz-math8 Description: Gazebo Math Library - Python3 bindings A small, fast, and high performance math library. This library is a self-contained set of classes and functions suitable for robot applications. @@ -99,16 +91,14 @@ Description: Gazebo Math Library - Python3 bindings . The package contains the Python3 bindings. -Package: ruby-gz-math7 +Package: ruby-gz-math8 Architecture: any XB-Ruby-Versions: ${ruby:Versions} -Depends: libgz-math7 (= ${binary:Version}), +Depends: libgz-math8 (= ${binary:Version}), ${misc:Depends}, ${ruby:Depends}, ${shlibs:Depends} -Breaks: ruby-ignition-math7 (<< 6.999.999+nightly+git20220630+1rd15c9b2c302f41dcb4acc039a830c8b1092627b2-1) -Replaces: ruby-ignition-math7 (<< 6.999.999+nightly+git20220630+1rd15c9b2c302f41dcb4acc039a830c8b1092627b2-1) -Enhances: libgz-math7 +Enhances: libgz-math8 Description: Gazebo Math Library - Ruby bindings A small, fast, and high performance math library. This library is a self-contained set of classes and functions suitable for robot applications. @@ -120,15 +110,13 @@ Description: Gazebo Math Library - Ruby bindings . The package contains the Ruby bindings. -Package: libgz-math7-dbg +Package: libgz-math8-dbg Architecture: any Section: debug Priority: extra Depends: - libgz-math7 (= ${binary:Version}), + libgz-math8 (= ${binary:Version}), ${misc:Depends} -Breaks: libignition-math7-dbg (<< 6.999.999+nightly+git20220630+1rd15c9b2c302f41dcb4acc039a830c8b1092627b2-1) -Replaces: libignition-math7-dbg (<< 6.999.999+nightly+git20220630+1rd15c9b2c302f41dcb4acc039a830c8b1092627b2-1) Multi-Arch: same Description: Gazebo Math Library - Debugging symbols A small, fast, and high performance math library. This library is a @@ -138,51 +126,3 @@ Description: Gazebo Math Library - Debugging symbols functionality to bootstrap robot applications. The included libraries encapsulate all the essentials, such as common math data types, console logging, 3D mesh management, and asynchronous message passing. - -Package: libignition-math7 -Depends: libgz-math7, ${misc:Depends} -Architecture: all -Priority: optional -Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. - -Package: libignition-math7-dev -Depends: libgz-math7-dev, ${misc:Depends} -Architecture: all -Priority: optional -Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. - -Package: libignition-math7-eigen3-dev -Depends: libgz-math7-eigen3-dev, ${misc:Depends} -Architecture: all -Priority: optional -Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. - -Package: python3-ignition-math7 -Depends: python3-gz-math7, ${misc:Depends} -Architecture: all -Priority: optional -Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. - -Package: ruby-ignition-math7 -Depends: ruby-gz-math7, ${misc:Depends} -Architecture: all -Priority: optional -Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. - -Package: libignition-math7-dbg -Depends: libgz-math7-dbg, ${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/rules b/ubuntu/debian/rules index 9c44061..fe52aab 100755 --- a/ubuntu/debian/rules +++ b/ubuntu/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -export PYBUILD_NAME=ignition-math7 - DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) .PHONY: override_dh_auto_configure \ @@ -20,13 +18,13 @@ override_dh_auto_configure: -DUSE_SYSTEM_PATHS_FOR_RUBY_INSTALLATION=ON override_dh_strip: - dh_strip -a --dbg-package=libgz-math7-dbg + dh_strip -a --dbg-package=libgz-math8-dbg override_dh_install: dh_install # remove duplicate eigen files from mathx-dev.install regexp - cd debian/libgz-math7-eigen3-dev; find . -type f -exec rm -f ../libgz-math7-dev/{} \; - find debian/libgz-math7-dev -type d -empty -delete + cd debian/libgz-math8-eigen3-dev; find . -type f -exec rm -f ../libgz-math8-dev/{} \; + find debian/libgz-math8-dev -type d -empty -delete override_dh_auto_test: ifeq ($(DEB_HOST_ARCH),armhf) diff --git a/ubuntu/debian/tests/build b/ubuntu/debian/tests/build index 7b06acd..27a12d5 100755 --- a/ubuntu/debian/tests/build +++ b/ubuntu/debian/tests/build @@ -76,7 +76,7 @@ int main(int argc, char **argv) } EOF -g++ -o gztest gztest.c `pkg-config --cflags --libs gz-math7` +g++ -o gztest gztest.c `pkg-config --cflags --libs gz-math8` echo "build: OK" [ -x gztest ] ./gztest