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>

diff --git a/Makefile b/Makefile
index 18861d0c9be430b3429d96a922885d60b47c7efc..18e994f7a64589f72e12db18f854792639bd2135 100644 (file)
--- 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}