merge of 44115488650c08fa9e7a173d464a93aa0dcec1e7

     and fbe23ed6c03abf7163d310bbd0e402428c1bb40c

19 files changed, 50 insertions, 36 deletions

diff --git a/packages/boa/boa_0.94.13.bb b/packages/boa/boa_0.94.13.bb
index e88ded7df5..215533e26d 100644
--- a/packages/boa/boa_0.94.13.bb
+++ b/packages/boa/boa_0.94.13.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Lightweight and High Performance WebServer"
 SECTION = "console/network"
 RPROVIDES = "httpd"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "mime-support"
 RDEPENDS = "mime-support"
diff --git a/packages/fltk/fltk_1.2+cvs20040806.bb b/packages/fltk/fltk_1.2+cvs20040806.bb
index b72e357d06..439c2e7398 100644
--- a/packages/fltk/fltk_1.2+cvs20040806.bb
+++ b/packages/fltk/fltk_1.2+cvs20040806.bb
@@ -3,9 +3,9 @@ LICENSE ="LGPL"
 HOMEPAGE = "http://www.fltk.org"
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 DEPENDS = "jpeg libpng zlib"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/fltk;module=fltk;method=pserver;tag=v1_2;date=${@bb.data.getVar('PV', d, 1)[7:]} \
 	   file://makefiles.patch;patch=1 \
diff --git a/packages/jikes/jikes_1.21.bb b/packages/jikes/jikes_1.21.bb
index 05827e6967..050152a3ef 100644
--- a/packages/jikes/jikes_1.21.bb
+++ b/packages/jikes/jikes_1.21.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Java compiler adhering to language and VM specifications"
 HOMEPAGE = "http://jikes.sourceforge.net/"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "devel"
 LICENSE = "IBM"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/jikes/jikes-${PV}.tar.bz2"
 
diff --git a/packages/libffi/libffi_2.0+gcc3.4.1.bb b/packages/libffi/libffi_2.0+gcc3.4.1.bb
index 7ec822c52c..843e888391 100644
--- a/packages/libffi/libffi_2.0+gcc3.4.1.bb
+++ b/packages/libffi/libffi_2.0+gcc3.4.1.bb
@@ -2,7 +2,8 @@ SECTION = "libs"
 DESCRIPTION = "Foreign Function Interface library"
 LICENSE = "libffi"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+PR = "r1"
 
 inherit autotools gettext
 
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
index e9bd8b26b0..9089678fdc 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
@@ -1,8 +1,8 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
index d95bcb2459..b4850a24de 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
@@ -1,8 +1,8 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
index 1fa6a96919..df160cd1ed 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -1,8 +1,8 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
diff --git a/packages/meta/xbase-clients.bb b/packages/meta/xbase-clients.bb
index 69d1c8b121..dc53858b47 100644
--- a/packages/meta/xbase-clients.bb
+++ b/packages/meta/xbase-clients.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "Basic X clients (meta package)"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+PR = "r1"
 
 ALLOW_EMPTY = 1
 PACKAGES = "${PN}"
diff --git a/packages/mime-support/mime-support_3.28.bb b/packages/mime-support/mime-support_3.28.bb
index 8f5beb7c09..ee8f93fef8 100644
--- a/packages/mime-support/mime-support_3.28.bb
+++ b/packages/mime-support/mime-support_3.28.bb
@@ -1,12 +1,12 @@
 SECTION = "base"
 DESCRIPTION = "MIME files 'mime.types' & 'mailcap', and support programs"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 
 DEPENDS = "file"
 RRECOMMENDS = "file"
 LICENSE = "PD"
 PACKAGE_ARCH = "all"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz"
 S = "${WORKDIR}/${PN}"
diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb
index 586527f779..dec3302200 100644
--- a/packages/mpfr/mpfr_2.1.1.bb
+++ b/packages/mpfr/mpfr_2.1.1.bb
@@ -1,9 +1,12 @@
-SECTION = "libs"
 DESCRIPTION = "A C library for multiple-precision floating-point \
 	       computations with exact rounding"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
-DEPENDS = "gmp"
 LICENSE = "LGPL"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "libs"
+PR = "r1"
+
+DEPENDS = "gmp"
+
 SRC_URI = "http://www.mpfr.org/mpfr-current/mpfr-${PV}.tar.bz2"
 
 inherit autotools
diff --git a/packages/mpfr/mpfr_cvs.bb b/packages/mpfr/mpfr_cvs.bb
index af2829abb2..22f8703027 100644
--- a/packages/mpfr/mpfr_cvs.bb
+++ b/packages/mpfr/mpfr_cvs.bb
@@ -1,10 +1,13 @@
-SECTION = "libs"
 DESCRIPTION = "A C library for multiple-precision floating-point \
 	       computations with exact rounding"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+LICENSE = "LGPL"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "libs"
+PR = "r1"
+
 DEPENDS = "gmp"
+
 PV = "0.0cvs${CVSDATE}"
-LICENSE = "LGPL"
 SRC_URI = "cvs://cvs:@cvs-sop.inria.fr/CVS/spaces;module=mpfr;method=pserver"
 S = "${WORKDIR}/mpfr"
 
diff --git a/packages/ppp-dialin/ppp-dialin_0.1.bb b/packages/ppp-dialin/ppp-dialin_0.1.bb
index 65af10dd31..815ed14d3b 100644
--- a/packages/ppp-dialin/ppp-dialin_0.1.bb
+++ b/packages/ppp-dialin/ppp-dialin_0.1.bb
@@ -1,9 +1,9 @@
 SECTION = "console/network"
 DESCRIPTION = "Enables PPP dial-in through a serial connection"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 DEPENDS = "ppp"
 RDEPENDS = "ppp"
-PR = "r3"
+PR = "r4"
 LICENSE = "MIT"
 
 SRC_URI = "file://host-peer \
diff --git a/packages/sablevm/sablevm-classpath_1.1.9.bb b/packages/sablevm/sablevm-classpath_1.1.9.bb
index 2ac5148754..3ca91fa8d5 100644
--- a/packages/sablevm/sablevm-classpath_1.1.9.bb
+++ b/packages/sablevm/sablevm-classpath_1.1.9.bb
@@ -1,9 +1,11 @@
-SECTION = "console/utils"
 DESCRIPTION = "GNU Classpath modified to work with SableVM"
 HOMEPAGE = "http://sablevm.org"
 LICENSE = "Classpath"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "libs"
+PR = "r1"
+
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native fastjar-native"
 RDEPENDS_${PN} = "${PN}-native"
 
diff --git a/packages/sablevm/sablevm_1.1.9.bb b/packages/sablevm/sablevm_1.1.9.bb
index b93e12db53..ee4d86d8cf 100644
--- a/packages/sablevm/sablevm_1.1.9.bb
+++ b/packages/sablevm/sablevm_1.1.9.bb
@@ -1,9 +1,11 @@
-SECTION = "console/utils"
 DESCRIPTION = "A highly-portable Java virtual machine implementing the Java virtual machine specification, second edition."
 HOMEPAGE = "http://sablevm.org"
 LICENSE = "LGPL"
 PRIORITY = "optional"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+SECTION = "interpreters"
+PR = "r1"
+
 DEPENDS = "libffi libtool popt \
            sablevm-classpath"
 #          unzip"
diff --git a/packages/xauth/xauth_cvs.bb b/packages/xauth/xauth_cvs.bb
index 0e3e9c1497..ff615a500d 100644
--- a/packages/xauth/xauth_cvs.bb
+++ b/packages/xauth/xauth_cvs.bb
@@ -2,9 +2,9 @@ PV = "0.0cvs${CVSDATE}"
 LICENSE = "MIT"
 DEPENDS = "x11 xau xmu xext"
 DESCRIPTION = "X authority file utility"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xauth \
            file://autofoo.patch;patch=1"
diff --git a/packages/xhost/xhost_20040413.bb b/packages/xhost/xhost_20040413.bb
index 07e796cb0f..7245e7164e 100644
--- a/packages/xhost/xhost_20040413.bb
+++ b/packages/xhost/xhost_20040413.bb
@@ -3,9 +3,9 @@ LICENSE = "MIT"
 PV = "0.0cvs${FIXEDCVSDATE}"
 DEPENDS = "x11 xext xmu"
 DESCRIPTION = "server access control program for X"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xhost;date=${FIXEDCVSDATE} \
            file://autofoo.patch;patch=1"
diff --git a/packages/xmodmap/xmodmap_cvs.bb b/packages/xmodmap/xmodmap_cvs.bb
index 2d771f0498..890e70d956 100644
--- a/packages/xmodmap/xmodmap_cvs.bb
+++ b/packages/xmodmap/xmodmap_cvs.bb
@@ -1,8 +1,9 @@
 PV = "0.0cvs${CVSDATE}"
 LICENSE = "MIT"
 DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
+PR = "r1"
 
 DEPENDS = "x11"
 
diff --git a/packages/xprop/xprop_cvs.bb b/packages/xprop/xprop_cvs.bb
index df715ee2ec..04be770116 100644
--- a/packages/xprop/xprop_cvs.bb
+++ b/packages/xprop/xprop_cvs.bb
@@ -2,9 +2,9 @@ PV = "0.0cvs${CVSDATE}"
 LICENSE = "MIT"
 DEPENDS = "x11 xmu xext"
 DESCRIPTION = "property displayer for X"
-MAINTER = "Rene Wagner <reenoo@gmx.de>"
+MAINTER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xprop;tag=XORG-MAIN \
            file://autofoo.patch;patch=1"
diff --git a/packages/xrdb/xrdb_cvs.bb b/packages/xrdb/xrdb_cvs.bb
index 6d477de8ef..d5c954b0f3 100644
--- a/packages/xrdb/xrdb_cvs.bb
+++ b/packages/xrdb/xrdb_cvs.bb
@@ -1,10 +1,10 @@
 PV = "0.0cvs${CVSDATE}"
 DEPENDS = "x11 xmu xext"
 DESCRIPTION = "X server resource database utility"
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "x11/base"
 LICENSE = "xrdb"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xrdb \
            file://autofoo.patch;patch=1"