7 files changed, 9 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index a42c772..4278d1f 100644
--- a/Makefile
+++ b/Makefile
@@ -86,49 +86,49 @@ NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
         noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
          noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
          noncore/apps/opie-console noncore/apps/opie-write
         
 NONNET = noncore/net/networksetup \
         noncore/net/ftplib noncore/net/opieftp \
         noncore/mail
 
 NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
         noncore/graphics/qpdf noncore/apps/confedit
 
 
 NONCOMM = noncore/comm/keypebble
 
 PLUGINS = freetype
 
 APPS=$(LOCALAPPS) $(PIMAPPS)  $(COREAPPS)     \
         $(COREMULTIMEDIA) $(CORESETTINGS) \
         $(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
         $(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
         $(NONCOMM) $(GAMES) $(TODAYPLUGINS) $(PLUGINS)
     
     
 
-NONTMAKEAPPS := ipaq/opiealarm 
+NONTMAKEAPPS := root/opiealarm 
 
 DOCS = docs/src/opie-policy
 
 dynamic: $(APPS) $(NONTMAKEAPPS)
 
 docs: $(DOCS)
 
 $(COMPONENTS): $(LIBS)
 
 $(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
 
 $(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS):
         $(MAKE) -C $@ -f Makefile
 
 showcomponents:
         @echo $(LIBS) $(APPS) $(COMPONENTS)
 
 clean:
         for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
 
 lupdate:
         for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
 
 lrelease:
diff --git a/Makefile.x11 b/Makefile.x11
index 4733e10..9aa96da 100644
--- a/Makefile.x11
+++ b/Makefile.x11
@@ -78,49 +78,49 @@ GAMES = noncore/games/minesweep noncore/games/solitaire \
         noncore/games/kbill noncore/games/buzzword \
         noncore/games/bounce 
 
 NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
         noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
         noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
         
 NONNET = noncore/net/netsetup noncore/net/opieftp \
         noncore/mail
 
 NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
         noncore/graphics/qpdf noncore/apps/confedit
 
 
 NONCOMM = noncore/comm/keypebble
 
 APPS=$(LOCALAPPS) $(PIMAPPS)  $(COREAPPS)     \
         $(CORESETTINGS) \
         $(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
         $(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
         $(NONCOMM) $(GAMES) $(TODAYPLUGINS)
     
     
 
-NONTMAKEAPPS := ipaq/opiealarm 
+NONTMAKEAPPS := root/opiealarm 
 
 DOCS = docs/src/opie-policy
 single: mpegplayer/libmpeg3
 
 dynamic: $(APPS) $(NONTMAKEAPPS)
 
 docs: $(DOCS)
 
 $(COMPONENTS): $(LIBS)
 
 $(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
 
 $(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS) single:
         $(MAKE) -C $@ -f Makefile
 
 showcomponents:
         @echo $(LIBS) $(APPS) $(COMPONENTS) single
 
 clean:
         $(MAKE) -C single -f Makefile $@
         for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
 
 lupdate:
         for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
diff --git a/core/opiealarm/opie-opiealarm.control b/core/opiealarm/opie-opiealarm.control
index b63fa66..5413ba8 100644
--- a/core/opiealarm/opie-opiealarm.control
+++ b/core/opiealarm/opie-opiealarm.control
@@ -1,13 +1,13 @@
-Files: bin/opiealarm bin/opieatd ipaq/etc/init.d/opieatd ipaq/etc/rc2.d/S96opieatd ipaq/etc/suspend-scripts/S46opiealarm ipaq/etc/resume-scripts/R46opiealarm
+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
 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/mkipks b/mkipks
index ca934d8..798e73f 100755
--- a/mkipks
+++ b/mkipks
@@ -1,37 +1,37 @@
 #!/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/ipaq/etc/rc2.d/S96opieatd
+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
@@ -109,50 +109,50 @@ do
     then
         mkdir -p $DATADIR/usr/share/doc/$packagename
     else
         for f in $files
         do
             if [ -d $f ]
             then
                 ffiles=$(find $f -type f -o -type b -o -type c -o -type l)
             else
                 ffiles=$f
             fi
             for ff in $ffiles
             do
                 case $ff in
                     */CVS/*)
                     continue
                         ;;*~)
                     continue
                         ;;*.control)
                     continue
                 ;; $QTDIR/*)
                     BASE=$(dirname /opt/QtPalmtop/${ff#$QTDIR/})
                 ;; etc/*.d/*)
                     BASE=$(dirname /$ff)
-                ;; ipaq/*)
-                    BASE=$(dirname ${ff#ipaq})
+                ;; root/*)
+                    BASE=$(dirname ${ff#root})
                 ;; *)
                     # For SHARP ROM compatibility. Should change to Qtopia.
                     BASE=/opt/QtPalmtop/$(dirname $ff)
                 esac
 
                 if [ -f $ff -o -b $ff -o -c $ff ]
                 then
                     D=$DATADIR$BASE
                     if [ -x $ff -a -n "$STRIP" ]
                     then
                         case $(file $ff) in
                          $STRIP_FILES)
                             $STRIP $ff
                          ;; *)
                         esac
                     fi
                     if [ -n "$RPM" ]
                     then
                         case "$ff" in
                          /*) RPMFILES="$RPMFILES $ff"
                         ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff"
                         esac
                     else
                         mkdir -p $D
diff --git a/root/opie-windows2000-ppp-scripts.control b/root/opie-windows2000-ppp-scripts.control
index 48249ed..cdd671c 100644
--- a/root/opie-windows2000-ppp-scripts.control
+++ b/root/opie-windows2000-ppp-scripts.control
@@ -1,7 +1,7 @@
-Files: ipaq/etc/hosts ipaq/etc/inittab ipaq/etc/ppp
+Files: root/etc/hosts ipaq/etc/inittab ipaq/etc/ppp
 Priority: optional
 Section: opie/system
 Maintainer: Trenton Schulz <twschulz@trolltech.com>
 Architecture: arm
 Version: 1.0
 Description: PPP configuration file needed for Windows 2000 and syncing
diff --git a/root/ptydevs.control b/root/ptydevs.control
index dbff09f..45b3b6d 100644
--- a/root/ptydevs.control
+++ b/root/ptydevs.control
@@ -1,9 +1,9 @@
-Files: ipaq/dev
+Files: root/dev
 Priority: optional
 Section: base
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Version: 1.0.0-5
 Architecture: arm
 Description: Pseudotty devices
  These files are not included in the Familiar libc6 package.
  This package contains just a few pty/tty pairs.
diff --git a/root/timezones.control b/root/timezones.control
index c209d7c..43a1579 100644
--- a/root/timezones.control
+++ b/root/timezones.control
@@ -1,9 +1,9 @@
-Files: ipaq/usr/share/zoneinfo
+Files: root/usr/share/zoneinfo
 Priority: optional
 Section: base
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Version: 1.0.0-6
 Description: Timezone data
  These files are not included in the Familiar libc6 package.
  This package contains just the non-redundant parts, and uses
  about 180K with jffs2.