release 2023.09.26.12023.09.26.1

3 files changed, 36 insertions, 1 deletions

diff --git a/AUTHORS b/AUTHORS
index e6f93d2..5849fe8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,3 @@
 Guido Berhoerster <guido+freiesoftware@berhoerster.name>
+Guido Berhörster <guido+debian.org@berhoerster.name>
 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
diff --git a/ChangeLog b/ChangeLog
index 14c3345..2370800 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,25 @@
+2023-09-25 Mike Gabriel
+
+        * release 2023.09.26.1 (HEAD -> master, tag: 2023.09.26.1)
+
+2023-09-23 Mike Gabriel
+
+        * fai/config/hooks/updatebase.DEBIAN: Debian Edu sets up http proxy
+          configuration via 03debian-edu-config. To override this
+          (which we want), we need to move 02proxy to 04proxy in
+          /etc/apt/apt.conf.d/. (2a0242a)
+        * bin/debian-edu-fai_install: Promote http_proxy settings into FAI
+          config space and set APTPROXY variable accordingly.
+          (3926deb)
+
+2023-09-20 Guido Berhoerster
+
+        * Improve OS detection for loading profiles (93aff93)
+
 2023-09-19 Mike Gabriel
 
-        * release 2023.09.19.1 (HEAD -> master, tag: 2023.09.19.1)
+        * ChangeLog: update post-release (417ffdd)
+        * release 2023.09.19.1 (2a9e698) (tag: 2023.09.19.1)
 
 2023-09-19 Guido Berhörster
 
diff --git a/debian/changelog b/debian/changelog
index 30a31a0..caede5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+debian-edu-fai (2023.09.26.1) unstable; urgency=medium
+
+  [ Guido Berhoerster ]
+  * Improve OS detection for loading profiles
+
+  [ Mike Gabriel ]
+  * ChangeLog: update post-release
+  * bin/debian-edu-fai_install: Promote http_proxy settings into FAI config
+    space and set APTPROXY variable accordingly.
+  * fai/config/hooks/updatebase.DEBIAN: Debian Edu sets up http proxy
+    configuration via 03debian-edu-config. To override this (which we want),
+    we need to move 02proxy to 04proxy in /etc/apt/apt.conf.d/.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Mon, 25 Sep 2023 09:01:00 +0200
+
 debian-edu-fai (2023.09.19.1) unstable; urgency=medium
 
   [ Mike Gabriel ]