From 0f321f8c29b2b4b43fc2875573b27d6d77638f1d Mon Sep 17 00:00:00 2001
From: Stephanos Ioannidis <root@stephanos.io>
Date: Fri, 4 Oct 2024 01:05:31 +0900
Subject: [PATCH] Update various outdated links and contact information

This commit updates various outdated links and contact information
throughout the repository.

Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
---
 examples/merge_config.py |  2 +-
 kconfiglib.py            | 12 ++++++------
 setup.py                 | 10 +++++-----
 testsuite.py             |  3 +--
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/examples/merge_config.py b/examples/merge_config.py
index 777fe2c..fea84ef 100755
--- a/examples/merge_config.py
+++ b/examples/merge_config.py
@@ -65,7 +65,7 @@
 #     Configuration saved to 'merged'
 #     warning: QAZ (defined at Kconfig:10) was assigned the value 'y' but got the value 'n' -- check dependencies
 #     $ cat merged
-#     Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib)
+#     Generated by Kconfiglib (https://github.com/zephyrproject-rtos/Kconfiglib)
 #     # CONFIG_FOO is not set
 #     CONFIG_BAR=y
 #     CONFIG_BAZ="baz string"
diff --git a/kconfiglib.py b/kconfiglib.py
index c67895c..a50312e 100644
--- a/kconfiglib.py
+++ b/kconfiglib.py
@@ -9,7 +9,7 @@
 from Kconfig (https://www.kernel.org/doc/Documentation/kbuild/kconfig-language.txt)
 configuration systems.
 
-See the homepage at https://github.com/ulfalizer/Kconfiglib for a longer
+See the homepage at https://github.com/zephyrproject-rtos/Kconfiglib for a longer
 overview.
 
 Since Kconfiglib 12.0.0, the library version is available in
@@ -24,8 +24,8 @@
 scripts/kconfig/Makefile patch, which can be applied with either 'git am' or
 the 'patch' utility:
 
-  $ wget -qO- https://raw.githubusercontent.com/ulfalizer/Kconfiglib/master/makefile.patch | git am
-  $ wget -qO- https://raw.githubusercontent.com/ulfalizer/Kconfiglib/master/makefile.patch | patch -p1
+  $ wget -qO- https://raw.githubusercontent.com/zephyrproject-rtos/Kconfiglib/master/makefile.patch | git am
+  $ wget -qO- https://raw.githubusercontent.com/zephyrproject-rtos/Kconfiglib/master/makefile.patch | patch -p1
 
 Warning: Not passing -p1 to patch will cause the wrong file to be patched.
 
@@ -39,7 +39,7 @@
 If you do not wish to install Kconfiglib via pip, the Makefile patch is set up
 so that you can also just clone Kconfiglib into the kernel root:
 
-  $ git clone git://github.com/ulfalizer/Kconfiglib.git
+  $ git clone git://github.com/zephyrproject-rtos/Kconfiglib.git
   $ git am Kconfiglib/makefile.patch  (or 'patch -p1 < Kconfiglib/makefile.patch')
 
 Warning: The directory name Kconfiglib/ is significant in this case, because
@@ -540,8 +540,8 @@ def my_other_fn(kconf, name, arg_1, arg_2, ...):
 Feedback
 ========
 
-Send bug reports, suggestions, and questions to ulfalizer a.t Google's email
-service, or open a ticket on the GitHub page.
+For bug reports, suggestions, and questions, please open a ticket on the GitHub
+page.
 """
 import errno
 import importlib
diff --git a/setup.py b/setup.py
index 8aa2cc4..af5a19f 100644
--- a/setup.py
+++ b/setup.py
@@ -20,9 +20,9 @@
         encoding="utf-8"
     ).read(),
 
-    url="https://github.com/ulfalizer/Kconfiglib",
-    author='Ulf "Ulfalizer" Magnusson',
-    author_email="ulfalizer@gmail.com",
+    url="https://github.com/zephyrproject-rtos/Kconfiglib",
+    author='Zephyr Project',
+    author_email="ci@zephyrproject.org",
     keywords="kconfig, kbuild, menuconfig, configuration-management",
     license="ISC",
 
@@ -68,8 +68,8 @@
     python_requires=">=2.7,!=3.0.*,!=3.1.*",
 
     project_urls={
-        "GitHub repository": "https://github.com/ulfalizer/Kconfiglib",
-        "Examples": "https://github.com/ulfalizer/Kconfiglib/tree/master/examples",
+        "GitHub repository": "https://github.com/zephyrproject-rtos/Kconfiglib",
+        "Examples": "https://github.com/zephyrproject-rtos/Kconfiglib/tree/master/examples",
     },
 
     classifiers=[
diff --git a/testsuite.py b/testsuite.py
index fc61a16..a4ea556 100644
--- a/testsuite.py
+++ b/testsuite.py
@@ -32,8 +32,7 @@
 #
 # pypy works too, and runs most tests much faster than CPython.
 #
-# All tests should pass. Report regressions to ulfalizer a.t Google's email
-# service.
+# All tests should pass. Report regressions on the GitHub page.
 
 import difflib
 import errno