merge of '34b95284d8caffb64aa40f9e36e92e2c5950ba26'

     and 'e29bb666531e645143bf0e0a07e299be93d1ce1a'

26 files changed, 154 insertions, 55 deletions

diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index ecc2e679d9..8645df3555 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -23,8 +23,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME}  ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl"
 
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \
-			      kernel-module-h5400_battery"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
+			      kernel-module-h5400-battery"
 
 #
 # Modules autoload and other boot properties
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
index 5e51566484..93325d253b 100644
--- a/conf/machine/include/zaurus-clamshell.conf
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -9,5 +9,5 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \
                    rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \
                    cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
-		   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2 \
+		   ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \
                    rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;"
diff --git a/packages/anthy/anthy_7811.bb b/packages/anthy/anthy_7811.bb
index a6c8eff200..5ac651223b 100644
--- a/packages/anthy/anthy_7811.bb
+++ b/packages/anthy/anthy_7811.bb
@@ -3,8 +3,8 @@ AUTHOR = "Anthy Developers <anthy-dev@lists.sourceforge.jp>"
 HOMEPAGE = "http://anthy.sourceforge.jp"
 LICENSE = "GPL"
 DEPENDS = "anthy-native"
-SECTION = "libs/inputmethod"
-PR = "r0"
+SECTION = "inputmethods"
+PR = "r1"
 
 SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz \
 	   file://not_build_elc.patch;patch=1 \
@@ -12,8 +12,6 @@ SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz \
 	   file://change_anthy_dic_path.patch;patch=1 \
 	   file://native-mkanthydic-mkdepgraph.patch;patch=1"
 
-S = "${WORKDIR}/anthy-${PV}"
-
 inherit autotools pkgconfig
 
 PACKAGES = "${PN} ${PN}-el libanthy0 libanthy-dev"
@@ -21,6 +19,8 @@ PACKAGES = "${PN} ${PN}-el libanthy0 libanthy-dev"
 DESCRIPTION_anthy = "A Japanese input method (backend, dictionary and utility)"
 DESCRIPTION_libanthy0 = "Anthy runtime library"
 DESCRIPTION_libanthy-dev = "Anthy static library, headers and documets for developers"
+SECTION_libanthy0 = "libs/inputmethods"
+SECTION_libanthy-dev = "devel/libs"
 
 # gettext
 
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/.mtn2git_empty b/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/.mtn2git_empty
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/configure.patch b/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/configure.patch
new file mode 100644
index 0000000000..1b31c0b305
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.39/configure.patch
@@ -0,0 +1,22 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- e2fsprogs-libs-1.33/./lib/uuid/configure.in~configure
++++ e2fsprogs-libs-1.33/./lib/uuid/configure.in
+@@ -2,9 +2,11 @@
+ dnl  Not used now, for the future when uuid is separated out into its 
+ dnl own package.
+ dnl
+-AC_INIT(gen_uuid.c)
+-AC_PREREQ(2.12)
++AC_INIT
++AC_CONFIG_SRCDIR([gen_uuid.c])
++AC_PREREQ(2.57)
+ 
+ AC_CHECK_HEADERS(stdlib.h unistd.h sys/sockio.h net/if.h netinet/in.h)
+ AC_CHECK_FUNCS(srandom)
+-AC_OUTPUT(Makefile)
++AC_CONFIG_FILES([Makefile])
++AC_OUTPUT
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs.inc b/packages/e2fsprogs-libs/e2fsprogs-libs.inc
index 03f9c8dc22..9efa6d1d70 100644
--- a/packages/e2fsprogs-libs/e2fsprogs-libs.inc
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs.inc
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "optional"
 
-inherit autotools
+inherit autotools pkgconfig
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
            file://configure.patch;patch=1 \
diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb
new file mode 100644
index 0000000000..dfd83e3c1f
--- /dev/null
+++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.39.bb
@@ -0,0 +1,13 @@
+require e2fsprogs-libs.inc
+
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
+           file://configure.patch;patch=1"
+
+EXTRA_OECONF=" --enable-elf-shlibs "
+
+do_compile_prepend () {
+	find ./ -print|xargs chmod u=rwX
+	( cd util; ${BUILD_CC} subst.c -o subst )
+}
diff --git a/packages/gdb/files/sim-install.patch b/packages/gdb/files/sim-install-makefile-common.patch
index 3c88c4c059..24550edc6c 100644
--- a/packages/gdb/files/sim-install.patch
+++ b/packages/gdb/files/sim-install-makefile-common.patch
@@ -1,15 +1,3 @@
---- gdb-6.1/sim/common/Makefile.in~	2004-01-15 21:25:06.000000000 +0000
-+++ gdb-6.1/sim/common/Makefile.in	2004-07-22 17:07:46.237809032 +0100
-@@ -34,7 +34,7 @@
- 
- datadir = @datadir@
- mandir = @mandir@
--man1dir = $(mandir)/man1
-+man1dir = $(DESTDIR)$(mandir)/man1
- infodir = @infodir@
- includedir = @includedir@
- 
-
 --- gdb-6.1/sim/common/Make-common.in~sim-install.patch	2003-09-08 18:24:59.000000000 +0100
 +++ gdb-6.1/sim/common/Make-common.in	2004-07-22 17:56:18.947423032 +0100
 @@ -581,14 +581,14 @@
diff --git a/packages/gdb/files/sim-install-makefile.patch b/packages/gdb/files/sim-install-makefile.patch
new file mode 100644
index 0000000000..7ac67496ac
--- /dev/null
+++ b/packages/gdb/files/sim-install-makefile.patch
@@ -0,0 +1,11 @@
+--- gdb-6.6~org/sim/common/Makefile.in	2007-01-30 09:23:31.000000000 -0500
++++ gdb-6.6/sim/common/Makefile.in	2007-01-30 09:25:32.000000000 -0500
+@@ -34,7 +34,7 @@
+ 
+ datadir = @datadir@
+ mandir = @mandir@
+-man1dir = $(mandir)/man1
++man1dir = $(DESTDIR)$(mandir)/man1
+ infodir = @infodir@
+ includedir = @includedir@
+ 
diff --git a/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb
index 9cc72cca69..5dd5cf5ac5 100644
--- a/packages/gdb/gdb-cross_6.3.bb
+++ b/packages/gdb/gdb-cross_6.3.bb
@@ -5,9 +5,12 @@ DEPENDS = "ncurses-native"
 
 inherit autotools sdk
 
+PR = "r1"
+
 S = "${WORKDIR}/gdb-${PV}"
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
-	file://sim-install.patch;patch=1"
+	file://sim-install-makefile.patch;patch=1 \
+	file://sim-install-makefile-common.patch;patch=1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}"
 
diff --git a/packages/gdb/gdb-cross_6.6.bb b/packages/gdb/gdb-cross_6.6.bb
index 32076b529e..03d9cda12c 100644
--- a/packages/gdb/gdb-cross_6.6.bb
+++ b/packages/gdb/gdb-cross_6.6.bb
@@ -6,9 +6,11 @@ DEPENDS = "ncurses-native"
 
 inherit autotools sdk
 
+PR = "r1"
+
 S = "${WORKDIR}/gdb-${PV}"
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
-	file://sim-install.patch;patch=1"
+	file://sim-install-makefile.patch;patch=1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}"
 
diff --git a/packages/gpephone/phoneserver/.mtn2git_empty b/packages/gpephone/phoneserver/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/phoneserver/.mtn2git_empty
diff --git a/packages/gpephone/phoneserver/changeport.patch b/packages/gpephone/phoneserver/changeport.patch
new file mode 100644
index 0000000000..fac4546d96
--- /dev/null
+++ b/packages/gpephone/phoneserver/changeport.patch
@@ -0,0 +1,11 @@
+--- config.h~	2007-02-07 10:43:57.000000000 +0100
++++ config.h	2007-02-07 10:43:57.000000000 +0100
+@@ -22,7 +22,7 @@
+ /* serial port name */
+ #ifndef SERIAL_PORT
+ //#define SERIAL_PORT "/dev/pts/0"        //ttyS1"
+-#define SERIAL_PORT "/dev/ttyS1"        //ttyS1"
++#define SERIAL_PORT "/dev/ttyS0"        //ttyS1"
+ #endif                          /*  */
+ 
+ /* serial port baudrate */
diff --git a/packages/gpephone/phoneserver_1.0.bb b/packages/gpephone/phoneserver_1.0.bb
index fdde9d73f9..d9ee660cdb 100644
--- a/packages/gpephone/phoneserver_1.0.bb
+++ b/packages/gpephone/phoneserver_1.0.bb
@@ -2,10 +2,12 @@ LICENSE     = "LiPS"
 DESCRIPTION = "Phone services server"
 SECTION     = "gpe"
 PRIORITY    = "optional"
-PR          = "r0"
+PR          = "r1"
 
 DEPENDS = "dbus-glib glib-2.0  libmsgenabler libabenabler"
 
 GPE_TARBALL_SUFFIX= "bz2"
 inherit gpephone autotools
- 
+
+SRC_URI += "file://changeport.patch;patch=1;pnum=0"
+
diff --git a/packages/kanjipad/kanjipad.inc b/packages/kanjipad/kanjipad.inc
index aecd130b82..ce9613b3ab 100644
--- a/packages/kanjipad/kanjipad.inc
+++ b/packages/kanjipad/kanjipad.inc
@@ -6,4 +6,6 @@ LICENSE = "GPL"
 
 SRC_URI="http://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz"
 
+S = ${WORKDIR}/kanjipad-2.0.0/
+
 inherit autotools pkgconfig
diff --git a/packages/kanjipad/kpengine_0.1.bb b/packages/kanjipad/kpengine_0.1.bb
index 0fa32faf13..d9a6fee7d6 100644
--- a/packages/kanjipad/kpengine_0.1.bb
+++ b/packages/kanjipad/kpengine_0.1.bb
@@ -1,10 +1,9 @@
 require kanjipad.inc
 
-SECTION = "libs"
+DESCRIPTION = "Japanese HWR engine used by a number of programs. Original algorithms by Todd Ruddick."
+SECTION = "inputmethods"
+PR = "r1"
 
 SRC_URI += "file://Makefile-kpengine-only.patch;patch=1"
 
-FILES = "${bindir}/kpengine ${datadir}"
-
-# would it be better to make this a part of kanjipad bb?
-S = ${WORKDIR}/kanjipad-2.0.0/
+FILES_${PN} = "${bindir}/kpengine ${datadir}"
diff --git a/packages/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch b/packages/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch
new file mode 100644
index 0000000000..735663f343
--- /dev/null
+++ b/packages/libopie/libopie2/ipaq-lcd-rotate-cleanup.patch
@@ -0,0 +1,39 @@
+Index: libopie2/opiecore/device/odevice_ipaq.cpp
+===================================================================
+--- libopie2.orig/opiecore/device/odevice_ipaq.cpp	2007-02-05 21:40:33.000000000 +0000
++++ libopie2/opiecore/device/odevice_ipaq.cpp	2007-02-05 21:51:43.000000000 +0000
+@@ -317,24 +317,20 @@
+             break;
+         }
+ 
+-        // Rotate cursor keys 180 or 270
++	// QT has strange screen coordinate system, so depending
++	// on native device screen orientation, we need to rotate cursor keys
+         case Key_Left :
+         case Key_Right:
+         case Key_Up   :
+         case Key_Down : {
+-            if (( d->m_model == Model_iPAQ_H31xx ) ||
+-                ( d->m_model == Model_iPAQ_H38xx )) {
+-                newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4;
+-            }
+-            // Rotate the cursor keys by 270
+-            // keycode - Key_Left = position of the button starting from left clockwise
+-            // add the rotation to it and modolo. No we've the original offset
+-            // add the offset to the Key_Left key
+-            if (( d->m_model == Model_iPAQ_H5xxx ) ||
+-		( d->m_model == Model_iPAQ_H191x ) ||
+-		( d->m_model == Model_iPAQ_H4xxx ) ||
+-		( d->m_model == Model_iPAQ_H1940 ))
+-                newkeycode = Key_Left + ( keycode - Key_Left + 3 ) % 4;
++	    int quarters;
++	    switch (d->m_rotation) {
++		case Rot0:	quarters = 3/*270deg*/; break;
++		case Rot90:	quarters = 2/*270deg*/; break;
++		case Rot180:	quarters = 1/*270deg*/; break;
++		case Rot270:	quarters = 0/*270deg*/; break;
++	    }
++	    newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4;
+             break;
+         }
+ 
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index 1635a5b1a3..d6403d645a 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,12 +1,13 @@
 require ${PN}.inc
 
 PV = "1.2.2+cvs${SRCDATE}"
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
            file://ipaq-2.6-sys-class-backlight-support.patch;patch=1 \
+           file://ipaq-lcd-rotate-cleanup.patch;patch=1 \
            file://include.pro"
 
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie
index b2677ddc0d..3fe4d0cdf8 100755
--- a/packages/opie-taskbar/opie-taskbar/opie
+++ b/packages/opie-taskbar/opie-taskbar/opie
@@ -41,6 +41,12 @@ fi
 case $1 in
 'start')
     #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
+
+    # Turn off psplash if any - sleep is required for anti-race
+    if [ -e /mnt/.psplash ]; then
+        TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
+        sleep 1
+    fi
     
     if [ -x "$OPIEDIR/bin/opie-login" ]; then
             echo Starting Opie-login....
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb
index 384fbd0ec8..a5e154cfef 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 38172af970..b2992b0c28 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
diff --git a/packages/poboxserver/poboxserver_1.2.5.bb b/packages/poboxserver/poboxserver_1.2.5.bb
index 6278c920be..e582ce0ccf 100644
--- a/packages/poboxserver/poboxserver_1.2.5.bb
+++ b/packages/poboxserver/poboxserver_1.2.5.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "OpenPOBox is an open source implementation of a 'Predictive Operation Based On eXample'"
-SECTION = "libs/inputmethods"
+SECTION = "inputmethods"
 LICENSE = "GPL"
 DEPENDS = "perl-native ruby-native nkf-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2 \
            http://www.vanille.de/mirror/pbserver-${PV}.tar.gz \
diff --git a/packages/sysvinit/sysvinit/angstrom/rc b/packages/sysvinit/sysvinit/angstrom/rc
index 7716a52099..e43ddec14b 100755
--- a/packages/sysvinit/sysvinit/angstrom/rc
+++ b/packages/sysvinit/sysvinit/angstrom/rc
@@ -23,7 +23,7 @@ startup_progress() {
     step=$(($step + $step_change))
 
     if [ $(($num_steps + $first_step)) -lt 1 ]; then
-        numsteps="1"
+        num_steps="1"
         first_step="0"
     fi
 
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index aa7aa83351..53634b7556 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init."
 SECTION = "base"
 LICENSE = "GPL"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r31"
+PR = "r32"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
diff --git a/packages/uim/uim.inc b/packages/uim/uim.inc
index a4b0215896..94eb11d332 100644
--- a/packages/uim/uim.inc
+++ b/packages/uim/uim.inc
@@ -1,12 +1,11 @@
 DESCRIPTION = "A multilingual user input method library"
 HOMEPAGE = "http://uim.freedesktop.org/"
 LICENSE = "GPL"
-SECTION = "libs/inputmethod"
-PR = "r0"
+SECTION = "inputmethods"
 
 EXTRA_OECONF += "--disable-applet \
                  --disable-emacs \
-                 --without-qt \
+#                 --without-qt \
                  --without-scim \
                  --without-m17nlib \
                  --without-prime \
@@ -14,6 +13,4 @@ EXTRA_OECONF += "--disable-applet \
                  --without-mana \
                  --without-eb"
 
-SRC_URI = "http://uim.freedesktop.org/releases/uim-${PV}.tar.bz2"
-
-S = "${WORKDIR}/uim-${PV}"
+SRC_URI = "http://uim.freedesktop.org/releases/uim/stable/uim-${PV}.tar.bz2"
diff --git a/packages/uim/uim_1.3.1.bb b/packages/uim/uim_1.3.1.bb
index 5d82945df7..e5ddcd0737 100644
--- a/packages/uim/uim_1.3.1.bb
+++ b/packages/uim/uim_1.3.1.bb
@@ -1,29 +1,20 @@
 require uim.inc
 DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses"
+SECTION_uim-gtk2.0 = "x11/inputmethods"
+PR = "r1"
 
 SRC_URI += "file://uim-module-manager.patch;patch=1"
 
-S = "${WORKDIR}/uim-${PV}"
-
-do_stage() {
-	autotools_stage_all
-}
-
 inherit autotools pkgconfig
 
 PACKAGES = "uim-xim uim-utils uim-skk uim-gtk2.0 uim-fep uim-common uim-anthy libuim0 libuim-dev"
 
 LEAD_SONAME = "libuim.so.1"
 RDEPENDS_uim = "libuim0"
-
-DESCRIPTION_libuim-dev = "Development files for uim"
-FILES_libuim-dev = "${libdir}/libuim*.a \
-                    ${libdir}/libuim*.la \
-                    ${libdir}/libuim*.so \
-                    ${includedir}/uim \
-                    ${libdir}/pkgconfig/uim.pc"
+RDEPENDS_uim-anthy = "virtual/japanese-font"
 
 DESCRIPTION_libuim0 = "Simple and flexible input method collection and library"
+SECTION_libuim0 = "libs/inputmethods"
 FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \
                  ${libdir}/libuim-custom.so.* \
                  ${datadir}/locale/ja/LC_MESSAGES/uim.mo \
@@ -31,6 +22,14 @@ FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \
                  ${datadir}/locale/ko/LC_MESSAGES/uim.mo \
                  ${libdir}/libuim.so.*"
 
+DESCRIPTION_libuim-dev = "Development files for uim"
+SECTION_libuim-dev = "devel/libs"
+FILES_libuim-dev = "${libdir}/libuim*.a \
+                    ${libdir}/libuim*.la \
+                    ${libdir}/libuim*.so \
+                    ${includedir}/uim \
+                    ${libdir}/pkgconfig/uim.pc"
+
 DESCRIPTION_uim-anthy = "Anthy plugin for uim"
 FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \
                    ${datadir}/uim/anthy*.scm"
@@ -140,3 +139,7 @@ if [ -f /usr/bin/uim-module-manager ]; then
 		tutcode tcode hangul viqr ipa-x-sampa latin byeoru
 fi
 }
+
+do_stage() {
+	autotools_stage_all
+}