[neon/forks/base-files/Neon/release] /: Merge unstable with merge from jammy

[Jonathan Esk-Riddell]

Git commit 053f194c5cbf4b9e442be0bab56e863bc1aad7c4 by Jonathan Esk-Riddell.
Committed on 24/05/2022 at 14:35.
Pushed by jriddell into branch 'Neon/release'.

Merge unstable with merge from jammy

M  +1    -1    etc/issue
M  +1    -1    etc/issue.net
M  +1    -1    etc/lsb-release
M  +2    -2    etc/os-release
A  +4    -0    origins/neon

https://invent.kde.org/neon/forks/base-files/commit/053f194c5cbf4b9e442be0bab56e863bc1aad7c4

diff --git a/etc/issue b/etc/issue
index 674c2fe..a64a580 100644
--- a/etc/issue
+++ b/etc/issue
@@ -1,2 +1,2 @@
-KDE neon Unstable Edition \n \l
+KDE neon Testing Edition \n \l
 
diff --git a/etc/issue.net b/etc/issue.net
index a442582..9db81fc 100644
--- a/etc/issue.net
+++ b/etc/issue.net
@@ -1 +1 @@
-Ubuntu 22.04 LTS \n \l
+KDE neon Testing Edition \n \l
diff --git a/etc/lsb-release b/etc/lsb-release
index b81c0fc..7fbdd98 100644
--- a/etc/lsb-release
+++ b/etc/lsb-release
@@ -1,4 +1,4 @@
 DISTRIB_ID=neon
 DISTRIB_RELEASE=22.04
 DISTRIB_CODENAME=jammy
-DISTRIB_DESCRIPTION="KDE neon Unstable Edition"
+DISTRIB_DESCRIPTION="KDE neon Testing Edition"
diff --git a/etc/os-release b/etc/os-release
index 401e97b..05a3630 100644
--- a/etc/os-release
+++ b/etc/os-release
@@ -1,7 +1,7 @@
-PRETTY_NAME="KDE neon Unstable Edition"
+PRETTY_NAME="KDE neon Testing Edition"
 NAME="KDE neon"
 VERSION_ID="22.04"
-VERSION="Unstable Edition"
+VERSION="Testing Edition"
 VERSION_CODENAME=jammy
 ID=neon
 ID_LIKE="ubuntu debian"
diff --git a/origins/neon b/origins/neon
new file mode 100644
index 0000000..e6f1775
--- /dev/null
+++ b/origins/neon
@@ -0,0 +1,4 @@
+Vendor: neon
+Vendor-URL: https://neon.kde.org/
+Bugs: https://bugs.kde.org
+Parent: Ubuntu