From b032141b7582a4c24a2ba32fe6268682a969aa0f Mon Sep 17 00:00:00 2001
From: Michael Grupp <grupp@magazino.eu>
Date: Fri, 30 Oct 2020 11:12:32 +0100
Subject: [PATCH 1/6] Resolve google-mock to libgmock-dev on Buster & Focal.

`google-mock` is a transitional package and shouldn't be used anymore.
See https://packages.debian.org/buster/google-mock
---
 rosdep/base.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rosdep/base.yaml b/rosdep/base.yaml
index 879a1fa015539..0abe35ce5796c 100644
--- a/rosdep/base.yaml
+++ b/rosdep/base.yaml
@@ -1184,14 +1184,18 @@ golang-go:
 google-mock:
   alpine: [gmock]
   arch: [gmock]
-  debian: [google-mock]
+  debian:
+    '*': [google-mock]
+    buster: [libgmock-dev]
   fedora: [gmock-devel]
   freebsd: [googlemock]
   gentoo: [dev-cpp/gtest]
   openembedded: [gtest@meta-oe]
   opensuse: [gmock-devel]
   rhel: [gmock-devel]
-  ubuntu: [google-mock]
+  ubuntu:
+    '*': [google-mock]
+    focal: [libgmock-dev]
 gpac:
   debian: [gpac]
   fedora: [gpac]

From 287c12031eba39b8e1a63e0a10248eb74c3a9936 Mon Sep 17 00:00:00 2001
From: Michael Grupp <grupp@magazino.eu>
Date: Mon, 16 Nov 2020 12:47:15 +0100
Subject: [PATCH 2/6] Revert "Resolve google-mock to libgmock-dev on Buster &
 Focal."

This reverts commit b032141b7582a4c24a2ba32fe6268682a969aa0f.
---
 rosdep/base.yaml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/rosdep/base.yaml b/rosdep/base.yaml
index 0abe35ce5796c..879a1fa015539 100644
--- a/rosdep/base.yaml
+++ b/rosdep/base.yaml
@@ -1184,18 +1184,14 @@ golang-go:
 google-mock:
   alpine: [gmock]
   arch: [gmock]
-  debian:
-    '*': [google-mock]
-    buster: [libgmock-dev]
+  debian: [google-mock]
   fedora: [gmock-devel]
   freebsd: [googlemock]
   gentoo: [dev-cpp/gtest]
   openembedded: [gtest@meta-oe]
   opensuse: [gmock-devel]
   rhel: [gmock-devel]
-  ubuntu:
-    '*': [google-mock]
-    focal: [libgmock-dev]
+  ubuntu: [google-mock]
 gpac:
   debian: [gpac]
   fedora: [gpac]

From cad1481a97ab475376a9b5c61b93740736816ab4 Mon Sep 17 00:00:00 2001
From: Michael Grupp <grupp@magazino.eu>
Date: Mon, 16 Nov 2020 12:49:59 +0100
Subject: [PATCH 3/6] Add libgmock-dev to rosdep/base.yaml

---
 rosdep/base.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rosdep/base.yaml b/rosdep/base.yaml
index 879a1fa015539..6d94740e59bde 100644
--- a/rosdep/base.yaml
+++ b/rosdep/base.yaml
@@ -2627,6 +2627,11 @@ libgpgme-dev:
     vivid: [libgpgme11-dev]
     wily: [libgpgme11-dev]
     xenial: [libgpgme11-dev]
+libgmock-dev:
+  debian:
+    buster: ["libgmock-dev"]
+  ubuntu:
+    focal: ["libgmock-dev"]
 libgphoto-dev:
   arch: [libgphoto2]
   debian: [libgphoto2-dev]

From 54722671164b0b29031626b1674bc6b28b45d566 Mon Sep 17 00:00:00 2001
From: Michael Grupp <grupp@magazino.eu>
Date: Mon, 16 Nov 2020 12:57:34 +0100
Subject: [PATCH 4/6] Fix typo.

---
 rosdep/base.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rosdep/base.yaml b/rosdep/base.yaml
index 6d94740e59bde..49f5a3b522eaf 100644
--- a/rosdep/base.yaml
+++ b/rosdep/base.yaml
@@ -2629,9 +2629,9 @@ libgpgme-dev:
     xenial: [libgpgme11-dev]
 libgmock-dev:
   debian:
-    buster: ["libgmock-dev"]
+    buster: [libgmock-dev]
   ubuntu:
-    focal: ["libgmock-dev"]
+    focal: [libgmock-dev]
 libgphoto-dev:
   arch: [libgphoto2]
   debian: [libgphoto2-dev]

From 26cdbf09429b225b5d540ee9a4d7a031ba8c1a7a Mon Sep 17 00:00:00 2001
From: Michael Grupp <grupp@magazino.eu>
Date: Mon, 11 Jan 2021 11:42:32 +0100
Subject: [PATCH 5/6] Add other platforms.

---
 rosdep/base.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/rosdep/base.yaml b/rosdep/base.yaml
index 49f5a3b522eaf..936e2b584cebb 100644
--- a/rosdep/base.yaml
+++ b/rosdep/base.yaml
@@ -2628,8 +2628,16 @@ libgpgme-dev:
     wily: [libgpgme11-dev]
     xenial: [libgpgme11-dev]
 libgmock-dev:
+  alpine: [gmock]
+  arch: [gmock]
   debian:
     buster: [libgmock-dev]
+  fedora: [gmock-devel]
+  freebsd: [googlemock]
+  gentoo: [dev-cpp/gtest]
+  openembedded: [gtest@meta-oe]
+  opensuse: [gmock-devel]
+  rhel: [gmock-devel]
   ubuntu:
     focal: [libgmock-dev]
 libgphoto-dev:

From 511f77b269f37cec3f1e9dbd95b2630427f4044d Mon Sep 17 00:00:00 2001
From: Michael Grupp <grupp@magazino.eu>
Date: Mon, 11 Jan 2021 11:47:59 +0100
Subject: [PATCH 6/6] alphabetical sorting

---
 rosdep/base.yaml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/rosdep/base.yaml b/rosdep/base.yaml
index 936e2b584cebb..d2c83682fc3f9 100644
--- a/rosdep/base.yaml
+++ b/rosdep/base.yaml
@@ -2582,6 +2582,19 @@ libglw1-mesa:
   fedora: [mesa-libGlw]
   gentoo: [x11-libs/libGLw]
   ubuntu: [libglw1-mesa]
+libgmock-dev:
+  alpine: [gmock]
+  arch: [gmock]
+  debian:
+    buster: [libgmock-dev]
+  fedora: [gmock-devel]
+  freebsd: [googlemock]
+  gentoo: [dev-cpp/gtest]
+  openembedded: [gtest@meta-oe]
+  opensuse: [gmock-devel]
+  rhel: [gmock-devel]
+  ubuntu:
+    focal: [libgmock-dev]
 libgmp:
   debian: [libgmp-dev]
   fedora: [gmp-devel]
@@ -2627,19 +2640,6 @@ libgpgme-dev:
     vivid: [libgpgme11-dev]
     wily: [libgpgme11-dev]
     xenial: [libgpgme11-dev]
-libgmock-dev:
-  alpine: [gmock]
-  arch: [gmock]
-  debian:
-    buster: [libgmock-dev]
-  fedora: [gmock-devel]
-  freebsd: [googlemock]
-  gentoo: [dev-cpp/gtest]
-  openembedded: [gtest@meta-oe]
-  opensuse: [gmock-devel]
-  rhel: [gmock-devel]
-  ubuntu:
-    focal: [libgmock-dev]
 libgphoto-dev:
   arch: [libgphoto2]
   debian: [libgphoto2-dev]