From: Maria Matejka <mq@ucw.cz>
Date: Wed, 24 Dec 2025 18:19:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into thread-next
X-Git-Tag: v3.2.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e4e9e754bf74ffaf9c2c9aa4b92e488d7fe187d;p=thirdparty%2Fbird.git

Merge remote-tracking branch 'origin/master' into thread-next
---

7e4e9e754bf74ffaf9c2c9aa4b92e488d7fe187d
diff --cc distro/pkg/deb/control
index 5e8378834,ff62248b9..6b08813b4
--- a/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@@ -18,15 -18,18 +18,15 @@@ Build-Depends-Indep
   opensp,
   texlive-latex-extra,
  Maintainer: Jakub Ružička <jakub.ruzicka@nic.cz>
 -Uploaders:
 - Ondřej Surý <ondrej@debian.org>,
  Standards-Version: 4.7.0
 -Vcs-Browser: https://salsa.debian.org/debian/bird2
 -Vcs-Git: https://salsa.debian.org/debian/bird2.git
 +Vcs-Browser: https://salsa.debian.org/debian/bird3
 +Vcs-Git: https://salsa.debian.org/debian/bird3.git
- Homepage: https://bird.network.cz/
+ Homepage: https://bird.nic.cz/
  Rules-Requires-Root: no
  
 -Package: bird2
 -Architecture: kfreebsd-any linux-any
 +Package: bird3
 +Architecture: linux-any kfreebsd-any
  Pre-Depends:
 - init-system-helpers,
   ${misc:Pre-Depends},
  Depends:
   adduser,