4 files changed, 11 insertions, 6 deletions

diff --git a/core/opiealarm/opie-opiealarm.control b/core/opiealarm/opie-opiealarm.control
index 5413ba8..9581649 100644
--- a/core/opiealarm/opie-opiealarm.control
+++ b/core/opiealarm/opie-opiealarm.control
@@ -1,13 +1,13 @@
-Files: bin/opiealarm bin/opieatd root/etc/init.d/opieatd root/etc/rc2.d/S96opieatd root/etc/suspend-scripts/S46opiealarm root/etc/resume-scripts/R46opiealarm
+Files: bin/opiealarm bin/opieatd root/etc/init.d/opieatd root/etc/suspend-scripts/S46opiealarm root/etc/resume-scripts/R46opiealarm
 Priority: required
 Provides: ipaqalarm
 Conflicts: ipaqalarm
 Section: opie/system
 Maintainer: Robert Griebl <sandman@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: hotplug
 Description: A wakeup system for OPIE events.
  Tiny, OPIE specific  replacement for ipaqalarm,
  uschedule and qpe2uschedule
  
diff --git a/core/opiealarm/opie-opiealarm.postinst b/core/opiealarm/opie-opiealarm.postinst
index 7fc8350..58298e1 100755
--- a/core/opiealarm/opie-opiealarm.postinst
+++ b/core/opiealarm/opie-opiealarm.postinst
@@ -1,4 +1,12 @@
 #/bin/sh
 
+ln -sf ../init.d/opieatd /etc/rc0.d/K96opieatd
+ln -sf ../init.d/opieatd /etc/rc1.d/K96opieatd
+ln -sf ../init.d/opieatd /etc/rc6.d/K96opieatd
+ln -sf ../init.d/opieatd /etc/rc2.d/S96opieatd
+ln -sf ../init.d/opieatd /etc/rc3.d/S96opieatd
+ln -sf ../init.d/opieatd /etc/rc4.d/S96opieatd
+ln -sf ../init.d/opieatd /etc/rc5.d/S96opieatd
 /etc/init.d/opieatd start
-exit 0
\ No newline at end of file
+
+exit 0
diff --git a/core/opiealarm/opie-opiealarm.prerm b/core/opiealarm/opie-opiealarm.prerm
index b37df5e..5e797b6 100755
--- a/core/opiealarm/opie-opiealarm.prerm
+++ b/core/opiealarm/opie-opiealarm.prerm
@@ -1,4 +1,5 @@
 #/bin/sh
 
 /etc/init.d/opieatd stop
+find /etc -name [SK][0-9][0-9]opieatd | xargs rm -f
 exit 0
diff --git a/mkipks b/mkipks
index 798e73f..b238935 100755
--- a/mkipks
+++ b/mkipks
@@ -1,112 +1,108 @@
 #!/bin/sh
 
 QTE_VERSION=2.3.4
 DEB_VERSION=2.0
 
 # Have to do this here, since CVS can't store symlinks
 mkdir -p $OPIEDIR/etc/rc2.d
 ln -sf ../init.d/opie $OPIEDIR/etc/rc2.d/S98opie
 
 mkdir -p $OPIEDIR/etc/rcS.d
 ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash
 
-ln -sf ../init.d/opieatd $OPIEDIR/root/etc/rc2.d/S96opieatd
-
-
-
 VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
 VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
 VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
 SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h)
 if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h
 then
     [ -z "$VERSION_CVS" ] && VERSION_CVS="$(date +%Y%m%d)"
     SUB_VERSION=$VERSION_CVS
 else
     VERSION_CVS=""
 fi
 
 QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT
 
 ARCH=arm
 STRIP=arm-linux-strip
 STRIP_FILES="*ARM*not stripped"
 
 TDIR=/tmp/ipk$$
 DATADIR=$TDIR
 CTRLDIR=$TDIR/CONTROL
 
 IMAGEDIR=
 VERB=
 LIST=
 RPM=
 
 while [ $# -ne 0 ]
 do
     case "$1" in
      -v)
         VERB=1
         echo >&2 "Packaging for version $VERSION_MAJ.$VERSION_MIN.$VERSION_PAT$VERSION_CVS"
     ;; -l)
         LIST=1
     ;; -i)
         shift
         IMAGEDIR=$1
         DATADIR=$IMAGEDIR
         mkdir -p $IMAGEDIR
     ;; -classic)
         classicopts=-c
     ;; -rpm)
         if [ "$OPIEDIR" != "/opt/Qtopia" ]
         then
             echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.'
             sleep 1
             #exit 1
         fi
         RPM=1
     ;; -arch)
         shift
         ARCH=$1
         STRIP=
         STRIP_FILES=
     ;; /*)
         FILES="$FILES $1"
     ;; *)
         FILES="$FILES $PWD/$1"
     esac
     shift
 done
 
 if [ -z "$FILES" ]
 then
     FILES=`find $OPIEDIR -name "*.control" -print`
 fi
 
 RDIR=$PWD
 ORIGDIR=`pwd`
 cd $OPIEDIR
 
 for i in $FILES
 do
     rm -rf $TDIR
 
     mkdir -p $DATADIR
     mkdir -p $CTRLDIR
 
     packagename=${i##*/}; packagename=${packagename%.control}
     version=$(eval echo '"'$(sed -n -e "s/^Version: *//p" $i)'"')
     depends=$(eval echo '"'$(sed -n -e "s/^Depends: *//p" $i)'"')
     files=$(eval echo $(sed -n -e "s/^Files://p" $i))
     arch=$(eval echo $(sed -n -e "s/^Arch://p" $i))
     section=$(sed -n -e "s/^Section: *//p" $i)
     provides=$(sed -n -e "s/^Provides: *//p" $i)
     conflicts=$(sed -n -e "s/^Conflicts: *//p" $i)
     license=$(sed -n -e "s/^License: *//p" $i)
     summary=$(sed -n -e "s/^Description: *//p" $i)
     package=${packagename}_${version}_$ARCH
     ERROR=
     if [ -z "$files" ]
     then
         mkdir -p $DATADIR/usr/share/doc/$packagename
     else
         for f in $files