From aa02acdfaaff98c335708b92a0509c5e49e65fc2 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 24 Mar 2022 21:08:20 +0100 Subject: [PATCH 01/10] Install desktop entry from artifacts in upstream code --- ubuntu/debian/libignition-gazebo.install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ubuntu/debian/libignition-gazebo.install b/ubuntu/debian/libignition-gazebo.install index 6afaf85..bc5896c 100644 --- a/ubuntu/debian/libignition-gazebo.install +++ b/ubuntu/debian/libignition-gazebo.install @@ -2,3 +2,5 @@ usr/lib/*/*.so.* usr/share/ignition/ignition-gazebo[0-99]/*.config usr/share/ignition/ignition-gazebo[0-99]/gui/* usr/share/ignition/ignition-gazebo[0-99]/worlds/* +tools/desktop/ignition-gazebo.svg usr/share/icons/hicolor/scalable/apps/ +tools/desktop/ignition-gazebo.desktop usr/share/applications/ From 5f8071bacfeda957d0b89e5a6f8f9659394a71fd Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 25 Mar 2022 14:23:22 +0100 Subject: [PATCH 02/10] ignition-gazebo3 3.13.0~pre1-1 release --- bionic/debian/changelog | 6 ++++++ debian/buster/debian/changelog | 6 ++++++ focal/debian/changelog | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/bionic/debian/changelog b/bionic/debian/changelog index 03c1c16..77ea73a 100644 --- a/bionic/debian/changelog +++ b/bionic/debian/changelog @@ -1,3 +1,9 @@ +ignition-gazebo3 (3.13.0~pre1-1~bionic) bionic; urgency=medium + + * ignition-gazebo3 3.13.0~pre1-1 release + + -- Jose Luis Rivero Fri, 25 Mar 2022 14:23:17 +0100 + ignition-gazebo3 (3.12.0-1~bionic) bionic; urgency=medium * ignition-gazebo3 3.12.0-1 release diff --git a/debian/buster/debian/changelog b/debian/buster/debian/changelog index ae336c9..e787f5e 100644 --- a/debian/buster/debian/changelog +++ b/debian/buster/debian/changelog @@ -1,3 +1,9 @@ +ignition-gazebo3 (3.13.0~pre1-1~buster) buster; urgency=medium + + * ignition-gazebo3 3.13.0~pre1-1 release + + -- Jose Luis Rivero Fri, 25 Mar 2022 14:23:18 +0100 + ignition-gazebo3 (3.12.0-1~buster) buster; urgency=medium * ignition-gazebo3 3.12.0-1 release diff --git a/focal/debian/changelog b/focal/debian/changelog index f5c2641..1d5a5d8 100644 --- a/focal/debian/changelog +++ b/focal/debian/changelog @@ -1,3 +1,9 @@ +ignition-gazebo3 (3.13.0~pre1-1~focal) focal; urgency=medium + + * ignition-gazebo3 3.13.0~pre1-1 release + + -- Jose Luis Rivero Fri, 25 Mar 2022 14:23:18 +0100 + ignition-gazebo3 (3.12.0-1~focal) focal; urgency=medium * ignition-gazebo3 3.12.0-1 release From 7f23530186885de7a5cbb9f2718f095ed4653363 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 31 Mar 2022 15:48:58 +0200 Subject: [PATCH 03/10] Change location of desktop file, it's being generated now --- ubuntu/debian/libignition-gazebo.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/debian/libignition-gazebo.install b/ubuntu/debian/libignition-gazebo.install index bc5896c..a3f8176 100644 --- a/ubuntu/debian/libignition-gazebo.install +++ b/ubuntu/debian/libignition-gazebo.install @@ -3,4 +3,4 @@ usr/share/ignition/ignition-gazebo[0-99]/*.config usr/share/ignition/ignition-gazebo[0-99]/gui/* usr/share/ignition/ignition-gazebo[0-99]/worlds/* tools/desktop/ignition-gazebo.svg usr/share/icons/hicolor/scalable/apps/ -tools/desktop/ignition-gazebo.desktop usr/share/applications/ +ignition-gazebo.desktop usr/share/applications/ From b0821764bdd5e7d1bdc5112fe3ddde44822d50ee Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 31 Mar 2022 15:50:02 +0200 Subject: [PATCH 04/10] ignition-gazebo3 3.13.0~pre2-1 release --- bionic/debian/changelog | 6 ++++++ debian/buster/debian/changelog | 6 ++++++ focal/debian/changelog | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/bionic/debian/changelog b/bionic/debian/changelog index 77ea73a..c2fdb88 100644 --- a/bionic/debian/changelog +++ b/bionic/debian/changelog @@ -1,3 +1,9 @@ +ignition-gazebo3 (3.13.0~pre2-1~bionic) bionic; urgency=medium + + * ignition-gazebo3 3.13.0~pre2-1 release + + -- Jose Luis Rivero Thu, 31 Mar 2022 15:50:01 +0200 + ignition-gazebo3 (3.13.0~pre1-1~bionic) bionic; urgency=medium * ignition-gazebo3 3.13.0~pre1-1 release diff --git a/debian/buster/debian/changelog b/debian/buster/debian/changelog index e787f5e..7f89282 100644 --- a/debian/buster/debian/changelog +++ b/debian/buster/debian/changelog @@ -1,3 +1,9 @@ +ignition-gazebo3 (3.13.0~pre2-1~buster) buster; urgency=medium + + * ignition-gazebo3 3.13.0~pre2-1 release + + -- Jose Luis Rivero Thu, 31 Mar 2022 15:50:01 +0200 + ignition-gazebo3 (3.13.0~pre1-1~buster) buster; urgency=medium * ignition-gazebo3 3.13.0~pre1-1 release diff --git a/focal/debian/changelog b/focal/debian/changelog index 1d5a5d8..2197538 100644 --- a/focal/debian/changelog +++ b/focal/debian/changelog @@ -1,3 +1,9 @@ +ignition-gazebo3 (3.13.0~pre2-1~focal) focal; urgency=medium + + * ignition-gazebo3 3.13.0~pre2-1 release + + -- Jose Luis Rivero Thu, 31 Mar 2022 15:50:02 +0200 + ignition-gazebo3 (3.13.0~pre1-1~focal) focal; urgency=medium * ignition-gazebo3 3.13.0~pre1-1 release From b3fb4e28365f661cff616a06c9d5c93b15e9426e Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 31 Mar 2022 15:53:09 +0200 Subject: [PATCH 05/10] Work with versioned files --- ubuntu/debian/libignition-gazebo.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/debian/libignition-gazebo.install b/ubuntu/debian/libignition-gazebo.install index a3f8176..6ca72ef 100644 --- a/ubuntu/debian/libignition-gazebo.install +++ b/ubuntu/debian/libignition-gazebo.install @@ -3,4 +3,4 @@ usr/share/ignition/ignition-gazebo[0-99]/*.config usr/share/ignition/ignition-gazebo[0-99]/gui/* usr/share/ignition/ignition-gazebo[0-99]/worlds/* tools/desktop/ignition-gazebo.svg usr/share/icons/hicolor/scalable/apps/ -ignition-gazebo.desktop usr/share/applications/ +ignition-gazebo[0-99].desktop usr/share/applications/ From 30b8c09a672fcb32fa1e25b64a8d5ea00b37eb1d Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 31 Mar 2022 15:53:17 +0200 Subject: [PATCH 06/10] ignition-gazebo3 3.13.0~pre3-1 release --- bionic/debian/changelog | 6 ++++++ debian/buster/debian/changelog | 6 ++++++ focal/debian/changelog | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/bionic/debian/changelog b/bionic/debian/changelog index c2fdb88..6686d7b 100644 --- a/bionic/debian/changelog +++ b/bionic/debian/changelog @@ -1,3 +1,9 @@ +ignition-gazebo3 (3.13.0~pre3-1~bionic) bionic; urgency=medium + + * ignition-gazebo3 3.13.0~pre3-1 release + + -- Jose Luis Rivero Thu, 31 Mar 2022 15:53:16 +0200 + ignition-gazebo3 (3.13.0~pre2-1~bionic) bionic; urgency=medium * ignition-gazebo3 3.13.0~pre2-1 release diff --git a/debian/buster/debian/changelog b/debian/buster/debian/changelog index 7f89282..2c6de36 100644 --- a/debian/buster/debian/changelog +++ b/debian/buster/debian/changelog @@ -1,3 +1,9 @@ +ignition-gazebo3 (3.13.0~pre3-1~buster) buster; urgency=medium + + * ignition-gazebo3 3.13.0~pre3-1 release + + -- Jose Luis Rivero Thu, 31 Mar 2022 15:53:16 +0200 + ignition-gazebo3 (3.13.0~pre2-1~buster) buster; urgency=medium * ignition-gazebo3 3.13.0~pre2-1 release diff --git a/focal/debian/changelog b/focal/debian/changelog index 2197538..a832e27 100644 --- a/focal/debian/changelog +++ b/focal/debian/changelog @@ -1,3 +1,9 @@ +ignition-gazebo3 (3.13.0~pre3-1~focal) focal; urgency=medium + + * ignition-gazebo3 3.13.0~pre3-1 release + + -- Jose Luis Rivero Thu, 31 Mar 2022 15:53:16 +0200 + ignition-gazebo3 (3.13.0~pre2-1~focal) focal; urgency=medium * ignition-gazebo3 3.13.0~pre2-1 release From d5479dd38f8eea633267b371ece0136c2e5ce8cc Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 31 Mar 2022 17:08:25 +0200 Subject: [PATCH 07/10] Path relative to source code --- ubuntu/debian/libignition-gazebo.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/debian/libignition-gazebo.install b/ubuntu/debian/libignition-gazebo.install index 6ca72ef..ac96102 100644 --- a/ubuntu/debian/libignition-gazebo.install +++ b/ubuntu/debian/libignition-gazebo.install @@ -3,4 +3,4 @@ usr/share/ignition/ignition-gazebo[0-99]/*.config usr/share/ignition/ignition-gazebo[0-99]/gui/* usr/share/ignition/ignition-gazebo[0-99]/worlds/* tools/desktop/ignition-gazebo.svg usr/share/icons/hicolor/scalable/apps/ -ignition-gazebo[0-99].desktop usr/share/applications/ +obj-${DEB_TARGET_GNU_TYPE}/ignition-gazebo[0-99].desktop usr/share/applications/ From b18988c5b0a9f33ce5ebe0fbb3260bf4d7763254 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 31 Mar 2022 17:47:33 +0200 Subject: [PATCH 08/10] Use wildcard --- ubuntu/debian/libignition-gazebo.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/debian/libignition-gazebo.install b/ubuntu/debian/libignition-gazebo.install index ac96102..8d6fc91 100644 --- a/ubuntu/debian/libignition-gazebo.install +++ b/ubuntu/debian/libignition-gazebo.install @@ -3,4 +3,4 @@ usr/share/ignition/ignition-gazebo[0-99]/*.config usr/share/ignition/ignition-gazebo[0-99]/gui/* usr/share/ignition/ignition-gazebo[0-99]/worlds/* tools/desktop/ignition-gazebo.svg usr/share/icons/hicolor/scalable/apps/ -obj-${DEB_TARGET_GNU_TYPE}/ignition-gazebo[0-99].desktop usr/share/applications/ +obj-*/ignition-gazebo[0-99].desktop usr/share/applications/ From 8b526ce5697149af17c4ae867b9859408fac8634 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 7 Apr 2022 23:39:54 +0200 Subject: [PATCH 09/10] Use versioned svg file to avoid conflicts with other versions --- ubuntu/debian/libignition-gazebo.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/debian/libignition-gazebo.install b/ubuntu/debian/libignition-gazebo.install index 8d6fc91..4391130 100644 --- a/ubuntu/debian/libignition-gazebo.install +++ b/ubuntu/debian/libignition-gazebo.install @@ -2,5 +2,5 @@ usr/lib/*/*.so.* usr/share/ignition/ignition-gazebo[0-99]/*.config usr/share/ignition/ignition-gazebo[0-99]/gui/* usr/share/ignition/ignition-gazebo[0-99]/worlds/* -tools/desktop/ignition-gazebo.svg usr/share/icons/hicolor/scalable/apps/ +tools/desktop/ignition-gazebo[0-99].svg usr/share/icons/hicolor/scalable/apps/ obj-*/ignition-gazebo[0-99].desktop usr/share/applications/ From 0edef93cae2d6a1f57cce5ad52876d1585b296b4 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 7 Apr 2022 23:39:54 +0200 Subject: [PATCH 10/10] Use versioned svg file to avoid conflicts with other versions --- ubuntu/debian/libignition-gazebo.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/debian/libignition-gazebo.install b/ubuntu/debian/libignition-gazebo.install index 4391130..ca1710d 100644 --- a/ubuntu/debian/libignition-gazebo.install +++ b/ubuntu/debian/libignition-gazebo.install @@ -2,5 +2,5 @@ usr/lib/*/*.so.* usr/share/ignition/ignition-gazebo[0-99]/*.config usr/share/ignition/ignition-gazebo[0-99]/gui/* usr/share/ignition/ignition-gazebo[0-99]/worlds/* -tools/desktop/ignition-gazebo[0-99].svg usr/share/icons/hicolor/scalable/apps/ +obj-*/ignition-gazebo[0-99].svg usr/share/icons/hicolor/scalable/apps/ obj-*/ignition-gazebo[0-99].desktop usr/share/applications/