From 0e5f9dca2de5af2840f37377eef1bca93bcbffdd Mon Sep 17 00:00:00 2001
From: Marc Foley <m.foley.88@gmail.com>
Date: Mon, 8 Apr 2024 13:36:00 +0100
Subject: [PATCH] apache: merge upstream.yaml into METADATA.pb

---
 apache/arimo/METADATA.pb        | 32 ++++++++++++++++++++++++++++++++
 apache/arimo/upstream.yaml      | 10 ----------
 apache/kosugi/METADATA.pb       | 12 ++++++++++++
 apache/kosugi/upstream.yaml     |  5 -----
 apache/kosugimaru/METADATA.pb   | 12 ++++++++++++
 apache/kosugimaru/upstream.yaml |  5 -----
 apache/robotoslab/METADATA.pb   |  9 +++++++++
 apache/robotoslab/upstream.yaml |  5 -----
 8 files changed, 65 insertions(+), 25 deletions(-)
 delete mode 100644 apache/arimo/upstream.yaml
 delete mode 100644 apache/kosugi/upstream.yaml
 delete mode 100644 apache/kosugimaru/upstream.yaml
 delete mode 100644 apache/robotoslab/upstream.yaml

diff --git a/apache/arimo/METADATA.pb b/apache/arimo/METADATA.pb
index c61861808..b2525e6bc 100644
--- a/apache/arimo/METADATA.pb
+++ b/apache/arimo/METADATA.pb
@@ -35,3 +35,35 @@ axes {
   min_value: 400.0
   max_value: 700.0
 }
+source {
+  repository_url: "https://github.com/TypeNetwork/Arimo"
+  files {
+    source_file: "LICENSE.txt"
+    dest_file: "LICENSE.txt"
+  }
+  files {
+    source_file: "fonts/ttf/Arimo-Bold.ttf"
+    dest_file: "static/Arimo-Bold.ttf"
+  }
+  files {
+    source_file: "fonts/ttf/Arimo-BoldItalic.ttf"
+    dest_file: "static/Arimo-BoldItalic.ttf"
+  }
+  files {
+    source_file: "fonts/ttf/Arimo-Italic.ttf"
+    dest_file: "static/Arimo-Italic.ttf"
+  }
+  files {
+    source_file: "fonts/ttf/Arimo-Regular.ttf"
+    dest_file: "static/Arimo-Regular.ttf"
+  }
+  files {
+    source_file: "fonts/vf/Arimo-Italic[wght].ttf"
+    dest_file: "Arimo-Italic[wght].ttf"
+  }
+  files {
+    source_file: "fonts/vf/Arimo[wght].ttf"
+    dest_file: "Arimo[wght].ttf"
+  }
+  branch: "master"
+}
diff --git a/apache/arimo/upstream.yaml b/apache/arimo/upstream.yaml
deleted file mode 100644
index f0813d4b0..000000000
--- a/apache/arimo/upstream.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-branch: master
-files:
-  LICENSE.txt: LICENSE.txt
-  fonts/ttf/Arimo-Bold.ttf: static/Arimo-Bold.ttf
-  fonts/ttf/Arimo-BoldItalic.ttf: static/Arimo-BoldItalic.ttf
-  fonts/ttf/Arimo-Italic.ttf: static/Arimo-Italic.ttf
-  fonts/ttf/Arimo-Regular.ttf: static/Arimo-Regular.ttf
-  fonts/vf/Arimo-Italic[wght].ttf: Arimo-Italic[wght].ttf
-  fonts/vf/Arimo[wght].ttf: Arimo[wght].ttf
-repository_url: https://github.com/TypeNetwork/Arimo
diff --git a/apache/kosugi/METADATA.pb b/apache/kosugi/METADATA.pb
index 77179ea0a..63456e037 100644
--- a/apache/kosugi/METADATA.pb
+++ b/apache/kosugi/METADATA.pb
@@ -17,3 +17,15 @@ subsets: "japanese"
 subsets: "latin"
 subsets: "latin-ext"
 subsets: "menu"
+source {
+  repository_url: "https://github.com/googlefonts/kosugi"
+  files {
+    source_file: "fonts/ttf/Kosugi-Regular.ttf"
+    dest_file: "Kosugi-Regular.ttf"
+  }
+  files {
+    source_file: "LICENSE.txt"
+    dest_file: "LICENSE.txt"
+  }
+  branch: "main"
+}
diff --git a/apache/kosugi/upstream.yaml b/apache/kosugi/upstream.yaml
deleted file mode 100644
index 72984cff5..000000000
--- a/apache/kosugi/upstream.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-branch: main
-files:
-  fonts/ttf/Kosugi-Regular.ttf: Kosugi-Regular.ttf
-  LICENSE.txt: LICENSE.txt
-repository_url: https://github.com/googlefonts/kosugi
diff --git a/apache/kosugimaru/METADATA.pb b/apache/kosugimaru/METADATA.pb
index 4b9acdeae..d1b4b56bc 100644
--- a/apache/kosugimaru/METADATA.pb
+++ b/apache/kosugimaru/METADATA.pb
@@ -17,3 +17,15 @@ subsets: "japanese"
 subsets: "latin"
 subsets: "latin-ext"
 subsets: "menu"
+source {
+  repository_url: "https://github.com/googlefonts/kosugi-maru"
+  files {
+    source_file: "fonts/ttf/KosugiMaru-Regular.ttf"
+    dest_file: "KosugiMaru-Regular.ttf"
+  }
+  files {
+    source_file: "LICENSE.txt"
+    dest_file: "LICENSE.txt"
+  }
+  branch: "main"
+}
diff --git a/apache/kosugimaru/upstream.yaml b/apache/kosugimaru/upstream.yaml
deleted file mode 100644
index 1760993a0..000000000
--- a/apache/kosugimaru/upstream.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-branch: main
-files:
-  fonts/ttf/KosugiMaru-Regular.ttf: KosugiMaru-Regular.ttf
-  LICENSE.txt: LICENSE.txt
-repository_url: https://github.com/googlefonts/kosugi-maru
diff --git a/apache/robotoslab/METADATA.pb b/apache/robotoslab/METADATA.pb
index 4c3cdf796..e4ba86883 100644
--- a/apache/robotoslab/METADATA.pb
+++ b/apache/robotoslab/METADATA.pb
@@ -28,5 +28,14 @@ axes {
 source {
   repository_url: "https://github.com/googlefonts/robotoslab"
   commit: "67af3ce9c4ca574419e1295b6165a2eeee112e6e"
+  files {
+    source_file: "LICENSE.txt"
+    dest_file: "LICENSE.txt"
+  }
+  files {
+    source_file: "fonts/variable/RobotoSlab[wght].ttf"
+    dest_file: "RobotoSlab[wght].ttf"
+  }
+  branch: "main"
 }
 stroke: "SLAB_SERIF"
diff --git a/apache/robotoslab/upstream.yaml b/apache/robotoslab/upstream.yaml
deleted file mode 100644
index 5b8759243..000000000
--- a/apache/robotoslab/upstream.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-branch: main
-files:
-  LICENSE.txt: LICENSE.txt
-  fonts/variable/RobotoSlab[wght].ttf: RobotoSlab[wght].ttf
-archive:
-- 
GitLab