merge of 'b3a0ae7ae12db4c4db9d0e3b6c0b7dc12d016de8'

     and 'f1f6c3162864d453a8850ecb87b1994f9b160b9d'

7 files changed, 111 insertions, 8 deletions

diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
index 669ed49283..c2d249e978 100644
--- a/packages/directfb/directfb_1.0.0.bb
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -26,6 +26,7 @@ EXTRA_OECONF = "\
 		--enable-libmpeg3=no \
 		--enable-freetype=yes \
 		--enable-sdl=no \
+        --enable-vnc=no \
 		"
 
 do_stage() {
diff --git a/packages/geoclue/geoclue_git.bb b/packages/geoclue/geoclue_git.bb
index 6ae717e4b6..376abdc326 100644
--- a/packages/geoclue/geoclue_git.bb
+++ b/packages/geoclue/geoclue_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "GeoClue is a project that provide all kinds of geography information to an application"
 HOMEPAGE = "http://live.gnome.org/GeoClue"
 
-DEPENDS = "gpsd ilibxml2 libsoup dbus-glib"
+DEPENDS = "gpsd libxml2 libsoup dbus-glib"
 
 PV = "0.0+git${SRCDATE}"
 PR = "r0"
@@ -13,8 +13,6 @@ SRC_URI = "git://anongit.freedesktop.org/git/geoclue;protocol=git"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OECONF = "--enable-panel-applet=no"
-
 do_install_append() {
 	mkdir -p ${D}/usr/share/
 	cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share
diff --git a/packages/sphyrna/.mtn2git_empty b/packages/sphyrna/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sphyrna/.mtn2git_empty
diff --git a/packages/sphyrna/sphyrna_svn.bb b/packages/sphyrna/sphyrna_svn.bb
new file mode 100644
index 0000000000..11809386f3
--- /dev/null
+++ b/packages/sphyrna/sphyrna_svn.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Sphyrna - Hammerhead Reverse Engineering"
+HOMEPAGE = "http://projects.linuxtogo.org/projects/sphyrna"
+LICENSE = "GPLv2"
+DEPENDS = "readline"
+PV = "0.0+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn;module=sphyrna"
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools
+
+PACKAGES = "sphyrna-console"
+
+FILES_sphyrna-console = "${bindir}/hhconsole"
+
diff --git a/packages/uucp/files/.mtn2git_empty b/packages/uucp/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uucp/files/.mtn2git_empty
diff --git a/packages/uucp/files/policy.patch b/packages/uucp/files/policy.patch
new file mode 100644
index 0000000000..26f1f172b8
--- /dev/null
+++ b/packages/uucp/files/policy.patch
@@ -0,0 +1,85 @@
+Index: uucp-1.07/policy.h
+===================================================================
+--- uucp-1.07.orig/policy.h	2003-05-29 06:08:45.000000000 +0000
++++ uucp-1.07/policy.h	2007-03-09 00:51:55.000000000 +0000
+@@ -240,7 +240,7 @@
+    the sendmail choice below.  Otherwise, select one of the other
+    choices as appropriate.  */
+ #if 1
+-#define MAIL_PROGRAM "/usr/lib/sendmail -t"
++#define MAIL_PROGRAM "/usr/sbin/sendmail -oi -t"
+ /* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
+ #define MAIL_PROGRAM_TO_BODY 1
+ #define MAIL_PROGRAM_SUBJECT_BODY 1
+@@ -302,7 +302,7 @@
+ /* #define LOCKDIR "/usr/spool/locks" */
+ /* #define LOCKDIR "/usr/spool/uucp/LCK" */
+ /* #define LOCKDIR "/var/spool/lock" */
+-/* #define LOCKDIR "/var/lock" */
++#define LOCKDIR "/var/lock"
+ 
+ /* You must also specify the format of the lock files by setting
+    exactly one of the following macros to 1.  Check an existing lock
+@@ -349,7 +349,7 @@
+    The format for QNX lock files was made up just for Taylor UUCP.
+    QNX doesn't come with a version of UUCP.  */
+ #define HAVE_V2_LOCKFILES 0
+-#define HAVE_HDB_LOCKFILES 0
++#define HAVE_HDB_LOCKFILES 1
+ #define HAVE_SCO_LOCKFILES 0
+ #define HAVE_SVR4_LOCKFILES 0
+ #define HAVE_SEQUENT_LOCKFILES 0
+@@ -466,8 +466,8 @@
+    When looking something up (a system, a port, etc.) the new style
+    configuration files will be read first, followed by the V2
+    configuration files, followed by the HDB configuration files.  */
+-#define HAVE_V2_CONFIG 0
+-#define HAVE_HDB_CONFIG 0
++#define HAVE_V2_CONFIG 1
++#define HAVE_HDB_CONFIG 1
+ 
+ /* Exactly one of the following macros must be set to 1.  The exact
+    format of the spool directories is explained in unix/spool.c.
+@@ -572,7 +572,7 @@
+ /* The name of the default spool directory.  If HAVE_TAYLOR_CONFIG is
+    set to 1, this may be overridden by the ``spool'' command in the
+    configuration file.  */
+-#define SPOOLDIR "/usr/spool/uucp"
++#define SPOOLDIR "/var/spool/uucp"
+ /* #define SPOOLDIR "/var/spool/uucp" */
+ 
+ /* The name of the default public directory.  If HAVE_TAYLOR_CONFIG is
+@@ -580,7 +580,7 @@
+    configuration file.  Also, a particular system may be given a
+    specific public directory by using the ``pubdir'' command in the
+    system file.  */
+-#define PUBDIR "/usr/spool/uucppublic"
++#define PUBDIR "/var/spool/uucppublic"
+ /* #define PUBDIR "/var/spool/uucppublic" */
+ 
+ /* The default command path.  This is a space separated list of
+@@ -644,21 +644,21 @@
+ /* The default log file when using HAVE_TAYLOR_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+    command in the configuration file.  */
+-#define LOGFILE "/usr/spool/uucp/Log"
++#define LOGFILE "/var/spool/uucp/Log"
+ /* #define LOGFILE "/var/spool/uucp/Log" */
+ /* #define LOGFILE "/var/log/uucp/Log" */
+ 
+ /* The default statistics file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``statfile'' command in the configuration file.  */
+-#define STATFILE "/usr/spool/uucp/Stats"
++#define STATFILE "/var/spool/uucp/Stats"
+ /* #define STATFILE "/var/spool/uucp/Stats" */
+ /* #define STATFILE "/var/log/uucp/Stats" */
+ 
+ /* The default debugging file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``debugfile'' command in the configuration file.  */
+-#define DEBUGFILE "/usr/spool/uucp/Debug"
++#define DEBUGFILE "/var/spool/uucp/Debug"
+ /* #define DEBUGFILE "/var/spool/uucp/Debug" */
+ /* #define DEBUGFILE "/var/log/uucp/Debug" */
+ 
diff --git a/packages/uucp/uucp_1.07.bb b/packages/uucp/uucp_1.07.bb
index 7247ecbabe..ddc16d94f2 100644
--- a/packages/uucp/uucp_1.07.bb
+++ b/packages/uucp/uucp_1.07.bb
@@ -1,11 +1,13 @@
 DESCRIPTION = "UUCP is used to transfer mail, news and random files between systems which are not connected by more modern networks. The communication can be made via modems, direct (hard-wired) serial connections or via an IP connection."
+HOMEPAGE = "http://www.airs.com/ian/uucp.html"
+SECTION = "console/utils"
 LICENSE = "GPLv2"
-SECTION = "console"
-PR = "r1"
+PR = "r2"
 
 inherit autotools
 
-SRC_URI = "http://ftp.debian.org/debian/pool/main/u/uucp/uucp_1.07.orig.tar.gz"
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/uucp/uucp-${PV}.tar.gz \
+           file://policy.patch;patch=1"
 
 do_configure() {
 	libtoolize --force
@@ -13,8 +15,8 @@ do_configure() {
 }
 
 do_install_append() {
-    fakeroot install -d -g uucp -o uucp ${D}/usr/spool/uucp
+    fakeroot install -d -g uucp -o uucp ${D}/var/spool/uucp
 }
 
 PACKAGES =+ "cu"
-FILES_cu = "${bindir}/cu /usr/spool"
+FILES_cu = "${bindir}/cu /var/spool"