summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-20 22:04:22 (UTC)
committer kergoth <kergoth>2002-11-20 22:04:22 (UTC)
commit8f11eb1712eb8f9d83f0ace551e72e74cce57d6b (patch) (unidiff)
tree3d5a5d297fa93388ff06501ef2ec40fe552d0dd4
parentea4e55183b22dc7fd0556db3f52170a3c97ca303 (diff)
downloadopie-8f11eb1712eb8f9d83f0ace551e72e74cce57d6b.zip
opie-8f11eb1712eb8f9d83f0ace551e72e74cce57d6b.tar.gz
opie-8f11eb1712eb8f9d83f0ace551e72e74cce57d6b.tar.bz2
ipaq->root, ipaq/opiealarm->core/opiealarm
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--Makefile.x112
-rw-r--r--core/opiealarm/opie-opiealarm.control2
-rwxr-xr-xmkipks6
-rw-r--r--root/opie-windows2000-ppp-scripts.control2
-rw-r--r--root/ptydevs.control2
-rw-r--r--root/timezones.control2
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 \
86 noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \ 86 noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
87 noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \ 87 noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
88 noncore/apps/opie-console noncore/apps/opie-write 88 noncore/apps/opie-console noncore/apps/opie-write
89 89
90NONNET = noncore/net/networksetup \ 90NONNET = noncore/net/networksetup \
91 noncore/net/ftplib noncore/net/opieftp \ 91 noncore/net/ftplib noncore/net/opieftp \
92 noncore/mail 92 noncore/mail
93 93
94NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \ 94NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
95 noncore/graphics/qpdf noncore/apps/confedit 95 noncore/graphics/qpdf noncore/apps/confedit
96 96
97 97
98NONCOMM = noncore/comm/keypebble 98NONCOMM = noncore/comm/keypebble
99 99
100PLUGINS = freetype 100PLUGINS = freetype
101 101
102APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \ 102APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \
103 $(COREMULTIMEDIA) $(CORESETTINGS) \ 103 $(COREMULTIMEDIA) $(CORESETTINGS) \
104 $(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \ 104 $(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
105 $(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \ 105 $(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
106 $(NONCOMM) $(GAMES) $(TODAYPLUGINS) $(PLUGINS) 106 $(NONCOMM) $(GAMES) $(TODAYPLUGINS) $(PLUGINS)
107 107
108 108
109 109
110NONTMAKEAPPS := ipaq/opiealarm 110NONTMAKEAPPS := root/opiealarm
111 111
112DOCS = docs/src/opie-policy 112DOCS = docs/src/opie-policy
113 113
114dynamic: $(APPS) $(NONTMAKEAPPS) 114dynamic: $(APPS) $(NONTMAKEAPPS)
115 115
116docs: $(DOCS) 116docs: $(DOCS)
117 117
118$(COMPONENTS): $(LIBS) 118$(COMPONENTS): $(LIBS)
119 119
120$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS) 120$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
121 121
122$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS): 122$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS):
123 $(MAKE) -C $@ -f Makefile 123 $(MAKE) -C $@ -f Makefile
124 124
125showcomponents: 125showcomponents:
126 @echo $(LIBS) $(APPS) $(COMPONENTS) 126 @echo $(LIBS) $(APPS) $(COMPONENTS)
127 127
128clean: 128clean:
129 for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 129 for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
130 130
131lupdate: 131lupdate:
132 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 132 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
133 133
134lrelease: 134lrelease:
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 \
78 noncore/games/kbill noncore/games/buzzword \ 78 noncore/games/kbill noncore/games/buzzword \
79 noncore/games/bounce 79 noncore/games/bounce
80 80
81NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \ 81NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
82 noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \ 82 noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
83 noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \ 83 noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
84 84
85NONNET = noncore/net/netsetup noncore/net/opieftp \ 85NONNET = noncore/net/netsetup noncore/net/opieftp \
86 noncore/mail 86 noncore/mail
87 87
88NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \ 88NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
89 noncore/graphics/qpdf noncore/apps/confedit 89 noncore/graphics/qpdf noncore/apps/confedit
90 90
91 91
92NONCOMM = noncore/comm/keypebble 92NONCOMM = noncore/comm/keypebble
93 93
94APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \ 94APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \
95 $(CORESETTINGS) \ 95 $(CORESETTINGS) \
96 $(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \ 96 $(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
97 $(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \ 97 $(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
98 $(NONCOMM) $(GAMES) $(TODAYPLUGINS) 98 $(NONCOMM) $(GAMES) $(TODAYPLUGINS)
99 99
100 100
101 101
102NONTMAKEAPPS := ipaq/opiealarm 102NONTMAKEAPPS := root/opiealarm
103 103
104DOCS = docs/src/opie-policy 104DOCS = docs/src/opie-policy
105single: mpegplayer/libmpeg3 105single: mpegplayer/libmpeg3
106 106
107dynamic: $(APPS) $(NONTMAKEAPPS) 107dynamic: $(APPS) $(NONTMAKEAPPS)
108 108
109docs: $(DOCS) 109docs: $(DOCS)
110 110
111$(COMPONENTS): $(LIBS) 111$(COMPONENTS): $(LIBS)
112 112
113$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS) 113$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
114 114
115$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS) single: 115$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS) single:
116 $(MAKE) -C $@ -f Makefile 116 $(MAKE) -C $@ -f Makefile
117 117
118showcomponents: 118showcomponents:
119 @echo $(LIBS) $(APPS) $(COMPONENTS) single 119 @echo $(LIBS) $(APPS) $(COMPONENTS) single
120 120
121clean: 121clean:
122 $(MAKE) -C single -f Makefile $@ 122 $(MAKE) -C single -f Makefile $@
123 for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 123 for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
124 124
125lupdate: 125lupdate:
126 for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done 126 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 @@
1Files: bin/opiealarm bin/opieatd ipaq/etc/init.d/opieatd ipaq/etc/rc2.d/S96opieatd ipaq/etc/suspend-scripts/S46opiealarm ipaq/etc/resume-scripts/R46opiealarm 1Files: bin/opiealarm bin/opieatd root/etc/init.d/opieatd root/etc/rc2.d/S96opieatd root/etc/suspend-scripts/S46opiealarm root/etc/resume-scripts/R46opiealarm
2Priority: required 2Priority: required
3Provides: ipaqalarm 3Provides: ipaqalarm
4Conflicts: ipaqalarm 4Conflicts: ipaqalarm
5Section: opie/system 5Section: opie/system
6Maintainer: Robert Griebl <sandman@handhelds.org> 6Maintainer: Robert Griebl <sandman@handhelds.org>
7Architecture: arm 7Architecture: arm
8Version: $QPE_VERSION-$SUB_VERSION 8Version: $QPE_VERSION-$SUB_VERSION
9Depends: hotplug 9Depends: hotplug
10Description: A wakeup system for OPIE events. 10Description: A wakeup system for OPIE events.
11 Tiny, OPIE specific replacement for ipaqalarm, 11 Tiny, OPIE specific replacement for ipaqalarm,
12 uschedule and qpe2uschedule 12 uschedule and qpe2uschedule
13 13
diff --git a/mkipks b/mkipks
index ca934d8..798e73f 100755
--- a/mkipks
+++ b/mkipks
@@ -1,37 +1,37 @@
1#!/bin/sh 1#!/bin/sh
2 2
3QTE_VERSION=2.3.4 3QTE_VERSION=2.3.4
4DEB_VERSION=2.0 4DEB_VERSION=2.0
5 5
6# Have to do this here, since CVS can't store symlinks 6# Have to do this here, since CVS can't store symlinks
7mkdir -p $OPIEDIR/etc/rc2.d 7mkdir -p $OPIEDIR/etc/rc2.d
8ln -sf ../init.d/opie $OPIEDIR/etc/rc2.d/S98opie 8ln -sf ../init.d/opie $OPIEDIR/etc/rc2.d/S98opie
9 9
10mkdir -p $OPIEDIR/etc/rcS.d 10mkdir -p $OPIEDIR/etc/rcS.d
11ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash 11ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash
12 12
13ln -sf ../init.d/opieatd $OPIEDIR/ipaq/etc/rc2.d/S96opieatd 13ln -sf ../init.d/opieatd $OPIEDIR/root/etc/rc2.d/S96opieatd
14 14
15 15
16 16
17VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) 17VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
18VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) 18VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
19VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h) 19VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
20SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h) 20SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h)
21if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h 21if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h
22then 22then
23 [ -z "$VERSION_CVS" ] && VERSION_CVS="$(date +%Y%m%d)" 23 [ -z "$VERSION_CVS" ] && VERSION_CVS="$(date +%Y%m%d)"
24 SUB_VERSION=$VERSION_CVS 24 SUB_VERSION=$VERSION_CVS
25else 25else
26 VERSION_CVS="" 26 VERSION_CVS=""
27fi 27fi
28 28
29QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT 29QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT
30 30
31ARCH=arm 31ARCH=arm
32STRIP=arm-linux-strip 32STRIP=arm-linux-strip
33STRIP_FILES="*ARM*not stripped" 33STRIP_FILES="*ARM*not stripped"
34 34
35TDIR=/tmp/ipk$$ 35TDIR=/tmp/ipk$$
36DATADIR=$TDIR 36DATADIR=$TDIR
37CTRLDIR=$TDIR/CONTROL 37CTRLDIR=$TDIR/CONTROL
@@ -109,50 +109,50 @@ do
109 then 109 then
110 mkdir -p $DATADIR/usr/share/doc/$packagename 110 mkdir -p $DATADIR/usr/share/doc/$packagename
111 else 111 else
112 for f in $files 112 for f in $files
113 do 113 do
114 if [ -d $f ] 114 if [ -d $f ]
115 then 115 then
116 ffiles=$(find $f -type f -o -type b -o -type c -o -type l) 116 ffiles=$(find $f -type f -o -type b -o -type c -o -type l)
117 else 117 else
118 ffiles=$f 118 ffiles=$f
119 fi 119 fi
120 for ff in $ffiles 120 for ff in $ffiles
121 do 121 do
122 case $ff in 122 case $ff in
123 */CVS/*) 123 */CVS/*)
124 continue 124 continue
125 ;;*~) 125 ;;*~)
126 continue 126 continue
127 ;;*.control) 127 ;;*.control)
128 continue 128 continue
129 ;; $QTDIR/*) 129 ;; $QTDIR/*)
130 BASE=$(dirname /opt/QtPalmtop/${ff#$QTDIR/}) 130 BASE=$(dirname /opt/QtPalmtop/${ff#$QTDIR/})
131 ;; etc/*.d/*) 131 ;; etc/*.d/*)
132 BASE=$(dirname /$ff) 132 BASE=$(dirname /$ff)
133 ;; ipaq/*) 133 ;; root/*)
134 BASE=$(dirname ${ff#ipaq}) 134 BASE=$(dirname ${ff#root})
135 ;; *) 135 ;; *)
136 # For SHARP ROM compatibility. Should change to Qtopia. 136 # For SHARP ROM compatibility. Should change to Qtopia.
137 BASE=/opt/QtPalmtop/$(dirname $ff) 137 BASE=/opt/QtPalmtop/$(dirname $ff)
138 esac 138 esac
139 139
140 if [ -f $ff -o -b $ff -o -c $ff ] 140 if [ -f $ff -o -b $ff -o -c $ff ]
141 then 141 then
142 D=$DATADIR$BASE 142 D=$DATADIR$BASE
143 if [ -x $ff -a -n "$STRIP" ] 143 if [ -x $ff -a -n "$STRIP" ]
144 then 144 then
145 case $(file $ff) in 145 case $(file $ff) in
146 $STRIP_FILES) 146 $STRIP_FILES)
147 $STRIP $ff 147 $STRIP $ff
148 ;; *) 148 ;; *)
149 esac 149 esac
150 fi 150 fi
151 if [ -n "$RPM" ] 151 if [ -n "$RPM" ]
152 then 152 then
153 case "$ff" in 153 case "$ff" in
154 /*) RPMFILES="$RPMFILES $ff" 154 /*) RPMFILES="$RPMFILES $ff"
155 ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff" 155 ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff"
156 esac 156 esac
157 else 157 else
158 mkdir -p $D 158 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 @@
1Files: ipaq/etc/hosts ipaq/etc/inittab ipaq/etc/ppp 1Files: root/etc/hosts ipaq/etc/inittab ipaq/etc/ppp
2Priority: optional 2Priority: optional
3Section: opie/system 3Section: opie/system
4Maintainer: Trenton Schulz <twschulz@trolltech.com> 4Maintainer: Trenton Schulz <twschulz@trolltech.com>
5Architecture: arm 5Architecture: arm
6Version: 1.0 6Version: 1.0
7Description: PPP configuration file needed for Windows 2000 and syncing 7Description: 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 @@
1Files: ipaq/dev 1Files: root/dev
2Priority: optional 2Priority: optional
3Section: base 3Section: base
4Maintainer: Warwick Allison <warwick@trolltech.com> 4Maintainer: Warwick Allison <warwick@trolltech.com>
5Version: 1.0.0-5 5Version: 1.0.0-5
6Architecture: arm 6Architecture: arm
7Description: Pseudotty devices 7Description: Pseudotty devices
8 These files are not included in the Familiar libc6 package. 8 These files are not included in the Familiar libc6 package.
9 This package contains just a few pty/tty pairs. 9 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 @@
1Files: ipaq/usr/share/zoneinfo 1Files: root/usr/share/zoneinfo
2Priority: optional 2Priority: optional
3Section: base 3Section: base
4Maintainer: Warwick Allison <warwick@trolltech.com> 4Maintainer: Warwick Allison <warwick@trolltech.com>
5Version: 1.0.0-6 5Version: 1.0.0-6
6Description: Timezone data 6Description: Timezone data
7 These files are not included in the Familiar libc6 package. 7 These files are not included in the Familiar libc6 package.
8 This package contains just the non-redundant parts, and uses 8 This package contains just the non-redundant parts, and uses
9 about 180K with jffs2. 9 about 180K with jffs2.