From 987198a5e2c852292b97ad8ae1c14cc7daaf8cc1 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
Date: Thu, 14 Nov 2019 23:32:44 +0100
Subject: [PATCH] bump to 7.2

This release fix last evpn bugs.
(need to update proxmox frr mirror to frr-7.2 tag)
---
 Makefile         |  2 +-
 debian/changelog |  6 ++++++
 debian/control   | 18 ++++++++++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 18e994f..3359748 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PACKAGE=frr
-VER=6.0.1
+VER=7.2
 PKGREL=0+pve
 
 SRCDIR=frr
diff --git a/debian/changelog b/debian/changelog
index 1e778d2..5edf7c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frr (7.2-0+pve) RELEASED; urgency=medium
+
+  * Bump to 7.2
+
+ -- Alexandre Derumier <aderumier@odiso.com>  Fri, 15 Nov 2010 02:01:00 +0200
+
 frr (6.0.1-0+pve) RELEASED; urgency=medium
 
   * Bump to 6.0.1
diff --git a/debian/control b/debian/control
index 0ed8bc2..ab2df20 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  install-info,
  libc-ares-dev,
  libcap-dev,
- libjson0-dev | libjson-c-dev,
+ libjson-c-dev | libjson0-dev,
  libpam0g-dev | libpam-dev,
  libpcre3-dev,
  libpython3-dev,
@@ -24,6 +24,7 @@ Build-Depends:
  libsnmp-dev,
  libssh-dev <!pkg.frr.nortrlib>,
  libsystemd-dev <!pkg.frr.nosystemd>,
+ libyang-dev (>= 0.16.74),
  pkg-config,
  python3,
  python3-dev,
@@ -45,7 +46,19 @@ Depends:
 Pre-Depends: adduser
 Recommends: frr-pythontools
 Suggests: frr-doc
-Conflicts: zebra, zebra-pj, quagga
+Conflicts:
+ zebra,
+ zebra-pj,
+ pimd,
+ quagga,
+ quagga-bgpd,
+ quagga-core,
+ quagga-isisd,
+ quagga-ospf6d,
+ quagga-ospfd,
+ quagga-pimd,
+ quagga-ripd,
+ quagga-ripngd
 Replaces: zebra, zebra-pj
 Description: FRRouting suite of internet protocols (BGP, OSPF, IS-IS, ...)
  FRRouting implements the routing protocols commonly used in the
@@ -96,6 +109,7 @@ Depends:
  libjs-jquery,
  libjs-underscore
 Suggests: frr
+Conflicts: quagga-doc
 Description: FRRouting suite - user manual
  This provides the FRR user manual in HTML form.  This is the official
  manual maintained as part of the package and is also available online