From 889698f7bd23e17458db7e6eaafe94ed62e2c5c5 Mon Sep 17 00:00:00 2001
From: Babis Kaidos <ckaidos@intracom-telecom.com>
Date: Mon, 16 Mar 2015 15:28:20 +0200
Subject: [PATCH 1/2] New netbee lib, fixes need for very old bison

---
 util/install.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/util/install.sh b/util/install.sh
index 4962aea..524e506 100755
--- a/util/install.sh
+++ b/util/install.sh
@@ -189,17 +189,18 @@ function of13 {
     fi
 
     # Install netbee
-    NBEESRC="nbeesrc-jan-10-2013"
+    NBEESRC="nbeesrc-feb-24-2015"
     NBEEURL=${NBEEURL:-http://www.nbee.org/download/}
     wget -nc ${NBEEURL}${NBEESRC}.zip
     unzip ${NBEESRC}.zip
-    cd ${NBEESRC}/src
+    NBEEDIR=netbee
+    cd ${NBEEDIR}/src
     cmake .
     make
     cd $BUILD_DIR/
-    sudo cp ${NBEESRC}/bin/libn*.so /usr/local/lib
+    sudo cp ${NBEEDIR}/bin/libn*.so /usr/local/lib
     sudo ldconfig
-    sudo cp -R ${NBEESRC}/include/ /usr/
+    sudo cp -R ${NBEEDIR}/include/ /usr/
 
     # Resume the install:
     cd $BUILD_DIR/ofsoftswitch13

From 7acc693277f1c8af9ef4ad7e085e0c7820dea3e3 Mon Sep 17 00:00:00 2001
From: Babis Kaidos <ckaidos@intracom-telecom.com>
Date: Wed, 18 Mar 2015 17:59:29 +0200
Subject: [PATCH 2/2] New netbee library is installed for Ubuntu 14.04 and
 newer. For older releases or for other OSs the old netbee is installed

---
 util/install.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/util/install.sh b/util/install.sh
index 524e506..70797fe 100755
--- a/util/install.sh
+++ b/util/install.sh
@@ -189,11 +189,17 @@ function of13 {
     fi
 
     # Install netbee
-    NBEESRC="nbeesrc-feb-24-2015"
+    if [ "$DIST" = "Ubuntu" ] && version_ge $RELEASE 14.04; then
+        NBEESRC="nbeesrc-feb-24-2015"
+        NBEEDIR="netbee"
+    else
+        NBEESRC="nbeesrc-jan-10-2013"
+        NBEEDIR="nbeesrc-jan-10-2013"
+    fi
+
     NBEEURL=${NBEEURL:-http://www.nbee.org/download/}
     wget -nc ${NBEEURL}${NBEESRC}.zip
     unzip ${NBEESRC}.zip
-    NBEEDIR=netbee
     cd ${NBEEDIR}/src
     cmake .
     make