debian: 7.2.1 prep

Just the odd housekeeping bits.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/debian/changelog b/debian/changelog
index 14de1428872d23ceb746afaebc1eefee8381948c..3ccc15cedfab2ce74594d11eaad284192ca1431c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+frr (7.2.1-1) UNRELEASED; urgency=medium
+
+  * new upstream release
+  * daemon man pages renamed to frr-* (closes: #944392)
+  * fix/improve multi-arch markers on doc
+  * fix git URLs to point to debian branch
+
+ -- David Lamparter <equinox-debian@diac24.net>  Mon, 20 Jan 2020 16:29:43 +0100
+
 frr (7.2-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/debian/control b/debian/control
index ab2df2043232b55a255a49adca1ffd8ca1bf5b5b..f4275471d56cb361ad645c67b438f5ca2b8203cb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -31,10 +31,10 @@ Build-Depends:
  python3-sphinx,
  python3-pytest <!nocheck>,
  texinfo (>= 4.7)
-Standards-Version: 4.2.1
+Standards-Version: 4.4.1
 Homepage: https://www.frrouting.org/
-Vcs-Browser: https://github.com/FRRouting/frr/
-Vcs-Git: https://github.com/FRRouting/frr.git
+Vcs-Browser: https://github.com/FRRouting/frr/tree/debian/master
+Vcs-Git: https://github.com/FRRouting/frr.git -b debian/master
 
 Package: frr
 Architecture: linux-any
@@ -104,6 +104,7 @@ Build-Profiles: <!pkg.frr.nortrlib>
 Package: frr-doc
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends:
  ${misc:Depends},
  libjs-jquery,

diff --git a/debian/frr.lintian-overrides b/debian/frr.lintian-overrides
index a3e6fcdc257fbcab13687fc4b6e1ebed571b1a2a..616f265e0142199a1a195ab51c7a84c30ec802fa 100644 (file)
--- a/debian/frr.lintian-overrides
+++ b/debian/frr.lintian-overrides
@@ -6,5 +6,8 @@ frr binary: spelling-error-in-binary usr/lib/frr/zebra writen written
 frr binary: spelling-error-in-binary usr/lib/frr/pimd writen written
 frr binary: spelling-error-in-binary usr/lib/frr/pimd iif if
 
+# prefixed man pages for off-PATH daemons
+manpage-without-executable
+
 # personal name
 spelling-error-in-copyright Ang And