From: Jakub Ružička Date: Thu, 5 Dec 2024 12:20:19 +0000 (+0100) Subject: Debian: Rename package to bird3 X-Git-Tag: v3.0.0~18^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7b6d8b436bd08add09edbb386baeaff774b22f4;p=thirdparty%2Fbird.git Debian: Rename package to bird3 Also reformat using wrap-and-sort -bast --- diff --git a/distro/pkg/deb/bird2-doc.docs b/distro/pkg/deb/bird3-doc.docs similarity index 100% rename from distro/pkg/deb/bird2-doc.docs rename to distro/pkg/deb/bird3-doc.docs diff --git a/distro/pkg/deb/bird2.bird.init b/distro/pkg/deb/bird3.bird.init similarity index 100% rename from distro/pkg/deb/bird2.bird.init rename to distro/pkg/deb/bird3.bird.init diff --git a/distro/pkg/deb/bird2.bird.service b/distro/pkg/deb/bird3.bird.service similarity index 100% rename from distro/pkg/deb/bird2.bird.service rename to distro/pkg/deb/bird3.bird.service diff --git a/distro/pkg/deb/bird2.docs b/distro/pkg/deb/bird3.docs similarity index 100% rename from distro/pkg/deb/bird2.docs rename to distro/pkg/deb/bird3.docs diff --git a/distro/pkg/deb/bird2.install b/distro/pkg/deb/bird3.install similarity index 75% rename from distro/pkg/deb/bird2.install rename to distro/pkg/deb/bird3.install index d0fad47d8..ccb76ff0c 100644 --- a/distro/pkg/deb/bird2.install +++ b/distro/pkg/deb/bird3.install @@ -1,6 +1,6 @@ -etc/bird/bird.conf /usr/share/bird2/ debian/envvars /etc/bird/ debian/prepare-environment /usr/lib/bird/ +etc/bird/bird.conf /usr/share/bird3/ usr/sbin/bird usr/sbin/birdc usr/sbin/birdcl diff --git a/distro/pkg/deb/bird2.manpages b/distro/pkg/deb/bird3.manpages similarity index 100% rename from distro/pkg/deb/bird2.manpages rename to distro/pkg/deb/bird3.manpages diff --git a/distro/pkg/deb/bird2.postinst b/distro/pkg/deb/bird3.postinst similarity index 82% rename from distro/pkg/deb/bird2.postinst rename to distro/pkg/deb/bird3.postinst index 8f85b15ad..0340a0b18 100644 --- a/distro/pkg/deb/bird2.postinst +++ b/distro/pkg/deb/bird3.postinst @@ -9,8 +9,8 @@ if [ "$1" = "configure" ]; then dpkg-statoverride --list /etc/bird > /dev/null || dpkg-statoverride --update --add bird bird 0750 /etc/bird - ucf /usr/share/bird2/bird.conf /etc/bird/bird.conf - ucfr -f bird2 /etc/bird/bird.conf + ucf /usr/share/bird3/bird.conf /etc/bird/bird.conf + ucfr -f bird3 /etc/bird/bird.conf dpkg-statoverride --list /etc/bird/bird.conf > /dev/null || dpkg-statoverride --update --add bird bird 0640 /etc/bird/bird.conf fi diff --git a/distro/pkg/deb/bird2.postrm b/distro/pkg/deb/bird3.postrm similarity index 84% rename from distro/pkg/deb/bird2.postrm rename to distro/pkg/deb/bird3.postrm index ab03e6e6d..f82a1c175 100644 --- a/distro/pkg/deb/bird2.postrm +++ b/distro/pkg/deb/bird3.postrm @@ -4,7 +4,7 @@ set -e if test "$1" = "purge"; then # Check if there is no collision of ownership of /etc/bird/bird.conf - if ! command -v ucf ucfr >/dev/null || ucfr bird2 /etc/bird/bird.conf 2>/dev/null; then + if ! command -v ucf ucfr >/dev/null || ucfr bird3 /etc/bird/bird.conf 2>/dev/null; then dpkg-statoverride --remove /etc/bird >/dev/null 2>/dev/null || true dpkg-statoverride --remove /etc/bird/bird.conf >/dev/null 2>/dev/null || true @@ -14,7 +14,7 @@ if test "$1" = "purge"; then rm -f /etc/bird/bird.conf if command -v ucf ucfr >/dev/null; then ucf --purge /etc/bird/bird.conf - ucfr --purge bird2 /etc/bird/bird.conf + ucfr --purge bird3 /etc/bird/bird.conf fi deluser --quiet bird > /dev/null || true diff --git a/distro/pkg/deb/changelog b/distro/pkg/deb/changelog index cdfe3d954..360d97813 100644 --- a/distro/pkg/deb/changelog +++ b/distro/pkg/deb/changelog @@ -1,4 +1,4 @@ -bird2 ({{ version }}-cznic.{{ release }}) unstable; urgency=medium +bird3 ({{ version }}-cznic.{{ release }}) unstable; urgency=medium * upstream package diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control index 638795e28..90cd11b66 100644 --- a/distro/pkg/deb/control +++ b/distro/pkg/deb/control @@ -1,36 +1,42 @@ -Source: bird2 +Source: bird3 Section: net Priority: optional -Build-Depends: bison, - debhelper, - docbook-xsl, - flex, - libncurses-dev, - libreadline-dev | libreadline6-dev | libreadline5-dev, - libssh-gcrypt-dev, - m4, - quilt, - xsltproc -Build-Depends-Indep: linuxdoc-tools-latex, - opensp, - texlive-latex-extra +Build-Depends: + bison, + debhelper, + docbook-xsl, + flex, + libncurses-dev, + libreadline-dev | libreadline6-dev | libreadline5-dev, + libssh-gcrypt-dev, + m4, + quilt, + xsltproc, +Build-Depends-Indep: + linuxdoc-tools-latex, + opensp, + texlive-latex-extra, Maintainer: Jakub Ružička -Uploaders: Ondřej Surý -Standards-Version: 4.6.2 -Vcs-Browser: https://salsa.debian.org/debian/bird2 -Vcs-Git: https://salsa.debian.org/debian/bird2.git +Standards-Version: 4.7.0 +Vcs-Browser: https://salsa.debian.org/debian/bird3 +Vcs-Git: https://salsa.debian.org/debian/bird3.git Homepage: https://bird.network.cz/ -Package: bird2 -Architecture: kfreebsd-any linux-any -Pre-Depends: init-system-helpers, - ${misc:Pre-Depends} -Depends: adduser, - ucf, - ${misc:Depends}, - ${shlibs:Depends} -Conflicts: bird -Suggests: bird2-doc +Package: bird3 +Architecture: linux-any kfreebsd-any +Pre-Depends: + init-system-helpers, + ${misc:Pre-Depends}, +Depends: + adduser, + ucf, + ${misc:Depends}, + ${shlibs:Depends}, +Conflicts: + bird2, + bird, +Suggests: + bird3-doc, Description: Internet Routing Daemon BIRD is an Internet routing daemon with full support for all the major routing protocols. It allows redistribution between protocols with a @@ -41,10 +47,11 @@ Description: Internet Routing Daemon protocols. It also supports supplementary protocols like BFD, RPKI-Router and IPv6 router advertisements. -Package: bird2-doc +Package: bird3-doc Architecture: all Section: doc -Depends: ${misc:Depends} +Depends: + ${misc:Depends}, Description: Internet Routing Daemon - documentation BIRD is an Internet routing daemon with full support for all the major routing protocols. It allows redistribution between protocols with a diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules index 1740fb954..a3494e54f 100755 --- a/distro/pkg/deb/rules +++ b/distro/pkg/deb/rules @@ -11,7 +11,7 @@ include /usr/share/dpkg/default.mk COMMON_FLAGS= --prefix=/usr --sysconfdir=/etc/bird --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info --localstatedir=/var --runstatedir=/run/bird \ - --docdir=\$${prefix}/share/bird2 \ + --docdir=\$${prefix}/share/bird3 \ --enable-client CFLAGS += -g -O2 -fno-strict-aliasing -fno-strict-overflow -fPIC diff --git a/distro/tests/control b/distro/tests/control index f588af8f9..01f081888 100644 --- a/distro/tests/control +++ b/distro/tests/control @@ -1,3 +1,3 @@ Tests: test-bird.sh Restrictions: needs-root -Depends: bird2, iproute2 +Depends: bird3, iproute2