[Kst] kdeextragear-2/kst

[George Staikos]

CVS commit by staikos: 

fix test1.sh and prepare 1.1.0 developer release 1


  M +2 -1      RELEASE.NOTES   1.5
  M +1 -1      kst.lsm   1.23
  M +1 -1      kst.spec.in   1.48
  M +2 -2      devel-docs/RELEASE   1.14
  M +1 -1      kst/kstversion.h   1.10
  M +6 -6      tests/test1.sh   1.12


--- kdeextragear-2/kst/RELEASE.NOTES  #1.4:1.5
@@ -1,2 +1,3 @@
-Known issues in 1.1.0:
+Known issues in 1.1.0-dr1:
+- Translations are broken or missing
 

--- kdeextragear-2/kst/kst.lsm  #1.22:1.23
@@ -1,5 +1,5 @@
 Begin3
 Title:          Kst 
-Version:        1.1.0_devel
+Version:        1.1.0_dr1
 Entered-date:   
 Description:    A data viewing program.

--- kdeextragear-2/kst/kst.spec.in  #1.47:1.48
@@ -5,5 +5,5 @@
 Summary: A data viewing program for KDE.
 Name: kst
-Version: 1.1.0_devel
+Version: 1.1.0_dr1
 Release: 1
 Source0: kst-%{version}.tar.gz

--- kdeextragear-2/kst/devel-docs/RELEASE  #1.13:1.14
@@ -7,9 +7,9 @@
 - set the version numbers in kst.lsm and kst.spec.in
 - set the libkst version number
-- tag CVS
+- update ../doc
 - make sure documentation has correct version for the <releaseinfo> tag
   of index.docbook and correct version of KST, QT, and KDE in the installation
   instructions of install-chapter.docbook
-- update ../doc
+- tag CVS
 - prepare for a KDE 3.1 install!  Set min config appropriately
 - make sure configure has been run so that the spec file is created (with the

--- kdeextragear-2/kst/kst/kstversion.h  #1.9:1.10
@@ -19,5 +19,5 @@
 #define KSTVERSION_H
 
-#define KSTVERSION "1.1.0_devel"
+#define KSTVERSION "1.1.0_dr1"
 
 #endif

--- kdeextragear-2/kst/tests/test1.sh  #1.11:1.12
@@ -6,9 +6,9 @@
 
 if [ "x$1" == "x-v" ]; then
-        VALGRIND="valgrind -v --num-callers=25";
+        VALGRIND="valgrind -v --tool=memcheck --num-callers=25";
 fi
 
 if [ "x$1" == "x-t" ]; then
-        VALGRIND="valgrind -v --skin=helgrind --num-callers=25";
+        VALGRIND="valgrind -v --tool=helgrind --num-callers=25";
 fi
 
@@ -46,5 +46,5 @@
 checkArraySize() {
         LEN=`wc -l < $TMPFILE`
-        if [ "x$LEN" == "x$2" ]; then
+        if test ! "x$LEN" = "x$2"; then
                 echo "Test $1 failed.  Expected [$2] entries, received [$LEN]."
                 return;
@@ -56,5 +56,5 @@
 checkStringResponse() {
         TESTSTR=`cat $TMPFILE | tr -d '\n'`
-        if [ "x$2" != "x$TESTSTR" ]; then
+        if test ! "x$2" = "x$TESTSTR"; then
                 echo "Test $1 failed.  Expected [$2], received [$TESTSTR]."
                 return;
@@ -115,5 +115,5 @@
 
 $DCOP scalarList >$TMPFILE
-checkArraySize 36 3
+checkArraySize 36 22 
 
 #####  Vectors
@@ -308,5 +308,5 @@
 
         LEN=`wc -l < $VTMPFILE`
-        if [ "x$LEN" == "x5" ]; then
+        if test ! "x$LEN" = "x5"; then
                 echo "Test 198 failed.  Expected [5] entries, received [$LEN].";
         fi