Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumps in ionic : ci_matching_branch/bump_ionic_gz-math8 #1

Merged
merged 1 commit into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions focal/debian/changelog

This file was deleted.

1 change: 0 additions & 1 deletion focal/debian/compat

This file was deleted.

1 change: 0 additions & 1 deletion focal/debian/control

This file was deleted.

1 change: 0 additions & 1 deletion focal/debian/copyright

This file was deleted.

1 change: 0 additions & 1 deletion focal/debian/docs

This file was deleted.

1 change: 0 additions & 1 deletion focal/debian/format

This file was deleted.

1 change: 0 additions & 1 deletion focal/debian/rules

This file was deleted.

1 change: 0 additions & 1 deletion focal/debian/source

This file was deleted.

1 change: 0 additions & 1 deletion focal/debian/tests

This file was deleted.

1 change: 0 additions & 1 deletion focal/debian/watch

This file was deleted.

53 changes: 3 additions & 50 deletions jammy/debian/changelog
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> Tue, 29 Aug 2023 14:44:04 -0500
-- Addisu Z. Taddese <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Fri, 11 Mar 2022 17:45:02 +0100
1 change: 0 additions & 1 deletion jammy/debian/compat

This file was deleted.

1 change: 1 addition & 0 deletions jammy/debian/compat
1 change: 0 additions & 1 deletion jammy/debian/libgz-math7-dev.install

This file was deleted.

1 change: 0 additions & 1 deletion jammy/debian/libgz-math7-eigen3-dev.install

This file was deleted.

1 change: 0 additions & 1 deletion jammy/debian/libgz-math7.install

This file was deleted.

File renamed without changes.
1 change: 0 additions & 1 deletion jammy/debian/python3-gz-math7.install

This file was deleted.

1 change: 0 additions & 1 deletion jammy/debian/ruby-gz-math7.install

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion ubuntu/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7
13
98 changes: 19 additions & 79 deletions ubuntu/debian/control
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Source: gz-math7
Source: gz-math8
Maintainer: Jose Luis Rivero <[email protected]>
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,
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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.
Expand All @@ -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.
Expand All @@ -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
Expand All @@ -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.
8 changes: 3 additions & 5 deletions ubuntu/debian/rules
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ubuntu/debian/tests/build
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down