summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-03-14 01:17:14 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-03-14 01:17:14 +0000
commit1335b7121057823c9ac2f3c122c00b46b9a01854 (patch)
tree737e1e3e89ceee0f86c567e0d648b35e18ace218
parent7da7587bb997e76f8889257f49a795174efdc770 (diff)
parent218ab0a982aa2fc7de3c224ac4087f951be583e6 (diff)
merge of 'c6a4fa92912836b7c3fcd3d8ae184a11b76a5ffc'
and 'f757d082e587d25a7f3021b6e6ef3fc1df04aca4'
-rw-r--r--packages/libmailwrapper/libmailwrapper.inc2
-rw-r--r--packages/libmailwrapper/libmailwrapper_1.2.2.bb1
-rw-r--r--packages/libmailwrapper/libmailwrapper_cvs.bb1
-rw-r--r--packages/linux/linux-hackndev-2.6_svn.bb4
-rw-r--r--packages/pipepanic/files/fix-datadir.patch2
-rw-r--r--packages/pipepanic/pipepanic_0.1.1.bb2
6 files changed, 6 insertions, 6 deletions
diff --git a/packages/libmailwrapper/libmailwrapper.inc b/packages/libmailwrapper/libmailwrapper.inc
index e8e8995f7f..d88ad4640e 100644
--- a/packages/libmailwrapper/libmailwrapper.inc
+++ b/packages/libmailwrapper/libmailwrapper.inc
@@ -21,3 +21,5 @@ do_stage () {
do_install() {
oe_libinstall -so libmailwrapper ${D}${palmtopdir}/lib
}
+
+FILES_${PN} = "${palmtopdir}/lib/lib*.so.*"
diff --git a/packages/libmailwrapper/libmailwrapper_1.2.2.bb b/packages/libmailwrapper/libmailwrapper_1.2.2.bb
index 3df2fb149b..e5f5bfe158 100644
--- a/packages/libmailwrapper/libmailwrapper_1.2.2.bb
+++ b/packages/libmailwrapper/libmailwrapper_1.2.2.bb
@@ -1,4 +1,5 @@
require ${PN}.inc
+PR = "r1"
diff --git a/packages/libmailwrapper/libmailwrapper_cvs.bb b/packages/libmailwrapper/libmailwrapper_cvs.bb
index 4075a80823..1ffa8dd779 100644
--- a/packages/libmailwrapper/libmailwrapper_cvs.bb
+++ b/packages/libmailwrapper/libmailwrapper_cvs.bb
@@ -1,5 +1,6 @@
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/mail/libmailwrapper "
diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb
index 8a80053f6a..3eee7171c0 100644
--- a/packages/linux/linux-hackndev-2.6_svn.bb
+++ b/packages/linux/linux-hackndev-2.6_svn.bb
@@ -24,10 +24,6 @@ PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-${HHV}"
inherit kernel
-PACKAGE_ARCH_palmtx = "palmtx"
-PACKAGE_ARCH_palmld = "palmld"
-PACKAGE_ARCH_palmz72 = "palmz72"
-
do_configure() {
if [ -f ${WORKDIR}/defconfig ]; then
diff --git a/packages/pipepanic/files/fix-datadir.patch b/packages/pipepanic/files/fix-datadir.patch
index b7df38a3fb..479b266efe 100644
--- a/packages/pipepanic/files/fix-datadir.patch
+++ b/packages/pipepanic/files/fix-datadir.patch
@@ -10,7 +10,7 @@
#define TRUE 1
#define VERSION "0.1.1"
-#define DATADIR "/opt/QtPalmtop/share/pipepanic/"
-+#define DATADIR "/usr/share"
++#define DATADIR "/usr/share/pipepanic/"
#define DIGITS24BMP "digits24.bmp"
#define DIGITS48BMP "digits48.bmp"
#define TILES24BMP "tiles24.bmp"
diff --git a/packages/pipepanic/pipepanic_0.1.1.bb b/packages/pipepanic/pipepanic_0.1.1.bb
index d1505b3b7a..91d53b9524 100644
--- a/packages/pipepanic/pipepanic_0.1.1.bb
+++ b/packages/pipepanic/pipepanic_0.1.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Pipepanic is a pipe connecting game using libSDL. \
Connect as many different shaped pipes together as possible within the time given."
HOMEPAGE = "http://www.users.waitrose.com/~thunor/pipepanic/"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-${PV}-source.tar.gz \
file://fix-datadir.patch;patch=1"