Merge branch 'feature/upstream' into develop

1 files changed, 8 insertions, 6 deletions

diff --git a/setver b/setver
index 656235d..aa9c119 100755
--- a/setver
+++ b/setver
@@ -6,7 +6,7 @@
 #    [doinc?] is 'n'.
 #    if [doinc?] is 'r', reverse increment (decrement).
 #
-ver=3.0.7
+ver=3.1.0
 rel=1
 tmped=/tmp/edver.tmp
 tmpspec=/tmp/edspec.tmp
@@ -197,12 +197,12 @@ q
   ed debpkg/changelog   <$tmped
 fi
 
-cmdc="ialarms.c icmd.c iconfig.c ievents.c ifru.c igetevent.c ihealth.c 
+cmdc="ifruset.c iseltime.c ievents.c idiscover.c ipmiutil.c"
+otherc="ialarms.c icmd.c iconfig.c ievents.c ifru.c igetevent.c ihealth.c 
       ilan.c ireset.c isel.c isensor.c iserial.c isol.c iwdt.c itsol.c  
-      ifruset.c ipicmg.c ifirewall.c idcmi.c iuser.c iseltime.c 
+      ipicmg.c ifirewall.c idcmi.c iuser.c iekanalyzer.c ifwum.c ihpm.c
       oem_intel.c oem_kontron.c oem_dell.c oem_hp.c oem_sun.c oem_asus.c 
-      oem_fujitsu.c oem_lenovo.c oem_newisys.c oem_quanta.c oem_supermicro.c
-      iekanalyzer.c ifwum.c ihpm.c idiscover.c"
+      oem_fujitsu.c oem_lenovo.c oem_newisys.c oem_quanta.c oem_supermicro.c"
 
 if [ $skipinc -ne 1 ]
 then
@@ -211,7 +211,7 @@ then
   #utilc="ipmiutil.c ialarms.c icmd.c iconfig.c igetevent.c ihealth.c 
      #ifru.c ilan.c ireset.c isensor.c isel.c iserial.c isol.c iwdt.c
      #ievents.c idiscover.c ipmi_port.c"
-  utilc="ipmiutil.c  $cmdc ipmi_port.c"
+  utilc="$cmdc"
   echo $utilc >$cmdf
 
   cd util
@@ -239,8 +239,10 @@ then
           alias=ipmi_port
       elif [ "$f" = "iseltime.c" ]; then
           alias=iseltime
+          do_incr=0
       elif [ "$f" = "ifruset.c" ]; then
           alias=ifruset
+          do_incr=0
       elif [ "$f" = "idiscover.c" ]; then
           do_incr=0
       elif [ "$f" = "iekanalyzer.c" ]; then