From 930d323e2874054e0e627693da7c6ce331774f32 Mon Sep 17 00:00:00 2001
From: Alexandre Derumier <aderumier@odiso.com>
Date: Mon, 31 Dec 2018 10:29:33 +0100
Subject: [PATCH] Makefile : bump to 6.0.1

also,
 - debianpkg in frr repo is now debian
 - use DEB_BUILD_PROFILES=pkg.frr.nortrlib as librtr-dev is only in sid

Signed-off-by: Rhonda D'Vine <rhonda@proxmox.com>
---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 18861d0..18e994f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PACKAGE=frr
-VER=6.0
+VER=6.0.1
 PKGREL=0+pve
 
 SRCDIR=frr
@@ -16,7 +16,7 @@ all: ${DEB}
 
 .PHONY: submodule
 submodule:
-	test -f "${SRCDIR}/debianpkg/changelog" || git submodule update --init
+	test -f "${SRCDIR}/debian/changelog" || git submodule update --init
 
 .PHONY: deb
 deb: ${DEB}
@@ -24,8 +24,9 @@ ${DEB}: | submodule
 	rm -f *.deb
 	rm -rf $(BUILDDIR)
 	cp -rpa ${SRCDIR} ${BUILDDIR}
-	cp -a debian ${BUILDDIR}
-	cd ${BUILDDIR}; dpkg-buildpackage -rfakeroot -b -uc -us
+	rm $(BUILDDIR)/debian/changelog
+	cp -R debian/* $(BUILDDIR)/debian/
+	cd ${BUILDDIR};  DEB_BUILD_PROFILES=pkg.frr.nortrlib dpkg-buildpackage -rfakeroot -b -uc -us
 
 .PHONY: upload
 upload: ${DEB}