From 55a42c6325992b3d42bfaaef00ad405bd4711236 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Wed, 31 Aug 2022 16:39:52 -0500 Subject: [PATCH 1/2] Install bash completion, move CLI scripts to non-dev package Signed-off-by: Addisu Z. Taddese --- focal/debian/gz-sim7-cli.install | 1 + jammy/gz-sim7-cli.install | 1 + ubuntu/debian/control | 21 +++++++++++++++++++++ ubuntu/debian/gz-sim7-cli.install | 4 ++++ ubuntu/debian/libgz-sim-dev.install | 4 ---- 5 files changed, 27 insertions(+), 4 deletions(-) create mode 120000 focal/debian/gz-sim7-cli.install create mode 120000 jammy/gz-sim7-cli.install create mode 100644 ubuntu/debian/gz-sim7-cli.install diff --git a/focal/debian/gz-sim7-cli.install b/focal/debian/gz-sim7-cli.install new file mode 120000 index 0000000..016ecdc --- /dev/null +++ b/focal/debian/gz-sim7-cli.install @@ -0,0 +1 @@ +../../ubuntu/debian/gz-sim7-cli.install \ No newline at end of file diff --git a/jammy/gz-sim7-cli.install b/jammy/gz-sim7-cli.install new file mode 120000 index 0000000..016ecdc --- /dev/null +++ b/jammy/gz-sim7-cli.install @@ -0,0 +1 @@ +../../ubuntu/debian/gz-sim7-cli.install \ No newline at end of file diff --git a/ubuntu/debian/control b/ubuntu/debian/control index e56b385..68eb234 100644 --- a/ubuntu/debian/control +++ b/ubuntu/debian/control @@ -43,6 +43,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, qml-module-qtqml-models2 +Suggests: gz-sim7-cli Breaks: libignition-gazebo7 (<< 6.999.999+nightly+git20220630+2rcb61c01f8894e4f435f544d3511f346eaa753142-2) Replaces: libignition-gazebo7 (<< 6.999.999+nightly+git20220630+2rcb61c01f8894e4f435f544d3511f346eaa753142-2) Multi-Arch: same @@ -52,6 +53,18 @@ Description: Gazebo Sim classes and functions for robot apps - Shared library . Main shared library +Package: gz-sim7-cli +Architecture: any +Depends: libgz-sim7 (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Multi-Arch: no +Description: Gazebo Sim classes and functions for robot apps - CLI + Gazebo Sim is a component in the Gazebo framework, a set of libraries + designed to rapidly develop robot applications. + . + The package ships the CLI. + Package: libgz-sim7-plugins Architecture: any Section: libs @@ -141,6 +154,14 @@ Section: oldlibs Description: transitional package This is a transitional package. It can safely be removed. +Package: ignition-gazebo7-cli +Depends: gz-sim7-cli, ${misc:Depends} +Architecture: all +Priority: optional +Section: oldlibs +Description: transitional package + This is a transitional package. It can safely be removed. + Package: libignition-gazebo7-plugins Depends: libgz-sim7-plugins, ${misc:Depends} Architecture: all diff --git a/ubuntu/debian/gz-sim7-cli.install b/ubuntu/debian/gz-sim7-cli.install new file mode 100644 index 0000000..75225f7 --- /dev/null +++ b/ubuntu/debian/gz-sim7-cli.install @@ -0,0 +1,4 @@ +usr/lib/ruby/gz/*.rb +usr/share/*/*[0-99].yaml +usr/share/*/model[0-99].yaml +usr/share/gz/*.completion*/* diff --git a/ubuntu/debian/libgz-sim-dev.install b/ubuntu/debian/libgz-sim-dev.install index 464df8d..3ccf13d 100644 --- a/ubuntu/debian/libgz-sim-dev.install +++ b/ubuntu/debian/libgz-sim-dev.install @@ -3,7 +3,3 @@ usr/lib/*/*.so usr/lib/*/pkgconfig/*.pc usr/lib/*/cmake/*-*/* # usr/share/*/*-*[0-99]/*-*[0-99].tag.xml -usr/share/*/*[0-99].yaml -usr/share/*/model[0-99].yaml -usr/lib/ruby/*/cmdsim[0-99].rb -usr/lib/ruby/*/cmdmodel[0-99].rb From 0b655fc835e25d9e25918336c8195b4bf2c09ddf Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Mon, 19 Sep 2022 20:43:36 +0200 Subject: [PATCH 2/2] Fix cli files --- focal/debian/gz-sim7-cli.install | 2 +- jammy/debian/gz-sim7-cli.install | 1 + jammy/gz-sim7-cli.install | 1 - ubuntu/debian/{gz-sim7-cli.install => gz-sim-cli.install} | 0 4 files changed, 2 insertions(+), 2 deletions(-) create mode 120000 jammy/debian/gz-sim7-cli.install delete mode 120000 jammy/gz-sim7-cli.install rename ubuntu/debian/{gz-sim7-cli.install => gz-sim-cli.install} (100%) diff --git a/focal/debian/gz-sim7-cli.install b/focal/debian/gz-sim7-cli.install index 016ecdc..17de531 120000 --- a/focal/debian/gz-sim7-cli.install +++ b/focal/debian/gz-sim7-cli.install @@ -1 +1 @@ -../../ubuntu/debian/gz-sim7-cli.install \ No newline at end of file +../../ubuntu/debian/gz-sim-cli.install \ No newline at end of file diff --git a/jammy/debian/gz-sim7-cli.install b/jammy/debian/gz-sim7-cli.install new file mode 120000 index 0000000..17de531 --- /dev/null +++ b/jammy/debian/gz-sim7-cli.install @@ -0,0 +1 @@ +../../ubuntu/debian/gz-sim-cli.install \ No newline at end of file diff --git a/jammy/gz-sim7-cli.install b/jammy/gz-sim7-cli.install deleted file mode 120000 index 016ecdc..0000000 --- a/jammy/gz-sim7-cli.install +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/gz-sim7-cli.install \ No newline at end of file diff --git a/ubuntu/debian/gz-sim7-cli.install b/ubuntu/debian/gz-sim-cli.install similarity index 100% rename from ubuntu/debian/gz-sim7-cli.install rename to ubuntu/debian/gz-sim-cli.install