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_sdformat15 #1

Merged
merged 4 commits into from
Oct 17, 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
29 changes: 3 additions & 26 deletions jammy/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,29 +1,6 @@
sdformat14 (14.0.0-1~jammy) jammy; urgency=medium

* sdformat14 14.0.0-1 release

-- Addisu Z. Taddese <[email protected]> Fri, 29 Sep 2023 13:10:45 -0500

sdformat14 (14.0.0~pre3-1~jammy) jammy; urgency=medium

* sdformat14 14.0.0~pre3-1 release

-- Addisu Z. Taddese <[email protected]> Wed, 27 Sep 2023 21:09:47 -0500

sdformat14 (14.0.0~pre2-1~jammy) jammy; urgency=medium

* sdformat14 14.0.0~pre2-1 release

-- Addisu Z. Taddese <[email protected]> Wed, 30 Aug 2023 20:48:31 -0500

sdformat14 (14.0.0~pre1-1~jammy) jammy; urgency=medium

* sdformat14 14.0.0~pre1-1 release

-- Ian Chen <[email protected]> Wed, 30 Aug 2023 22:03:18 +0000

sdformat14 (13.999.999-1~jammy) jammy; urgency=medium
sdformat15 (14.999.999-1~jammy) jammy; urgency=medium

* Stub to be removed after first entry

-- Addisu Taddese <[email protected]> Tue, 1 Aug 2023 12:00:00 +0100
-- Addisu Z. Taddese <[email protected]> Wed, 11 Oct 2023 13:38:51 -0500

File renamed without changes.
60 changes: 22 additions & 38 deletions ubuntu/debian/control
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Source: sdformat14
Source: sdformat15
Maintainer: Jose Luis Rivero <[email protected]>
Section: science
Priority: optional
Build-Depends: cmake,
debhelper (>= 11),
debhelper (>= 13),
dh-python,
libtinyxml2-dev,
doxygen,
Expand All @@ -13,31 +13,23 @@ Build-Depends: cmake,
python3-pybind11,
python3-dev,
libgz-tools2-dev,
libgz-math7-dev,
python3-gz-math7,
libgz-utils2-cli-dev,
libgz-utils2-dev
Vcs-Browser: https://github.com/gazebo-release/sdformat14-release
Vcs-Git: https://github.com/gazebo-release/sdformat14-release
libgz-math8-dev,
python3-gz-math8,
libgz-utils3-cli-dev,
libgz-utils3-dev
Vcs-Browser: https://github.com/gazebo-release/sdformat15-release
Vcs-Git: https://github.com/gazebo-release/sdformat15-release
Standards-Version: 4.5.1
Homepage: http://sdformat.org

Package: libsdformat14
Package: libsdformat15
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: sdformat14-sdf (>= ${source:Version}),
Depends: sdformat15-sdf (>= ${source:Version}),
${shlibs:Depends},
${misc:Depends}
Multi-Arch: same
Breaks: libsdformat2,
libsdformat3,
libsdformat4,
libsdformat5
Replaces: libsdformat2,
libsdformat3,
libsdformat4,
libsdformat5
Description: Simulation Description Format (SDF) parser - Shared library
SDF is an XML file format that describes environments, objects, and robots
in a manner suitable for robotic applications. SDF is capable of representing
Expand All @@ -47,24 +39,16 @@ Description: Simulation Description Format (SDF) parser - Shared library
allows conversion from previous versions. A parser is also contained within
this package that reads SDF files and returns a C++ interface.

Package: libsdformat14-dev
Package: libsdformat15-dev
Architecture: any
Section: libdevel
Depends: libtinyxml2-dev,
libgz-tools2-dev,
libgz-math7-dev,
libgz-utils2-cli-dev,
libgz-utils2-dev,
libsdformat14 (= ${binary:Version}),
libgz-math8-dev,
libgz-utils3-cli-dev,
libgz-utils3-dev,
libsdformat15 (= ${binary:Version}),
${misc:Depends}
Breaks: libsdformat2-dev,
libsdformat3-dev,
libsdformat4-dev,
libsdformat5-dev
Replaces: libsdformat2-dev,
libsdformat3-dev,
libsdformat4-dev,
libsdformat5-dev
Multi-Arch: same
Description: Simulation Description Format (SDF) parser - Development files
SDF is an XML file format that describes environments, objects, and robots
Expand All @@ -75,7 +59,7 @@ Description: Simulation Description Format (SDF) parser - Development files
allows conversion from previous versions. A parser is also contained within
this package that reads SDF files and returns a C++ interface.

Package: sdformat14-sdf
Package: sdformat15-sdf
Architecture: all
Section: libdevel
Depends: ${misc:Depends}
Expand All @@ -93,12 +77,12 @@ Description: Simulation Description Format (SDF) parser - SDF files
This package contains SDF (Simulation Description Format) XML files needed by
the libsdformat.

Package: python3-sdformat14
Package: python3-sdformat15
Architecture: any
Depends: ${misc:Depends},
python3-gz-math7,
python3-gz-math8,
${python3:Depends}
Enhances: libsdformat14
Enhances: libsdformat15
Description: Simulation Description Format (SDF) parser - SDF files
SDF is an XML file format that describes environments, objects, and robots
in a manner suitable for robotic applications. SDF is capable of representing
Expand All @@ -110,12 +94,12 @@ Description: Simulation Description Format (SDF) parser - SDF files
.
This package contains the Python bindings for SDFormat

Package: libsdformat14-dbg
Package: libsdformat15-dbg
Architecture: any
Section: debug
Priority: extra
Depends:
libsdformat14 (= ${binary:Version}),
libsdformat15 (= ${binary:Version}),
${misc:Depends}
Multi-Arch: same
Description: Simulation Description Format (SDF) parser - Debugging symbols
Expand All @@ -127,7 +111,7 @@ Description: Simulation Description Format (SDF) parser - Debugging symbols
allows conversion from previous versions. A parser is also contained within
this package that reads SDF files and returns a C++ interface.

Package: sdformat14-doc
Package: sdformat15-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}, libjs-jquery
Expand Down
2 changes: 1 addition & 1 deletion ubuntu/debian/libsdformat-dev.install
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
usr/include/*
usr/lib/*/*.so
usr/lib/*/pkgconfig/*.pc
usr/lib/*/cmake/sdformat14*/*
usr/lib/*/cmake/sdformat15*/*
4 changes: 2 additions & 2 deletions ubuntu/debian/rules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# -*- makefile -*-

export PYBUILD_NAME=sdformat14
export PYBUILD_NAME=sdformat15

override_dh_auto_configure:
dh_auto_configure -- \
Expand All @@ -18,7 +18,7 @@ execute_after_dh_auto_build-indep:
dh_auto_build -- doc # Generate documentation

override_dh_strip:
dh_strip -a --dbg-package=libsdformat14-dbg
dh_strip -a --dbg-package=libsdformat15-dbg

%:
dh $@ --with-python3
6 changes: 3 additions & 3 deletions ubuntu/debian/tests/build
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ int main()
}
EOF

g++ -o sdformattest sdformattest.cc `pkg-config --cflags --libs sdformat14`
g++ -o sdformattest sdformattest.cc `pkg-config --cflags --libs sdformat15`
echo "build pkgconfig: OK"
[ -x sdformattest ]
./sdformattest
Expand All @@ -32,11 +32,11 @@ cmake_minimum_required(VERSION 3.5)

project(sdf_test VERSION 1.0.0)

find_package(sdformat14 14.0.0 REQUIRED)
find_package(sdformat15 15.0.0 REQUIRED)
add_executable(sdftest sdformattest.cc)
target_link_libraries(sdftest
PUBLIC
sdformat14::sdformat14)
sdformat15::sdformat15)
EOF

cmake .
Expand Down