merge of 9e87109e716f77df8d97648a6db285fa5a2f8a95

     and a6602b9dd64190727c29e6f38e0d7addac46299b

4 files changed, 21 insertions, 5 deletions

diff --git a/packages/meta/slugos-native-packages.bb b/packages/meta/slugos-native-packages.bb
index 8b5641daf1..4505c9979c 100644
--- a/packages/meta/slugos-native-packages.bb
+++ b/packages/meta/slugos-native-packages.bb
@@ -1,7 +1,7 @@
 # Only list packages which will not build 'cross' in here.
 DESCRIPTION = "Packages that are to be compiled natively for the SlugOS firmware"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
@@ -10,6 +10,7 @@ PACKAGES = "${PN}"
 
 SLUGOS_NATIVE_PACKAGES = "\
 	apache \
+	php-native \
 	"
 
 SLUGOS_BROKEN_NATIVE_PACKAGES = "\
diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc
index 43d646dae4..52e0b5d082 100644
--- a/packages/python/python-2.4.3-manifest.inc
+++ b/packages/python/python-2.4.3-manifest.inc
@@ -128,9 +128,9 @@ RDEPENDS_python-fcntl="python-core"
 FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so "
 
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
-PR_python-netclient="ml0"
+PR_python-netclient="ml1"
 RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime"
-FILES_python-netclient="${libdir}/python2.4/_LWPCookieJar.* ${libdir}/python2.4/_MozillaCookieJar.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
+FILES_python-netclient="${libdir}/python2.4/_LWPCookieJar.* ${libdir}/python2.4/_MozillaCookieJar.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* ${libdir}/python2.4/Cookie.*"
 
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
 PR_python-pprint="ml0"
diff --git a/packages/python/python-cheetah_1.0.bb b/packages/python/python-cheetah_1.0.bb
new file mode 100644
index 0000000000..08d7bd63cb
--- /dev/null
+++ b/packages/python/python-cheetah_1.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "template engine and code generation tool"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Cliff Brake <cbrake@bec-systems.com>"
+LICENSE = "MIT-like"
+RDEPENDS = ""
+SRCNAME = "Cheetah"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/cheetahtemplate/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+PR = "r0"
+
+inherit distutils
+
diff --git a/packages/python/python-webpy_0.138.bb b/packages/python/python-webpy_0.138.bb
index 557b9ee71e..f7c8aa821c 100644
--- a/packages/python/python-webpy_0.138.bb
+++ b/packages/python/python-webpy_0.138.bb
@@ -3,9 +3,9 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "PSF"
-RDEPENDS = "python-netserver"
+RDEPENDS = "python-netserver python-netclient python-pprint"
 
-PR = "ml0"
+PR = "ml1"
 
 SRC_URI = "file://web.py"
 S = "${WORKDIR}"