merge of 69f5e6634ad41e14c392c5aca06f4c4516ab4f21

     and e77aaa7cc80bddb255c4e859e17727dc070660df

23 files changed, 297 insertions, 21 deletions

diff --git a/packages/addons/.mtn2git_empty b/packages/addons/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/addons/.mtn2git_empty
diff --git a/packages/addons/devshell.bb b/packages/addons/devshell.bb
new file mode 100644
index 0000000000..920ac00d10
--- /dev/null
+++ b/packages/addons/devshell.bb
@@ -0,0 +1,70 @@
+DESCRIPTION = "Runs a shell in an environment as emitted by BitBake to execute tasks"
+LICENSE = "GPL"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+
+inherit autotools pkgconfig
+
+do_configure() {
+	:
+}
+
+def devshell_emit_env(o, d, all=False, funcwhitelist=None):
+    """Emits all items in the data store in a format such that it can be sourced by a shell."""
+
+    import bb
+    import bb.data
+
+    env = bb.data.keys(d)
+
+    for e in env:
+        if bb.data.getVarFlag(e, "func", d):
+            continue
+        bb.data.emit_var(e, o, d, all) and o.write('\n')
+
+    for e in env:
+        if not bb.data.getVarFlag(e, "func", d):
+            continue
+        if not funcwhitelist:
+            bb.data.emit_var(e, o, d) and o.write('\n')
+            continue
+        for i in funcwhitelist:
+            if e.startswith(i):
+                bb.data.emit_var(e, o, d) and o.write('\n')
+                break
+
+python do_compile() {
+	import os
+	import os.path
+
+	workdir = bb.data.getVar('WORKDIR', d, 1)
+	shellfile = os.path.join(workdir, bb.data.expand("${TARGET_PREFIX}${DISTRO}-${MACHINE}-devshell", d))
+	
+	f = open(shellfile, "w")
+
+	# emit variables and shell functions
+        devshell_emit_env(f, d, False, ["die", "oe", "autotools_do_configure"])
+
+	f.close()
+}
+
+do_install() {
+	:
+}
+
+do_stage() {
+	:
+}
+
+do_package() {
+	shellfile="${TARGET_PREFIX}${DISTRO}-${MACHINE}-devshell"
+
+	cd ${WORKDIR}
+
+	cp $shellfile tmpfile
+	echo "#!/bin/bash --rcfile" > $shellfile
+	sed -e "s:${S}:.:g" -e "s:exit 1:true:" tmpfile >> $shellfile
+	echo "export PS1='[OE::${TARGET_PREFIX}${DISTRO}-${MACHINE}]:\w\$ '" >> $shellfile
+
+	mkdir -p ${DEPLOY_DIR}/addons
+	install -m 755 $shellfile ${DEPLOY_DIR}/addons
+}
diff --git a/packages/apr/.mtn2git_empty b/packages/apr/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/apr/.mtn2git_empty
diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.1.2.bb
new file mode 100644
index 0000000000..e9f9587420
--- /dev/null
+++ b/packages/apr/apr-util_1.1.2.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Apache Portable Runtime (APR) companion library"
+SECTION = "libs"
+DEPENDS = "apr expat gdbm"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+# apache mirrors?
+SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.gz"
+
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+
+inherit autotools lib_package binconfig
+
+do_configure() {
+  oe_runconf
+}
+
+do_stage() {
+  oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR}
+}
diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_1.1.1.bb
new file mode 100644
index 0000000000..f67f31005e
--- /dev/null
+++ b/packages/apr/apr_1.1.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Apache Portable Runtime (APR) library"
+SECTION = "libs"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+# apache mirrors?
+SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.bz2"
+
+inherit autotools lib_package binconfig
+
+do_configure() {
+  oe_runconf
+}
+
+do_stage() {
+  oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR}
+}
diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb
index 5e56c4787a..7e737e9447 100644
--- a/packages/at76c503a/at76c503a-modules_cvs.bb
+++ b/packages/at76c503a/at76c503a-modules_cvs.bb
@@ -3,15 +3,13 @@ LICENSE = "GPL"
 SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \
 	   file://makefile.cc.patch;patch=1"
 S = "${WORKDIR}/at76c503a"
-PR = "r2"
+PR = "r3"
 PV = "0.0cvs${CVSDATE}"
 
 inherit module
 
 MODULES = "at76c503 at76_usbdfu at76c503-i3861 at76c503-rfmd at76c503-rfmd-acc \
 	at76c505-rfmd at76c503-i3863 at76c505-rfmd2958"
-MODULES_EXTENSION = "o"
-MODULES_EXTENSION_kernel26 = "ko"
 
 pkg_postinst() {
 #!/bin/sh
@@ -29,7 +27,7 @@ update-modules || true
 do_install() {
 	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
 	for i in ${MODULES}; do
-		install -m 0644 $i.${MODULES_EXTENSION} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
+		install -m 0644 $i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
 	done
 	if [ "${MACHINE}" = "h3900" ]; then
 		install -d ${D}${sysconfdir}/modutils
diff --git a/packages/avetanabt/.mtn2git_empty b/packages/avetanabt/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/avetanabt/.mtn2git_empty
diff --git a/packages/avetanabt/avetanabt_svn.bb b/packages/avetanabt/avetanabt_svn.bb
new file mode 100644
index 0000000000..08adcbbdfd
--- /dev/null
+++ b/packages/avetanabt/avetanabt_svn.bb
@@ -0,0 +1,62 @@
+DESCRIPTION = "avetanaBT: Bluetooth API implementation for Java (JSR-82)"
+SECTION = "devel"
+DEPENDS = "findutils-native jikes-native kaffeh-native fastjar-native bluez-libs classpath"
+#RDEPENDS = "bluez-utils"
+# Matthias Ringwald <mringwal@inf.ethz.ch> was helping me in the first phase. Thanks.
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "GPL"
+HOMEPAGE = "http://sourceforge.net/projects/avetanabt/"
+
+PV = "0.0cvs${CVSDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/avetanabt;module=avetanabt"
+
+S = "${WORKDIR}/avetanabt"
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${libdir}/libavetanaBT.so ${datadir}/avetanabt/avetanaBT.jar"
+
+do_compile() {
+
+  # doing nearly the same as in Makefile written...
+
+  mkdir -p build
+  rm -fr build/*
+
+  # javac -> jikes
+  ${STAGING_BINDIR}/find {de,javax,com} -iname *.java > file.list
+  ${STAGING_BINDIR}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
+
+  # jar -> fastjar
+  cd build
+  ${STAGING_BINDIR}/fastjar -cf ../avetanaBT.jar de javax com
+  cd ..
+
+  # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
+  # javah -> kaffeh
+  cd c
+  ${STAGING_BINDIR}/kaffeh -jni -classpath ../avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar de.avetana.bluetooth.stack.BlueZ
+
+  # Native language (C) library - libavetanaBT.so
+  ${CXX} ${CXXFLAGS} -shared -lbluetooth -I${STAGING_INCDIR}/classpath BlueZ.cpp -o ../libavetanaBT.so ${LDFLAGS}
+  cd ..
+
+}
+
+do_stage() {
+
+  install -d ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt
+  install avetanaBT.jar ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt/
+
+}
+
+do_install() {
+
+  install -d ${D}${libdir}
+  install -m 0755 libavetanaBT.so ${D}${libdir}/
+
+  install -d ${D}${datadir}/avetanabt
+  install avetanaBT.jar ${D}${datadir}/avetanabt/
+ 
+}
diff --git a/packages/bl/bl_cvs.bb b/packages/bl/bl_cvs.bb
index b079160e1b..c11a00bcfa 100644
--- a/packages/bl/bl_cvs.bb
+++ b/packages/bl/bl_cvs.bb
@@ -23,5 +23,5 @@ do_compile (){
 
 do_install () {
         install -d ${D}${bindir}
-        install -m4755 ${S}/bl ${D}${bindir}/bl
+        install -m 4755 ${S}/bl ${D}${bindir}/bl
 }
diff --git a/packages/classpath/classpath_0.14.bb b/packages/classpath/classpath_0.14.bb
index ec29ad9cb8..c1c266c994 100644
--- a/packages/classpath/classpath_0.14.bb
+++ b/packages/classpath/classpath_0.14.bb
@@ -4,7 +4,7 @@ LICENSE = "Classpath"
 PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (${PV})"
@@ -22,6 +22,11 @@ FILES_${PN} = "${libdir}/${PN}"
 FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
 FILES_${PN}-examples = "${datadir}/${PN}/examples"
 
+do_stage() {
+        install -d ${STAGING_INCDIR}/classpath
+        install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
+}
+
 do_install() {
 	autotools_do_install
 	mv ${D}${libdir}/security ${D}${libdir}/${PN}
diff --git a/packages/classpath/classpath_0.15.bb b/packages/classpath/classpath_0.15.bb
index ec29ad9cb8..c1c266c994 100644
--- a/packages/classpath/classpath_0.15.bb
+++ b/packages/classpath/classpath_0.15.bb
@@ -4,7 +4,7 @@ LICENSE = "Classpath"
 PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (${PV})"
@@ -22,6 +22,11 @@ FILES_${PN} = "${libdir}/${PN}"
 FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
 FILES_${PN}-examples = "${datadir}/${PN}/examples"
 
+do_stage() {
+        install -d ${STAGING_INCDIR}/classpath
+        install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
+}
+
 do_install() {
 	autotools_do_install
 	mv ${D}${libdir}/security ${D}${libdir}/${PN}
diff --git a/packages/classpath/classpath_0.17.bb b/packages/classpath/classpath_0.17.bb
index ec29ad9cb8..fb41d7e9d8 100644
--- a/packages/classpath/classpath_0.17.bb
+++ b/packages/classpath/classpath_0.17.bb
@@ -4,7 +4,7 @@ LICENSE = "Classpath"
 PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (${PV})"
@@ -22,6 +22,11 @@ FILES_${PN} = "${libdir}/${PN}"
 FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
 FILES_${PN}-examples = "${datadir}/${PN}/examples"
 
+do_stage() {
+	install -d ${STAGING_INCDIR}/classpath
+	install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
+}
+
 do_install() {
 	autotools_do_install
 	mv ${D}${libdir}/security ${D}${libdir}/${PN}
diff --git a/packages/fbvncserver/files/ipaq.patch b/packages/fbvncserver/files/ipaq.patch
new file mode 100644
index 0000000000..e8070c0f25
--- /dev/null
+++ b/packages/fbvncserver/files/ipaq.patch
@@ -0,0 +1,35 @@
+diff -Nurd fbvncserver-0.9.4.old/fbvncserver.c fbvncserver-0.9.4/fbvncserver.c
+--- fbvncserver-0.9.4.old/fbvncserver.c	2005-07-27 22:25:25.069921936 +0200
++++ fbvncserver-0.9.4/fbvncserver.c	2005-07-27 22:27:21.087284616 +0200
+@@ -28,7 +28,7 @@
+ 
+ 
+ #ifdef IPAQ
+-#define FANCY_PANEL_JPG "/usr/local/vnc/ipaq_panel.jpg"
++#define FANCY_PANEL_JPG "/usr/share/fbvncserver/ipaq_panel.jpg"
+ #define DESKTOP_NAME "iPAQ"
+ #else   /* #ifdef ZAURUS */
+ #define FANCY_PANEL_JPG "/usr/share/fbvncserver/zaurus_panel.jpg"
+diff -Nurd fbvncserver-0.9.4.old/Makefile fbvncserver-0.9.4/Makefile
+--- fbvncserver-0.9.4.old/Makefile	2005-07-27 22:25:25.068922088 +0200
++++ fbvncserver-0.9.4/Makefile	2005-07-27 22:26:49.983013184 +0200
+@@ -89,7 +89,7 @@
+ 		${CC} ${KERNEL_INCLUDES} -Wall -D__KERNEL__ -c -o $@ $<
+ 
+ ipaq_kbdsim.o:			kbdsim.c
+-		${CC} -DIPAQ -Wall -D__KERNEL__ -c -o $@ $<
++		${CC} ${KERNEL_INCLUDES} -DIPAQ -Wall -D__KERNEL__ -c -o $@ $<
+ 
+ loadjpeg.o:	loadjpeg.c						\
+ 		loadjpeg.h
+diff -Nurd fbvncserver-0.9.4.old/tssimd.c fbvncserver-0.9.4/tssimd.c
+--- fbvncserver-0.9.4.old/tssimd.c	2005-07-27 22:25:25.070921784 +0200
++++ fbvncserver-0.9.4/tssimd.c	2005-07-27 22:25:53.595585376 +0200
+@@ -26,6 +26,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <signal.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
diff --git a/packages/findutils/findutils-native_4.1.20.bb b/packages/findutils/findutils-native_4.1.20.bb
new file mode 100644
index 0000000000..47fcfdcaa9
--- /dev/null
+++ b/packages/findutils/findutils-native_4.1.20.bb
@@ -0,0 +1,4 @@
+inherit native
+include findutils_${PV}.bb
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/findutils-${PV}"
+S = "${WORKDIR}/findutils-${PV}"
diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc
index 0cede21082..ea308f1043 100644
--- a/packages/kaffe/kaffe.inc
+++ b/packages/kaffe/kaffe.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Kaffe is a clean room implementation of the Java Virtual Machine"
 HOMEPAGE = "http://www.kaffe.org/"
 LICENSE  = "GPL LGPL W3C Classpath BSD"
 
-DEPENDS = "jikes-native fastjar-native libffi"
+DEPENDS = "jikes-native fastjar-native libffi zip-native"
 
 SRC_URI += "file://disable-automake-checks.patch;patch=1"
 
diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb
index dccc7559f4..569301f3f7 100644
--- a/packages/kaffe/kaffeh-native_1.1.5.bb
+++ b/packages/kaffe/kaffeh-native_1.1.5.bb
@@ -1,6 +1,6 @@
 SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz"
 S = "${WORKDIR}/kaffe-${PV}"
-PR = "r2"
+PR = "r3"
 
 include kaffe.inc
 
@@ -22,4 +22,7 @@ EXTRA_OECONF = "--disable-alsatest \
 
 do_stage() {
 	install -m 0755 kaffe/kaffeh/kaffeh ${STAGING_BINDIR}/
+
+	install -d ${STAGING_DATADIR}/kaffeh
+	install -m 0755 libraries/javalib/*.jar ${STAGING_DATADIR}/kaffeh/
 }
diff --git a/packages/kaffe/kaffeh-native_cvs.bb b/packages/kaffe/kaffeh-native_cvs.bb
index 3a67db2759..2b10385e82 100644
--- a/packages/kaffe/kaffeh-native_cvs.bb
+++ b/packages/kaffe/kaffeh-native_cvs.bb
@@ -1,6 +1,6 @@
 PV = "1.1.5+cvs${CVSDATE}"
 DEFAULT_PREFERENCE = "-1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe"
 S = "${WORKDIR}/kaffe"
@@ -25,4 +25,8 @@ EXTRA_OECONF = "--disable-alsatest \
 
 do_stage() {
 	install -m 0755 kaffe/kaffeh/kaffeh ${STAGING_BINDIR}/
+
+        install -d ${STAGING_DATADIR}/kaffeh
+        install -m 0755 libraries/javalib/*.jar ${STAGING_DATADIR}/kaffeh/
 }
+
diff --git a/packages/libvncserver/libvncserver_0.6.bb b/packages/libvncserver/libvncserver_0.6.bb
index 2e0a7f81c5..386f266d2d 100644
--- a/packages/libvncserver/libvncserver_0.6.bb
+++ b/packages/libvncserver/libvncserver_0.6.bb
@@ -5,8 +5,10 @@ DEPENDS = "zlib jpeg"
 LICENSE = "GPL"
 PACKAGES = "libvncserver-storepasswd libvncserver-javaapplet"
 FILES_libvncserver-storepasswd = "${bindir}/storepasswd"
-FILES_libvncserver-javaapplet = "/${datadir}fbvncserver/classes/index.vnc \
-			         /${datadir}fbvncserver/classes/VncViewer.jar"
+FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \
+			         ${datadir}/fbvncserver/classes/VncViewer.jar"
+
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz"
 
@@ -28,7 +30,7 @@ do_stage () {
 do_install () {
 	install -d ${D}${bindir}
 	install -m 0755 examples/storepasswd ${D}${bindir}
-	install -d ${D}${datadir}fbvncserver/classes
-	install -m 0644 classes/index.vnc ${D}${datadir}fbvncserver/classes/
-	install -m 0644 classes/VncViewer.jar ${D}${datadir}fbvncserver/classes/
+	install -d ${D}${datadir}/fbvncserver/classes
+	install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/
+	install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/
 }
diff --git a/packages/libvncserver/libvncserver_0.7.1.bb b/packages/libvncserver/libvncserver_0.7.1.bb
index 1ae86ea69b..80a70e5f57 100644
--- a/packages/libvncserver/libvncserver_0.7.1.bb
+++ b/packages/libvncserver/libvncserver_0.7.1.bb
@@ -5,8 +5,10 @@ DEPENDS = "zlib jpeg"
 LICENSE = "GPL"
 PACKAGES = "libvncserver-storepasswd libvncserver-javaapplet"
 FILES_libvncserver-storepasswd = "${bindir}/storepasswd"
-FILES_libvncserver-javaapplet = "/${datadir}fbvncserver/classes/index.vnc \
-			         /${datadir}fbvncserver/classes/VncViewer.jar"
+FILES_libvncserver-javaapplet = "${datadir}/fbvncserver/classes/index.vnc \
+			         ${datadir}/fbvncserver/classes/VncViewer.jar"
+
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz"
 
@@ -29,7 +31,7 @@ do_stage () {
 do_install () {
 	install -d ${D}${bindir}
 	install -m 0755 examples/storepasswd ${D}${bindir}
-	install -d ${D}${datadir}fbvncserver/classes
-	install -m 0644 classes/index.vnc ${D}${datadir}fbvncserver/classes/
-	install -m 0644 classes/VncViewer.jar ${D}${datadir}fbvncserver/classes/
+	install -d ${D}${datadir}/fbvncserver/classes
+	install -m 0644 classes/index.vnc ${D}${datadir}/fbvncserver/classes/
+	install -m 0644 classes/VncViewer.jar ${D}${datadir}/fbvncserver/classes/
 }
diff --git a/packages/subversion/.mtn2git_empty b/packages/subversion/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/subversion/.mtn2git_empty
diff --git a/packages/subversion/files/.mtn2git_empty b/packages/subversion/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/subversion/files/.mtn2git_empty
diff --git a/packages/subversion/files/disable-revision-install.patch b/packages/subversion/files/disable-revision-install.patch
new file mode 100644
index 0000000000..a1c60654cb
--- /dev/null
+++ b/packages/subversion/files/disable-revision-install.patch
@@ -0,0 +1,22 @@
+--- subversion-1.2.0-r0/Makefile.in.old	2005-07-17 22:28:21.898728312 +0200
++++ subversion-1.2.0-r0/Makefile.in	2005-07-17 22:30:05.361999504 +0200
+@@ -260,7 +260,7 @@
+ clean: external-clean local-clean
+ distclean: external-distclean local-distclean
+ extraclean: external-extraclean local-extraclean
+-install: external-install local-install revision-install
++install: external-install local-install #revision-install
+ 
+ @INCLUDE_OUTPUTS@
+ 
+@@ -320,8 +320,8 @@
+ local-install: @INSTALL_RULES@
+ 
+ ### HACK!! Find a better way to do this
+-revision-install:
+-	subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
++#revision-install:
++#	subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
+ 
+ install-static: @INSTALL_STATIC_RULES@
+ 
diff --git a/packages/subversion/subversion_1.2.0.bb b/packages/subversion/subversion_1.2.0.bb
new file mode 100644
index 0000000000..790a552666
--- /dev/null
+++ b/packages/subversion/subversion_1.2.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "The Subversion (svn) client"
+SECTION = "console/network"
+DEPENDS = "apr-util"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "GPL"
+
+PR = "r0"
+
+SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
+	   file://disable-revision-install.patch;patch=1"
+
+EXTRA_OECONF = "--without-neon --without-berkeley-db --without-apxs --without-apache --without-swig --with-apr=${STAGING_BINDIR} --with-apr-util=${STAGING_BINDIR}"
+
+inherit autotools
+
+do_configure() {
+  oe_runconf
+}