merge of '0ff7b192e1f386a42dc2619236091fbae7c94f27'

     and 'f26d698029356f75985aa3a48399bc7aa8f08144'

23 files changed, 4 insertions, 8 deletions

diff --git a/packages/base-files/base-files/ghi270/.mtn2git_empty b/packages/base-files/base-files/ghi270/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/base-files/base-files/ghi270/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez/files/ghi270/.mtn2git_empty b/packages/bluez/files/ghi270/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez/files/ghi270/.mtn2git_empty
+++ /dev/null
diff --git a/packages/bluez/files/r1000/.mtn2git_empty b/packages/bluez/files/r1000/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/bluez/files/r1000/.mtn2git_empty
+++ /dev/null
diff --git a/packages/efl1/etk-native/.mtn2git_empty b/packages/efl1/etk-native/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/efl1/etk-native/.mtn2git_empty
+++ /dev/null
diff --git a/packages/fakeroot/fakeroot-1.8.3/.mtn2git_empty b/packages/fakeroot/fakeroot-1.8.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/fakeroot/fakeroot-1.8.3/.mtn2git_empty
+++ /dev/null
diff --git a/packages/glibc/eglibc-svn/.mtn2git_empty b/packages/glibc/eglibc-svn/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/glibc/eglibc-svn/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gtk+/gtk+-2.2.4/.mtn2git_empty b/packages/gtk+/gtk+-2.2.4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gtk+/gtk+-2.2.4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gtk+/gtk+-2.4.13/.mtn2git_empty b/packages/gtk+/gtk+-2.4.13/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gtk+/gtk+-2.4.13/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libmutil/.mtn2git_empty b/packages/libmutil/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libmutil/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libopieobex/files/.mtn2git_empty b/packages/libopieobex/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libopieobex/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libxml/files/.mtn2git_empty b/packages/libxml/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxml/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/ghi270/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/ghi270/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/linux/linux-handhelds-2.6-2.6.21/ghi270/.mtn2git_empty
+++ /dev/null
diff --git a/packages/llvm/files/.mtn2git_empty b/packages/llvm/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/llvm/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/nonworking/redboot-utils/.mtn2git_empty b/packages/nonworking/redboot-utils/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/nonworking/redboot-utils/.mtn2git_empty
+++ /dev/null
diff --git a/packages/openmoko-panel-plugins/files/.mtn2git_empty b/packages/openmoko-panel-plugins/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/openmoko-panel-plugins/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/opie-bluetoothapplet/files/.mtn2git_empty b/packages/opie-bluetoothapplet/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/opie-bluetoothapplet/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/python/python-formencode/.mtn2git_empty b/packages/python/python-formencode/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/python/python-formencode/.mtn2git_empty
+++ /dev/null
diff --git a/packages/uclibc/uclibc/.mtn2git_empty b/packages/uclibc/uclibc/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/uclibc/uclibc/.mtn2git_empty
+++ /dev/null
diff --git a/packages/vnc/fbvncserver_0.9.4.bb b/packages/vnc/fbvncserver_0.9.4.bb
index e7c8151e18..4e6ee15a86 100644
--- a/packages/vnc/fbvncserver_0.9.4.bb
+++ b/packages/vnc/fbvncserver_0.9.4.bb
@@ -1,13 +1,10 @@
 DESCRIPTION = "Framebuffer VNC server"
-LICENSE = "GPL"
 SECTION = "console/utils"
-#DEPENDS = "libvncserver jpeg zlib"
-# using older version due of error with libvncserver-0.7.1
-# fbvncserver.c:577: error: structure has no member named `rfbAlwaysShared'
-# fbvncserver.c:602: error: structure has no member named `rfbClientHead'
-DEPENDS = "libvncserver-0.6 jpeg zlib"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "libvncserver jpeg zlib"
 RDEPENDS = "fbvncserver-kmodule libvncserver-storepasswd libvncserver-javaapplet"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
            file://libvncs0.6.patch;patch=1 \
@@ -20,7 +17,6 @@ SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
 S = "${WORKDIR}/fbvncserver-${PV}"
 
 export INCLUDES = "-I${STAGING_INCDIR}"
-
 export LIBS = "-L${STAGING_LIBDIR} -lpthread"
 export VNCSERVER_DIR = "${STAGING_LIBDIR}"
 export ZAURUS_ZLIB_LIBS = "${STAGING_LIBDIR}"
diff --git a/packages/xserver-common/files/ghi270/.mtn2git_empty b/packages/xserver-common/files/ghi270/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xserver-common/files/ghi270/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/.mtn2git_empty b/packages/xserver-kdrive-common/xserver-kdrive-common/etc/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/.mtn2git_empty b/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/.mtn2git_empty b/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/.mtn2git_empty
+++ /dev/null