CONTROL files : reset version to 'standard' format

                (partly rolls back my drastic
                 all-applicatoins-same-version change)

                now format is x.y(.z)$EXTRAVERSION

                  where x.y (and aptionally .z)

                      are x : major version
                          y : minor version
                          z : application patch

                  and extra version is seconds-since-epoch

                      this value can be used to automatically
                      upgrade versions with minor changes (without
                      manual update of the control file)

3 files changed, 13 insertions, 9 deletions

diff --git a/scripts/GeneratePackageMake b/scripts/GeneratePackageMake
index 099d3e8..9d692a9 100755
--- a/scripts/GeneratePackageMake
+++ b/scripts/GeneratePackageMake
@@ -26,28 +26,28 @@ define GenerateMTControl
 @\$(OPIEDIR)/scripts/tothreaded \$< \$(OPIEDIR)/AllThreadedPackages
 endef
 
 #
 # package one control file
 # arg 1 : directory from OPIEROOT where control file resides
 # arg 2 : control file basename without -mt (no .control)
 # arg 3 : control file basename with -mt if needed
 # arg 4 : package name (value specified by Package: ...)
 #
 
 define DoPackage
-@echo \"Building ipk of \$(4)\"
-@( \$(ForSubst) ) > \$(TOPDIR)/scripts/subst
-@( \$(ForFileSubst) ) > \$(TOPDIR)/scripts/Filesubst
-@( cd \$(OPIEDIR); \\
+echo \"Building ipk of \$(4)\"
+( \$(ForSubst) ) > \$(TOPDIR)/scripts/subst
+( \$(ForFileSubst) ) > \$(TOPDIR)/scripts/Filesubst
+( cd \$(OPIEDIR); \\
   \$(OPIEDIR)/scripts/mkipkg \\
       --subst=\$(OPIEDIR)/scripts/subst \\
       --filesubst=\$(OPIEDIR)/scripts/filesubst \\
       --control=\$(OPIEDIR)/\$(1)/\$(3).control \\
       --prerm=\$(OPIEDIR)/\$(1)/\$(2).prerm \\
       --preinst=\$(OPIEDIR)/\$(1)/\$(2).preinst \\
       --postrm=\$(OPIEDIR)/\$(1)/\$(2).postrm \\
       --postinst=\$(OPIEDIR)/\$(1)/\$(2).postinst \\
       --strip=\$(STRIP) \$(OPIEDIR); \\
       rm -f \$(OPIEDIR)/Packages/\$(4)_*.ipk; \\
       mv *.ipk \$(OPIEDIR)/Packages; \\
       touch \$(OPIEDIR)/Packages/\$(4) \\
diff --git a/scripts/mkipkg b/scripts/mkipkg
index a336371..2f020f4 100755
--- a/scripts/mkipkg
+++ b/scripts/mkipkg
@@ -235,26 +235,26 @@ createFileList()
 
     _popd
 
     if [ $missing = 1 ]; then
         return 1
     fi
 
     setVar $2 "$realFileList"
 }
 
 stripFile()
 {
-    if [ -f $1 -a -x $1 ]; then
-        $strip --strip-all $1
+    if [ ! -h $1 -a -f $1 -a -x $1 ]; then
+     $strip -p --strip-all $1
     fi
 }
 
 substFile()
 {
     local oldfile=$1
 
     if [ ! -e $2 ]; then return 1; fi
 
     if [ -e $oldfile -o -L $oldfile ]; then
         newfile=`echo $oldfile|sed -f $2|sed -e's,^/,,g'`
         olddir=`dirname $oldfile`
@@ -267,25 +267,29 @@ substFile()
             return 0
         fi
 
         mkdir -p $newdir
         mv $olddir/$base $newfile
         rmdir -p $olddir 2>/dev/null
     fi
 }
 
 stripFiles()
 {
     for f in $1; do
-        stripFile ./$f
+        # do not strip links
+        if [ ! -h ./$f ]
+        then
+          stripFile ./$f
+        fi
     done
 }
 
 substFiles()
 {
     for f in $1; do
         substFile ./$f
     done
 }
 
 substAndStripFiles()
 {
diff --git a/scripts/tothreaded b/scripts/tothreaded
index 31ed31e..f916ad8 100755
--- a/scripts/tothreaded
+++ b/scripts/tothreaded
@@ -19,28 +19,28 @@ tokenize() {
 #
 # function converts package name to threaded equivalend IF the
 # package file HAS a threaded version
 #
 findthreadedequiv() {
       local isin i
       for i in $*
       do
         isin=`grep "^$i\$" "$ALLTHREADEDPKGSFILE"`
         if [ -z "$isin" ]
         then
           # no threaded package
-          echo -n "$i "
+          echo -n "$i"
         else
           # threaded package
-          echo -n "${isin}-mt " 
+          echo -n "${isin}-mt" 
         fi
       done
       echo 
 }
 
 #
 # signature of binary files
 # currently obsolete
 #
 # ISBINARY="*ELF*LSB*"
 
 usage() {