From fc4acc61cb2a475731f47046daf14f597513f49b Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 18 Jan 2022 17:46:20 -0800 Subject: [PATCH 1/4] geospatial component Follow-up to ignitionrobotics/ign-common#267 Signed-off-by: Steve Peters --- ...libignition-common5-geospatial-dev.install | 1 + .../libignition-common5-geospatial.install | 1 + ...libignition-common5-geospatial-dev.install | 1 + .../libignition-common5-geospatial.install | 1 + ...libignition-common5-geospatial-dev.install | 1 + .../libignition-common5-geospatial.install | 1 + ...libignition-common5-geospatial-dev.install | 1 + .../libignition-common5-geospatial.install | 1 + ubuntu/debian/control | 41 +++++++++++++++++-- .../libignition-common-geospatial-dev.install | 5 +++ .../libignition-common-geospatial.install | 1 + 11 files changed, 52 insertions(+), 3 deletions(-) create mode 120000 bionic/debian/libignition-common5-geospatial-dev.install create mode 120000 bionic/debian/libignition-common5-geospatial.install create mode 120000 debian/buster/debian/libignition-common5-geospatial-dev.install create mode 120000 debian/buster/debian/libignition-common5-geospatial.install create mode 120000 debian/sid/debian/libignition-common5-geospatial-dev.install create mode 120000 debian/sid/debian/libignition-common5-geospatial.install create mode 120000 focal/debian/libignition-common5-geospatial-dev.install create mode 120000 focal/debian/libignition-common5-geospatial.install create mode 100644 ubuntu/debian/libignition-common-geospatial-dev.install create mode 100644 ubuntu/debian/libignition-common-geospatial.install diff --git a/bionic/debian/libignition-common5-geospatial-dev.install b/bionic/debian/libignition-common5-geospatial-dev.install new file mode 120000 index 0000000..0833735 --- /dev/null +++ b/bionic/debian/libignition-common5-geospatial-dev.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-common-geospatial-dev.install \ No newline at end of file diff --git a/bionic/debian/libignition-common5-geospatial.install b/bionic/debian/libignition-common5-geospatial.install new file mode 120000 index 0000000..20e008c --- /dev/null +++ b/bionic/debian/libignition-common5-geospatial.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-common-geospatial.install \ No newline at end of file diff --git a/debian/buster/debian/libignition-common5-geospatial-dev.install b/debian/buster/debian/libignition-common5-geospatial-dev.install new file mode 120000 index 0000000..be0a83c --- /dev/null +++ b/debian/buster/debian/libignition-common5-geospatial-dev.install @@ -0,0 +1 @@ +../../../ubuntu/debian/libignition-common-geospatial-dev.install \ No newline at end of file diff --git a/debian/buster/debian/libignition-common5-geospatial.install b/debian/buster/debian/libignition-common5-geospatial.install new file mode 120000 index 0000000..a6a8abb --- /dev/null +++ b/debian/buster/debian/libignition-common5-geospatial.install @@ -0,0 +1 @@ +../../../ubuntu/debian/libignition-common-geospatial.install \ No newline at end of file diff --git a/debian/sid/debian/libignition-common5-geospatial-dev.install b/debian/sid/debian/libignition-common5-geospatial-dev.install new file mode 120000 index 0000000..be0a83c --- /dev/null +++ b/debian/sid/debian/libignition-common5-geospatial-dev.install @@ -0,0 +1 @@ +../../../ubuntu/debian/libignition-common-geospatial-dev.install \ No newline at end of file diff --git a/debian/sid/debian/libignition-common5-geospatial.install b/debian/sid/debian/libignition-common5-geospatial.install new file mode 120000 index 0000000..a6a8abb --- /dev/null +++ b/debian/sid/debian/libignition-common5-geospatial.install @@ -0,0 +1 @@ +../../../ubuntu/debian/libignition-common-geospatial.install \ No newline at end of file diff --git a/focal/debian/libignition-common5-geospatial-dev.install b/focal/debian/libignition-common5-geospatial-dev.install new file mode 120000 index 0000000..0833735 --- /dev/null +++ b/focal/debian/libignition-common5-geospatial-dev.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-common-geospatial-dev.install \ No newline at end of file diff --git a/focal/debian/libignition-common5-geospatial.install b/focal/debian/libignition-common5-geospatial.install new file mode 120000 index 0000000..20e008c --- /dev/null +++ b/focal/debian/libignition-common5-geospatial.install @@ -0,0 +1 @@ +../../ubuntu/debian/libignition-common-geospatial.install \ No newline at end of file diff --git a/ubuntu/debian/control b/ubuntu/debian/control index 244fd92..38c5a0a 100644 --- a/ubuntu/debian/control +++ b/ubuntu/debian/control @@ -8,6 +8,7 @@ Build-Depends: cmake, debhelper (>= 9), doxygen, libfreeimage-dev, + libgdal-dev, libignition-cmake2-dev, libignition-math7-dev, libignition-utils1-dev, @@ -121,11 +122,11 @@ Description: Ignition Common classes and functions (Events) - Shared library Package: libignition-common5-events-dev Architecture: any Section: libdevel -Depends: libignition-cmake2-dev, - libignition-common5-core-dev (= ${binary:Version}), +Depends: libgdal-dev, + libignition-cmake2-dev, + libignition-common5-graphics-dev (= ${binary:Version}), libignition-utils1-dev, libignition-math7-dev, - libignition-common5-events (= ${binary:Version}), ${misc:Depends} Breaks: libignition-common5-dev (<< 3.0.0~pre5+hg20190228r1b2df90990) Replaces: libignition-common5-dev (<< 3.0.0~pre5+hg20190228r1b2df90990) @@ -136,6 +137,40 @@ Description: Ignition Common classes and functions (Events) - Development files . Events component of the library, development files +Package: libignition-common5-geospatial +Architecture: any +Section: libs +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libignition-common5 (<< 3.0.0~pre5+hg20190228r1b2df90990) +Replaces: libignition-common5 (<< 3.0.0~pre5+hg20190228r1b2df90990) +Multi-Arch: same +Description: Ignition Common classes and functions (Geospatial) - Shared library + Ignition Common is a component in the ignition framework, a set of libraries + designed to rapidly develop robot applications. + . + Geospatial component of the library + +Package: libignition-common5-geospatial-dev +Architecture: any +Section: libdevel +Depends: libignition-cmake2-dev, + libignition-common5-core-dev (= ${binary:Version}), + libignition-math7-dev, + libignition-utils1-dev, + libtinyxml2-dev, + libgts-dev, + libignition-common5-geospatial (= ${binary:Version}), + ${misc:Depends} +Breaks: libignition-common5-dev (<< 3.0.0~pre5+hg20190228r1b2df90990) +Replaces: libignition-common5-dev (<< 3.0.0~pre5+hg20190228r1b2df90990) +Multi-Arch: same +Description: Ignition Common classes and functions (Geospatial) - Development files + Ignition Common is a component in the ignition framework, a set of libraries + designed to rapidly develop robot applications. + . + Geospatial component of the library, development files + Package: libignition-common5-graphics Architecture: any Section: libs diff --git a/ubuntu/debian/libignition-common-geospatial-dev.install b/ubuntu/debian/libignition-common-geospatial-dev.install new file mode 100644 index 0000000..7905a06 --- /dev/null +++ b/ubuntu/debian/libignition-common-geospatial-dev.install @@ -0,0 +1,5 @@ +usr/include/ignition/common*/ignition/common/geospatial.hh +usr/include/ignition/common*/ignition/common/geospatial/* +usr/lib/*/cmake/ignition-common[0-99]-geospatial/* +usr/lib/*/libignition-common[0-99]-geospatial.so +usr/lib/*/pkgconfig/ignition-common[0-99]-geospatial.pc diff --git a/ubuntu/debian/libignition-common-geospatial.install b/ubuntu/debian/libignition-common-geospatial.install new file mode 100644 index 0000000..eec22d4 --- /dev/null +++ b/ubuntu/debian/libignition-common-geospatial.install @@ -0,0 +1 @@ +usr/lib/*/libignition-common[0-99]-geospatial.so.* From e64158613897f8e369df7c8b6caf520c1bac8e73 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 18 Jan 2022 18:29:16 -0800 Subject: [PATCH 2/4] Remove geospatial.hh from -core-dev package Signed-off-by: Steve Peters --- ubuntu/debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/ubuntu/debian/rules b/ubuntu/debian/rules index 49539ca..f953fd6 100755 --- a/ubuntu/debian/rules +++ b/ubuntu/debian/rules @@ -21,6 +21,7 @@ override_dh_install: # need to remove files present in components $(RM) debian/libignition-common5-core-dev/usr/include/ignition/common*/ignition/common/av.hh $(RM) debian/libignition-common5-core-dev/usr/include/ignition/common*/ignition/common/events.hh + $(RM) debian/libignition-common5-core-dev/usr/include/ignition/common*/ignition/common/geospatial.hh $(RM) debian/libignition-common5-core-dev/usr/include/ignition/common*/ignition/common/graphics.hh dh_missing --list-missing From 8555fbca8488c6f79d8b2464d0bfa29827e8ceda Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 18 Jan 2022 18:34:39 -0800 Subject: [PATCH 3/4] fix dependencies in control file Signed-off-by: Steve Peters --- ubuntu/debian/control | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/ubuntu/debian/control b/ubuntu/debian/control index 38c5a0a..bcb9b82 100644 --- a/ubuntu/debian/control +++ b/ubuntu/debian/control @@ -122,11 +122,11 @@ Description: Ignition Common classes and functions (Events) - Shared library Package: libignition-common5-events-dev Architecture: any Section: libdevel -Depends: libgdal-dev, - libignition-cmake2-dev, - libignition-common5-graphics-dev (= ${binary:Version}), +Depends: libignition-cmake2-dev, + libignition-common5-core-dev (= ${binary:Version}), libignition-utils1-dev, libignition-math7-dev, + libignition-common5-events (= ${binary:Version}), ${misc:Depends} Breaks: libignition-common5-dev (<< 3.0.0~pre5+hg20190228r1b2df90990) Replaces: libignition-common5-dev (<< 3.0.0~pre5+hg20190228r1b2df90990) @@ -154,12 +154,11 @@ Description: Ignition Common classes and functions (Geospatial) - Shared library Package: libignition-common5-geospatial-dev Architecture: any Section: libdevel -Depends: libignition-cmake2-dev, - libignition-common5-core-dev (= ${binary:Version}), +Depends: libgdal-dev, + libignition-cmake2-dev, + libignition-common5-graphics-dev (= ${binary:Version}), libignition-math7-dev, libignition-utils1-dev, - libtinyxml2-dev, - libgts-dev, libignition-common5-geospatial (= ${binary:Version}), ${misc:Depends} Breaks: libignition-common5-dev (<< 3.0.0~pre5+hg20190228r1b2df90990) From d56295e39622b674b5e1cd965cda471fc4c2aac9 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 18 Jan 2022 21:17:33 -0800 Subject: [PATCH 4/4] common5-dev package depend on geospatial-dev Signed-off-by: Steve Peters --- ubuntu/debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/ubuntu/debian/control b/ubuntu/debian/control index bcb9b82..4574c3d 100644 --- a/ubuntu/debian/control +++ b/ubuntu/debian/control @@ -59,6 +59,7 @@ Section: libdevel Depends: libignition-common5-core-dev (= ${binary:Version}), libignition-common5-av-dev (= ${binary:Version}), libignition-common5-events-dev (= ${binary:Version}), + libignition-common5-geospatial-dev (= ${binary:Version}), libignition-common5-graphics-dev (= ${binary:Version}), libignition-common5-profiler-dev (= ${binary:Version}), ${misc:Depends}