From b18f5bf2db0fba2e7e539f68645836036d940d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 29 Apr 2015 15:44:44 +0200
Subject: Imported Upstream version 2.9.6

---
 setver | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'setver')

diff --git a/setver b/setver
index 054798a..87237fc 100755
--- a/setver
+++ b/setver
@@ -6,7 +6,7 @@
 #    [doinc?] is 'n'.
 #    if [doinc?] is 'r', reverse increment (decrement).
 #
-ver=2.9.3
+ver=2.9.6
 rel=1
 tmped=/tmp/edver.tmp
 tmpspec=/tmp/edspec.tmp
@@ -59,10 +59,11 @@ AM_INIT_AUTOMAKE(ipmiutil,$ver)
 w
 q
 %%%
-if [ -f configure.in ]; then
-  ed configure.in <$tmped
+if [ -f configure.ac ]; then
+  sed -i "/AC_INIT(ipmiutil,/cAC_INIT(ipmiutil,$ver)" configure.ac
+  # sed -i "/INIT_AUTOMAKE(ipmiutil/cAM_INIT_AUTOMAKE(ipmiutil,$ver)" configure.ac
 else
-  sed -i "/INIT_AUTOMAKE(ipmiutil/cAM_INIT_AUTOMAKE(ipmiutil,$ver)" configure.ac
+  ed configure.in <$tmped
 fi
 
 cat - <<%%% >$tmped
@@ -117,9 +118,7 @@ then
   ed ../buildipmiutil.sh   <$tmped
 fi
 
-if [ -f ../win32/src/mkzip.bat ]
-then
-  cat - <<%%% >$tmped
+cat - <<%%% >$tmped
 1
 /^set pkgver
 c
@@ -128,8 +127,12 @@ set pkgver=${ver}
 w
 q
 %%%
+if [ -f ../win32/src/mkzip.bat ]; then
   ed ../win32/src/mkzip.bat   <$tmped
 fi
+if [ -f ../win32/src/mkzip32.bat ]; then
+  ed ../win32/src/mkzip32.bat   <$tmped
+fi
 if [ -f ../win32/src/mkzip64.bat ]; then
   ed ../win32/src/mkzip64.bat   <$tmped
 fi
@@ -176,7 +179,7 @@ q
   ed ../../ipmimisc/buildmisc.sh   <$tmped
 fi
 
-if [ -f debian/changelog ]; then
+if [ -f debpkg/changelog ]; then
   rdate=`date -R`
   cat - <<%%% >$tmped
 1
@@ -191,7 +194,7 @@ ipmiutil (${ver}-${rel}) unstable; urgency=low
 w
 q
 %%%
-  ed debian/changelog   <$tmped
+  ed debpkg/changelog   <$tmped
 fi
 
 cmdc="ialarms.c icmd.c iconfig.c ievents.c ifru.c igetevent.c ihealth.c 
-- 
cgit v1.2.3