update packaging

 - fix build number, when not specified defaults to 0 which
   doesn't affect number when it is defined.
 - fix bionic release version
 - remove suggested vpp-nsh-package since it is not being built
   anymore (last version is 18.07)

Change-Id: Ic92118d2c3096879b3ed2f10454cf41f0fa2a0b8
Signed-off-by: Michal Cmarada <[email protected]>

diff --git a/packaging/deb/bionic/prepare.sh b/packaging/deb/bionic/prepare.sh
index 4994952..19be361 100755 (executable)
--- a/packaging/deb/bionic/prepare.sh
+++ b/packaging/deb/bionic/prepare.sh
@@ -35,7 +35,7 @@ cp ${SOURCE_DIR}/$3 ${BUILD_DIR}
 cat <<EOT >> ${BUILD_DIR}/debian/changelog
 honeycomb (${VERSION}-${RELEASE}) unstable; urgency=low
 
-  * 19.04 release
+  * 19.08 release
 
  -- mcmarada <[email protected]>  Thu, 18 Oct 2018 13:42:07 +0200
 EOT
@@ -60,7 +60,7 @@ Vcs-Browser: https://git.fd.io/cgit/hc2vpp/tree/
 Package: honeycomb
 Architecture: all
 Depends: ${VPP_DEPENDENCIES}, openjdk-11-jre-headless
-Suggests: vpp-nsh-plugin
+Suggests:
 Description: Honeycomb agent for VPP
 EOT
 

diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh
index bb57884..724a882 100755 (executable)
--- a/packaging/deb/common/prepare.sh
+++ b/packaging/deb/common/prepare.sh
@@ -60,7 +60,7 @@ Vcs-Browser: https://git.fd.io/cgit/hc2vpp/tree/
 Package: honeycomb
 Architecture: all
 Depends: ${VPP_DEPENDENCIES}, openjdk-8-jre-headless
-Suggests: vpp-nsh-plugin
+Suggests:
 Description: Honeycomb agent for VPP
 EOT
 

diff --git a/packaging/rpm/release b/packaging/rpm/release
index 0d10fc0..6aa0c5b 100755 (executable)
--- a/packaging/rpm/release
+++ b/packaging/rpm/release
@@ -3,7 +3,7 @@
 # Snapshot version (do not use on stable branch)
 #
 #
-echo $(expr $BUILD_NUMBER)
+echo $(expr $BUILD_NUMBER + 0)
 #
 # Stable versions
 #