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 d0fad47d84b4203611b78cf1ba87fc46b414334a..ccb76ff0c66c08035162357e9597acfe9d5c579c 100644 (file)
--- 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 8f85b15ad1a7e01ffec4551272917dbd127936c3..0340a0b18a4d0195b8a7e1496a9ce6f57476f817 100644 (file)
--- 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 ab03e6e6d451178bd66d6db6d1d79e3e19698181..f82a1c1755febf71c090534f3bf12559311ed028 100644 (file)
--- 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 cdfe3d9548a0e8753fec10501e9763a2f15d5a16..360d97813e67e698ab062f2e0c101e9d64ef99be 100644 (file)
--- 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 638795e28df18d16f46acfcc7a0330dfca98bb0e..90cd11b662fdd7a2d4d2e4979457f1d05d01e257 100644 (file)
--- 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 <jakub.ruzicka@nic.cz>
-Uploaders: Ondřej Surý <ondrej@debian.org>
-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 1740fb95489ea72f5ccf10606b9ed6584a497f7f..a3494e54f69dd5f20dd8504294b3b0210b60197c 100755 (executable)
--- 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 f588af8f9209e8e01ebe1346de2a1433b1c00c97..01f0818886674617f84e4af4059741a1c2586a40 100644 (file)
--- 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