Merge branch 'ubuntu-24.04' into 24.04-openjdk-21-jre-headless

canonical · Sep 30, 2024 · 6e21fc7 · 6e21fc7
2 parents 1c8ab69 + e87050b
commit 6e21fc7
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/slices/distro-info-data.yaml b/slices/distro-info-data.yaml
@@ -0,0 +1,14 @@
+package: distro-info-data
+
+essential:
+  - distro-info-data_copyright
+
+slices:
+  data:
+    contents:
+      /usr/share/distro-info/debian.csv:
+      /usr/share/distro-info/ubuntu.csv:
+
+  copyright:
+    contents:
+      /usr/share/doc/distro-info-data/copyright:
diff --git a/slices/ubuntu-keyring.yaml b/slices/ubuntu-keyring.yaml
@@ -0,0 +1,19 @@
+package: ubuntu-keyring
+
+essential:
+  - ubuntu-keyring_copyright
+
+slices:
+  keys:
+    contents:
+      /etc/apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg:
+      /etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg:
+      /usr/share/keyrings/ubuntu-archive-keyring.gpg:
+      /usr/share/keyrings/ubuntu-archive-removed-keys.gpg:
+      /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg:
+      /usr/share/keyrings/ubuntu-cloudimage-removed-keys.gpg:
+      /usr/share/keyrings/ubuntu-master-keyring.gpg:
+
+  copyright:
+    contents:
+      /usr/share/doc/ubuntu-keyring/copyright: