11 files changed, 68 insertions, 24 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c11f463a98..e7016392ea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -162,7 +162,7 @@ Mail:       pmiscml@gmail.com
 Machines:   h3900, h4000, hx4700
 Interests:  PocketPC and Palm devices support, Win32 support
 Interests:  Cross-machine unification
-Recipes:    linux-handhelds-2.6, opie-*
+Recipes:    linux-handhelds-2.6, opie-*, initramfs-*, gnome-mplayer
 
 Person:     Philip Balister
 Mail:       Crofton@balister.org
diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf
index fc760f9ea0..92e5ac5b39 100644
--- a/conf/distro/openwrt-sdk.conf
+++ b/conf/distro/openwrt-sdk.conf
@@ -18,9 +18,12 @@ require conf/distro/generic-uclibc.conf
 # Header
 #
 DISTRO_NAME = "OpenWRT"
+DISTRO_REVISION = "2"
+
+IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
 
 # This is what lives in SDK
 ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
 
 # Make sure that we have correct package dependencies for SDK-provided libs.
-ASSUME_SHLIBS += "libc.so.0:uclibc libgcc_s.so.1:libgcc"
+ASSUME_SHLIBS += "libc.so.0:uclibc libm.so.0:uclibc libgcc_s.so.1:libgcc"
diff --git a/packages/nut/.mtn2git_empty b/packages/nut/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nut/.mtn2git_empty
diff --git a/packages/nut/files/.mtn2git_empty b/packages/nut/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nut/files/.mtn2git_empty
diff --git a/packages/nut/files/libm.patch b/packages/nut/files/libm.patch
new file mode 100644
index 0000000000..658d42face
--- /dev/null
+++ b/packages/nut/files/libm.patch
@@ -0,0 +1,21 @@
+--- a/drivers/Makefile.am.org	2007-10-01 16:06:24.000000000 +0300
++++ a/drivers/Makefile.am	2008-01-09 02:13:09.000000000 +0200
+@@ -125,7 +125,7 @@
+ tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm
+ 
+ bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c nut_usb.c
+-bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS)
++bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LDFLAGS) -lm
+ 
+ megatec_usb_SOURCES = megatec.c megatec_usb.c libusb.c
+ megatec_usb_CFLAGS = $(AM_CFLAGS) -DMEGATEC_SUBDRV
+--- a/drivers/Makefile.am.org	2008-01-09 02:14:32.000000000 +0200
++++ a/drivers/Makefile.am	2008-01-09 02:17:37.000000000 +0200
+@@ -67,6 +67,7 @@
+ al175_SOURCES = al175.c
+ apcsmart_SOURCES = apcsmart.c
+ bcmxcp_SOURCES = bcmxcp.c bcmxcp_ser.c
++bcmxcp_LDADD = $(LDADD) -lm
+ belkin_SOURCES = belkin.c
+ belkinunv_SOURCES = belkinunv.c
+ bestfcom_SOURCES = bestfcom.c
diff --git a/packages/nut/nut_2.2.1.bb b/packages/nut/nut_2.2.1.bb
new file mode 100644
index 0000000000..db3367435d
--- /dev/null
+++ b/packages/nut/nut_2.2.1.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Network UPS Tools"
+LICENSE = "GPL"
+DEPENDS = "libusb"
+PR = "r1"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-usb"
+
+SRC_URI = "http://www.networkupstools.org/source/2.2/nut-${PV}.tar.gz \
+    file://libm.patch;patch=1 \
+    "
+
+FILES_${PN} += "${datadir}/"
diff --git a/packages/octave/octave.inc b/packages/octave/octave.inc
index 414f95bf83..5d8fe756f9 100644
--- a/packages/octave/octave.inc
+++ b/packages/octave/octave.inc
@@ -1,7 +1,4 @@
-DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \
-It provides a convenient command line interface for solving linear and nonlinear problems numerically, \
-and for performing other numerical experiments using a language that is mostly compatible with Matlab. \
-It may also be used as a batch-oriented language."
+DESCRIPTION = "Matlab alternative for numerical computations"
 HOMEPAGE = "http://www.gnu.org/software/octave/"
 SECTION = "console/scientific"
 LICENSE = "GPL"
@@ -11,7 +8,11 @@ RDEPENDS = "libfftw3"
 
 inherit autotools
 
-EXTRA_OECONF = "--without-hdf5"
+EXTRA_OECONF = "--without-hdf5 --without-glpk -without-umfpack \
+                --without-colamd --without-ccolamd --without-cholmod \
+                --without-cxsparse"
+
+# additional missing dependency/functionality: Qhull gperf
 
 do_configure() {
 	gnu-configize
@@ -26,4 +27,3 @@ FILES_${PN}-m = "${datadir}/${PN}/*"
 do_stage() {
         autotools_stage_all
 }
-
diff --git a/packages/octave/octave_2.1.73.bb b/packages/octave/octave_2.1.73.bb
index a6bf240732..8efe5243d7 100644
--- a/packages/octave/octave_2.1.73.bb
+++ b/packages/octave/octave_2.1.73.bb
@@ -2,7 +2,7 @@ require octave.inc
 
 SRC_URI = "ftp://ftp.octave.org/pub/octave/obsolete/${PN}-${PV}.tar.gz"
 
-PR = "r0"
+PR = "r1"
 
 PACKAGES =+ "libcruft-dev liboctave-dev liboctinterp-dev"
 
diff --git a/packages/octave/octave_2.9.19.bb b/packages/octave/octave_2.9.19.bb
index b92a181754..3b56c8657d 100644
--- a/packages/octave/octave_2.9.19.bb
+++ b/packages/octave/octave_2.9.19.bb
@@ -3,22 +3,22 @@ require octave.inc
 SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
            file://configure.patch;patch=1"
 
-PR = "r0"
+PR = "r1"
 
 PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
 	     libcruft-dev liboctave-dev liboctinterp-dev \
              libcruft-dbg liboctave-dbg liboctinterp-dbg"
 
-FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
-FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
+FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft.so.*"
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft*"
 FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*"
 
-FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
-FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
+FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave.so.*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave*"
 FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*"
 
-FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
-FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
+FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp.so.*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp*"
 FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
 
 # octave-oct provides subroutines in .oct file format
diff --git a/packages/octave/octave_3.0.0.bb b/packages/octave/octave_3.0.0.bb
index b92a181754..3b56c8657d 100644
--- a/packages/octave/octave_3.0.0.bb
+++ b/packages/octave/octave_3.0.0.bb
@@ -3,22 +3,22 @@ require octave.inc
 SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
            file://configure.patch;patch=1"
 
-PR = "r0"
+PR = "r1"
 
 PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
 	     libcruft-dev liboctave-dev liboctinterp-dev \
              libcruft-dbg liboctave-dbg liboctinterp-dbg"
 
-FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
-FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
+FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft.so.*"
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft*"
 FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*"
 
-FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
-FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
+FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave.so.*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave*"
 FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*"
 
-FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
-FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
+FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp.so.*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp*"
 FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
 
 # octave-oct provides subroutines in .oct file format
diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
index f1321096c9..3857a1577a 100644
--- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
+++ b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0"
 RPROVIDES_${PN} += "speechd"
 
-PR = "r6"
+PR = "r7"
 
 inherit autotools update-rc.d
 
@@ -47,4 +47,10 @@ do_stage() {
         oe_libinstall -so -C src/c/api libspeechd ${STAGING_LIBDIR}
 }
 
+PACKAGES =+ "libspeechd-dbg libspeechd libspeechd-dev"
+
 FILES_${PN} += "${libdir}/${PN}-modules/*" 
+FILES_${PN}-dbg += "${libdir}/${PN}-modules/.debug" 
+FILES_libspeechd += "${libdir}/libspeechd.so.*"
+FILES_libspeechd-dev += "${libdir}/libspeechd* ${includedir}"
+FILES_libspeechd-dbg += "${libdir}/.debug/libspeechd*"