From 2a1ac7a8a5a1f55da8bf0de8ac5663b1c4824fa7 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 12 Oct 2023 18:02:38 -0500 Subject: [PATCH] Bumps in ionic: gz-utils3 (#1) Signed-off-by: Addisu Z. Taddese --- focal/debian/changelog | 30 -------- 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/watch | 1 - jammy/debian/changelog | 27 +------ jammy/debian/libgz-utils2-cli-dev.install | 1 - jammy/debian/libgz-utils2-dev.install | 1 - jammy/debian/libgz-utils2.install | 1 - .../debian/libgz-utils3-cli-dev.install | 0 .../debian/libgz-utils3-dev.install | 0 .../debian/libgz-utils3.install | 0 ubuntu/debian/compat | 2 +- ubuntu/debian/control | 70 ++++--------------- ubuntu/debian/rules | 6 +- 19 files changed, 20 insertions(+), 126 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/watch delete mode 120000 jammy/debian/libgz-utils2-cli-dev.install delete mode 120000 jammy/debian/libgz-utils2-dev.install delete mode 120000 jammy/debian/libgz-utils2.install rename focal/debian/libgz-utils2-cli-dev.install => jammy/debian/libgz-utils3-cli-dev.install (100%) rename focal/debian/libgz-utils2-dev.install => jammy/debian/libgz-utils3-dev.install (100%) rename focal/debian/libgz-utils2.install => jammy/debian/libgz-utils3.install (100%) diff --git a/focal/debian/changelog b/focal/debian/changelog deleted file mode 100644 index f2286fc..0000000 --- a/focal/debian/changelog +++ /dev/null @@ -1,30 +0,0 @@ -gz-utils2 (2.1.0-1~focal) focal; urgency=medium - - * gz-utils2 2.1.0-1 release - - -- Addisu Z. Taddese Tue, 26 Sep 2023 14:41:55 -0500 - -gz-utils2 (2.0.0-1~focal) focal; urgency=medium - - * gz-utils2 2.0.0-1 release - - -- Nate Koenig Thu, 22 Aug 2022 10:22:15 -0700 - -gz-utils2 (2.0.0~pre2-1~focal) focal; urgency=medium - - * gz-utils2 2.0.0~pre2-1 release - - -- Louise Poubel Tue, 30 Aug 2022 14:45:31 -0700 - -gz-utils2 (2.0.0~pre1-1~focal) focal; urgency=medium - - * gz-utils2 2.0.0~pre1-1 release - - -- Louise Poubel Tue, 30 Aug 2022 10:51:07 -0700 - -gz-utils2 (1.999.999-1~focal) focal; urgency=medium - - * Stub to be removed after first entry - - -- Louise Poubel Mon, 05 Apr 2021 18:59:59 -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/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 f5cecaa..44a6771 100644 --- a/jammy/debian/changelog +++ b/jammy/debian/changelog @@ -1,27 +1,6 @@ -gz-utils2 (2.1.0-1~jammy) jammy; urgency=medium +gz-utils3 (2.999.999-1~jammy) jammy; urgency=medium - * gz-utils2 2.1.0-1 release - - -- Addisu Z. Taddese Tue, 26 Sep 2023 14:41:55 -0500 - -gz-utils2 (2.0.0-1~jammy) jammy; urgency=medium - - * gz-utils2 2.0.0-1 release - - -- Nate Koenig Thu, 22 Aug 2022 10:22:15 -0700 - -gz-utils2 (2.0.0~pre2-1~jammy) jammy; urgency=medium - - * gz-utils2 2.0.0~pre2-1 release - - -- Louise Poubel Tue, 30 Aug 2022 14:45:30 -0700 - -gz-utils2 (2.0.0~pre1-1~jammy) jammy; urgency=medium - - * gz-utils2 2.0.0~pre1-1 release - - -- Louise Poubel Tue, 30 Aug 2022 10:51:07 -0700 + * Stub to be removed after first entry -gz-utils2 (1.999.999-1~jammy) jammy; urgency=medium + -- Addisu Z. Taddese Thu, 12 Oct 2023 17:40:34 -0500 - * Stub to be removed after first entry diff --git a/jammy/debian/libgz-utils2-cli-dev.install b/jammy/debian/libgz-utils2-cli-dev.install deleted file mode 120000 index cff06d7..0000000 --- a/jammy/debian/libgz-utils2-cli-dev.install +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/libgz-utils-cli-dev.install \ No newline at end of file diff --git a/jammy/debian/libgz-utils2-dev.install b/jammy/debian/libgz-utils2-dev.install deleted file mode 120000 index 729f0c5..0000000 --- a/jammy/debian/libgz-utils2-dev.install +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/libgz-utils-dev.install \ No newline at end of file diff --git a/jammy/debian/libgz-utils2.install b/jammy/debian/libgz-utils2.install deleted file mode 120000 index 45ef19f..0000000 --- a/jammy/debian/libgz-utils2.install +++ /dev/null @@ -1 +0,0 @@ -../../ubuntu/debian/libgz-utils.install \ No newline at end of file diff --git a/focal/debian/libgz-utils2-cli-dev.install b/jammy/debian/libgz-utils3-cli-dev.install similarity index 100% rename from focal/debian/libgz-utils2-cli-dev.install rename to jammy/debian/libgz-utils3-cli-dev.install diff --git a/focal/debian/libgz-utils2-dev.install b/jammy/debian/libgz-utils3-dev.install similarity index 100% rename from focal/debian/libgz-utils2-dev.install rename to jammy/debian/libgz-utils3-dev.install diff --git a/focal/debian/libgz-utils2.install b/jammy/debian/libgz-utils3.install similarity index 100% rename from focal/debian/libgz-utils2.install rename to jammy/debian/libgz-utils3.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 bf4ef2c..61b5922 100644 --- a/ubuntu/debian/control +++ b/ubuntu/debian/control @@ -1,91 +1,47 @@ -Source: gz-utils2 +Source: gz-utils3 Standards-Version: 3.9.4 Maintainer: Jose Luis Rivero Section: science Priority: extra Build-Depends: cmake, - debhelper (>= 7.0.50~), + debhelper (>= 13), doxygen, - libgz-cmake3-dev -Vcs-Browser: https://github.com/gazebosim/gz-utils2-release -Vcs-Git: https://github.com/gazebosim/gz-utils2-release + libgz-cmake4-dev +Vcs-Browser: https://github.com/gazebosim/gz-utils3-release +Vcs-Git: https://github.com/gazebosim/gz-utils3-release Homepage: https://github.com/gazebosim/gz-utils -Package: libgz-utils2 +Package: libgz-utils3 Architecture: any Section: libs Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libignition-utils2 (<< 1.999.999+nightly+git20220630+1rd31f0939fcca1c2866424544de56348fe0318865-1) -Replaces: libignition-utils2 (<< 1.999.999+nightly+git20220630+1rd31f0939fcca1c2866424544de56348fe0318865-1), - libignition-utils (<< 1.0.0) Multi-Arch: same -Provides: libignition-utils Description: Gazebo Utils Library - Shared library -Package: libgz-utils2-dev +Package: libgz-utils3-dev Architecture: any Section: libdevel -Depends: libgz-utils2 (= ${binary:Version}), - libgz-cmake3-dev, +Depends: libgz-utils3 (= ${binary:Version}), + libgz-cmake4-dev, ${misc:Depends} -Breaks: libignition-utils2-dev (<< 1.999.999+nightly+git20220630+1rd31f0939fcca1c2866424544de56348fe0318865-1), - libignition-utils-dev (<< 1.0.0) -Replaces: libignition-utils2-dev (<< 1.999.999+nightly+git20220630+1rd31f0939fcca1c2866424544de56348fe0318865-1), - libignition-utils-dev (<< 1.0.0) Multi-Arch: same Description: Gazebo Utils Library - Development files -Package: libgz-utils2-cli-dev +Package: libgz-utils3-cli-dev Architecture: any Section: libdevel -Depends: libgz-utils2-dev (= ${binary:Version}), +Depends: libgz-utils3-dev (= ${binary:Version}), ${misc:Depends} -Breaks: libignition-utils2-cli-dev (<< 1.999.999+nightly+git20220630+1rd31f0939fcca1c2866424544de56348fe0318865-1) -Replaces: libignition-utils2-cli-dev (<< 1.999.999+nightly+git20220630+1rd31f0939fcca1c2866424544de56348fe0318865-1) Multi-Arch: same Description: Gazebo Utils Library - CLI Development files -Package: libgz-utils2-dbg +Package: libgz-utils3-dbg Architecture: any Section: debug Priority: extra Depends: - libgz-utils2 (= ${binary:Version}), + libgz-utils3 (= ${binary:Version}), ${misc:Depends} -Breaks: libignition-utils2-dbg (<< 1.999.999+nightly+git20220630+1rd31f0939fcca1c2866424544de56348fe0318865-1) -Replaces: libignition-utils2-dbg (<< 1.999.999+nightly+git20220630+1rd31f0939fcca1c2866424544de56348fe0318865-1) Multi-Arch: same Description: Gazebo Utils Library - Debugging symbols - -Package: libignition-utils2 -Depends: libgz-utils2, ${misc:Depends} -Architecture: all -Priority: optional -Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. - -Package: libignition-utils2-dev -Depends: libgz-utils2-dev, ${misc:Depends} -Architecture: all -Priority: optional -Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. - -Package: libignition-utils2-cli-dev -Depends: libgz-utils2-cli-dev, ${misc:Depends} -Architecture: all -Priority: optional -Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. - -Package: libignition-utils2-dbg -Depends: libgz-utils2-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 78a72df..0174730 100755 --- a/ubuntu/debian/rules +++ b/ubuntu/debian/rules @@ -15,13 +15,13 @@ override_dh_auto_configure: -DCMAKE_BUILD_TYPE=RelWithDebInfo override_dh_strip: - dh_strip -a --dbg-package=libgz-utils2-dbg + dh_strip -a --dbg-package=libgz-utils3-dbg override_dh_install: dh_install # remove duplicate cli files from utilsx-dev.install regexp - cd debian/libgz-utils2-cli-dev; find . -type f -exec rm -f ../libgz-utils2-dev/{} \; - find debian/libgz-utils2-dev -type d -empty -delete + cd debian/libgz-utils3-cli-dev; find . -type f -exec rm -f ../libgz-utils3-dev/{} \; + find debian/libgz-utils3-dev -type d -empty -delete override_dh_auto_test: ifeq ($(DEB_HOST_ARCH),armhf)