From 8f83659fedd6d832dc4facacbe74056287ee3b77 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 20 Sep 2005 19:12:06 +0000
Subject: packages/tslib/tslib/: remove h2200 linearizer, courtesy Matthew
 Reimer closes #336

---
 packages/tslib/tslib/h3900/tslib.sh | 10 +---------
 packages/tslib/tslib_cvs.bb         |  6 +++---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh
index c885ccc9d2..be9448b1dc 100644
--- a/packages/tslib/tslib/h3900/tslib.sh
+++ b/packages/tslib/tslib/h3900/tslib.sh
@@ -11,15 +11,7 @@ case `uname -r` in
 	;;
 *)
 	TSLIB_TSDEVICE=`detect-stylus --device`
-	case `module_id` in
-	"HP iPAQ H2200")
-		# h2200 needs special linearizing thing
-		TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h2200
-		;;
-	*)
-		TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
-		;;
-	esac
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
 	;;
 esac
 
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index 5c52147e1c..9e6c4e26d3 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
 PV = "0.0cvs${CVSDATE}"
-PR = "r31"
+PR = "r32"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE}"
@@ -9,7 +9,7 @@ PACKAGE_ARCH_mnci = "${MACHINE}"
 
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
 	   file://ts.conf \
-	   file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 file://ts.conf-h6300 \
+	   file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h6300 \
 	   file://ts.conf-corgi file://ts.conf-corgi-2.4 \
 	   file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
@@ -42,7 +42,7 @@ do_install_append() {
 	case ${MACHINE} in
 	h3600 | h3900 | h1940 | h6300 | ipaq-pxa270)
 		install -d ${D}${datadir}/tslib
-		for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200 ts.conf-h6300; do
+		for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do
 			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
 		done
 		rm -f ${D}${sysconfdir}/ts.conf
-- 
cgit v1.2.3


From a5bf5ebfd2b45921dc5d3aa152a137105f704bd8 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 20 Sep 2005 22:19:09 +0000
Subject: pcmciautils: Install the binaries into the correct place. Remove
 coldplug references as they now just create errors. Add dependency on
 module-init-tools - when busybox's modprobe expands to cover pcmcia alias
 handling, this can be removed.

---
 packages/pcmciautils/pcmciautils_010.bb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/pcmciautils/pcmciautils_010.bb b/packages/pcmciautils/pcmciautils_010.bb
index f619a98235..385ccd9d95 100644
--- a/packages/pcmciautils/pcmciautils_010.bb
+++ b/packages/pcmciautils/pcmciautils_010.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Linux Kernel 2.6 Userland Utilities for the PCMCIA Subsystem"
 DEPENDS = "sysfsutils udev"
-RDEPENDS = "udev"
+RDEPENDS = "udev module-init-tools"
 HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
 SECTION = "kernel/userland"
 PRIORITY = "optional"
@@ -8,15 +8,11 @@ PRIORITY = "optional"
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
 S = "${WORKDIR}/pcmciautils-${PV}"
 
-PR = "r1"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "coldplug"
-INITSCRIPT_PARAMS = "defaults"
+PR = "r2"
 
 export HOSTCC = "${BUILD_CC}"
 export etcdir = "${sysconfdir}"
+export sbindir = "${base_sbindir}"
 export pcmciaconfdir = "${sysconfdir}/pcmcia"
 export udevrulesdir = "${sysconfdir}/udev/rules.d"
 export UDEV = 1
-- 
cgit v1.2.3


From 4948743a02c4bbd2fb2d29181f455e8653ca03bf Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 20 Sep 2005 22:22:53 +0000
Subject: module-init-tools: Upgrade to 3.2pre9. Change the update-alternatives
 priority so the genuine tool takes priority over busybox. This gets
 pcmciatils working properly.

---
 .../module-init-tools-3.2-pre7/.mtn2git_empty      |  0
 .../ignore_arch_directory                          | 24 ---------
 .../module-init-tools-3.2-pre7/manpagesopt         | 39 --------------
 .../module-init-tools-3.2-pre9/.mtn2git_empty      |  0
 .../ignore_arch_directory                          | 24 +++++++++
 .../module-init-tools-3.2-pre9/manpagesopt         | 41 ++++++++++++++
 .../module-init-tools_3.2-pre7.bb                  | 63 ----------------------
 .../module-init-tools_3.2-pre9.bb                  | 63 ++++++++++++++++++++++
 8 files changed, 128 insertions(+), 126 deletions(-)
 delete mode 100644 packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty
 delete mode 100644 packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory
 delete mode 100644 packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt
 create mode 100644 packages/module-init-tools/module-init-tools-3.2-pre9/.mtn2git_empty
 create mode 100644 packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory
 create mode 100644 packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt
 delete mode 100644 packages/module-init-tools/module-init-tools_3.2-pre7.bb
 create mode 100644 packages/module-init-tools/module-init-tools_3.2-pre9.bb

diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty b/packages/module-init-tools/module-init-tools-3.2-pre7/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory b/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory
deleted file mode 100644
index 185ea7a3a5..0000000000
--- a/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8
---- module-init-tools-3.2-pre7/modprobe.8.orig     2005-07-05 13:52:32.000000000 +0200
-+++ module-init-tools-3.2-pre7/modprobe.8  2005-07-05 13:52:42.000000000 +0200
-@@ -31,6 +31,7 @@
- \fI/etc/modprobe.conf\fR configuration file and
- \fI/etc/modprobe.d\fR directory
- (see \fBmodprobe.conf\fR(5)).
-+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
- .PP
- Note that this version of \fBmodprobe\fR does not
- do anything to the module itself: the work of resolving symbols
---- module-init-tools-3.2-pre7/modprobe.c.orig	2005-07-05 13:50:00.000000000 +0200
-+++ module-init-tools-3.2-pre7/modprobe.c	2005-07-05 13:50:15.000000000 +0200
-@@ -1158,6 +1158,10 @@
- 	DIR *dir;
- 	int ret = 0;
- 
-+	/* ignore everything in this directory */
-+	if (streq(filename, "/etc/modprobe.d/arch"))
-+		return 1;
-+
- 	/* Reiser4 has file/directory duality: treat it as both. */
- 	dir = opendir(filename);
- 	if (dir) {
diff --git a/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt b/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt
deleted file mode 100644
index ee1454c6ef..0000000000
--- a/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: module-init-tools-3.1/configure.in
-===================================================================
---- module-init-tools-3.1.orig/configure.in	2004-11-12 00:05:25.000000000 -0500
-+++ module-init-tools-3.1/configure.in	2005-01-20 02:23:16.409792288 -0500
-@@ -41,5 +41,14 @@
- fi])
- AC_SUBST(MODULE_DIR)
- 
--AC_OUTPUT([Makefile])
-+AC_ARG_ENABLE(manpages,
-+[  --disable-manpages      Disable man page generation.],
-+[if test x"$enableval" != x"no"; then
-+  enable_manpages=yes
-+else
-+  enable_manpages=no
-+fi],
-+[enable_manpages=yes])
-+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes")
- 
-+AC_OUTPUT([Makefile])
---- module-init-tools-3.2-pre7/Makefile.am.orig	2005-07-05 13:55:06.000000000 +0200
-+++ module-init-tools-3.2-pre7/Makefile.am	2005-07-05 13:55:31.000000000 +0200
-@@ -21,13 +21,14 @@
- MAN5 = modprobe.conf.5 modules.dep.5
- MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
- SGML = $(addprefix doc/,  $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
--man_MANS = $(MAN5) $(MAN8)
- # If they haven't overridden mandir, fix it (never /man!)
- mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
- 
- TESTSUITE := $(shell find tests -type f ! -name '*~')
- 
--EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
-+if MANPAGES
-+man_MANS = $(MAN5) $(MAN8)
-+endif
- 
- sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static
- bin_PROGRAMS = lsmod
diff --git a/packages/module-init-tools/module-init-tools-3.2-pre9/.mtn2git_empty b/packages/module-init-tools/module-init-tools-3.2-pre9/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory b/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory
new file mode 100644
index 0000000000..185ea7a3a5
--- /dev/null
+++ b/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory
@@ -0,0 +1,24 @@
+diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8
+--- module-init-tools-3.2-pre7/modprobe.8.orig     2005-07-05 13:52:32.000000000 +0200
++++ module-init-tools-3.2-pre7/modprobe.8  2005-07-05 13:52:42.000000000 +0200
+@@ -31,6 +31,7 @@
+ \fI/etc/modprobe.conf\fR configuration file and
+ \fI/etc/modprobe.d\fR directory
+ (see \fBmodprobe.conf\fR(5)).
++All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
+ .PP
+ Note that this version of \fBmodprobe\fR does not
+ do anything to the module itself: the work of resolving symbols
+--- module-init-tools-3.2-pre7/modprobe.c.orig	2005-07-05 13:50:00.000000000 +0200
++++ module-init-tools-3.2-pre7/modprobe.c	2005-07-05 13:50:15.000000000 +0200
+@@ -1158,6 +1158,10 @@
+ 	DIR *dir;
+ 	int ret = 0;
+ 
++	/* ignore everything in this directory */
++	if (streq(filename, "/etc/modprobe.d/arch"))
++		return 1;
++
+ 	/* Reiser4 has file/directory duality: treat it as both. */
+ 	dir = opendir(filename);
+ 	if (dir) {
diff --git a/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt b/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt
new file mode 100644
index 0000000000..5d5cac609e
--- /dev/null
+++ b/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt
@@ -0,0 +1,41 @@
+Index: module-init-tools-3.2-pre9/configure.in
+===================================================================
+--- module-init-tools-3.2-pre9.orig/configure.in	2005-08-09 04:31:26.000000000 +0000
++++ module-init-tools-3.2-pre9/configure.in	2005-09-20 22:06:10.000000000 +0000
+@@ -41,5 +41,14 @@
+ fi])
+ AC_SUBST(MODULE_DIR)
+ 
+-AC_OUTPUT([Makefile])
++AC_ARG_ENABLE(manpages,
++[  --disable-manpages      Disable man page generation.],
++[if test x"$enableval" != x"no"; then
++  enable_manpages=yes
++else
++  enable_manpages=no
++fi],
++[enable_manpages=yes])
++AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes")
+ 
++AC_OUTPUT([Makefile])
+Index: module-init-tools-3.2-pre9/Makefile.am
+===================================================================
+--- module-init-tools-3.2-pre9.orig/Makefile.am	2005-08-09 04:54:28.000000000 +0000
++++ module-init-tools-3.2-pre9/Makefile.am	2005-09-20 22:09:03.000000000 +0000
+@@ -21,13 +21,14 @@
+ MAN5 = modprobe.conf.5 modules.dep.5
+ MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
+ SGML = $(addprefix doc/,  $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
+-man_MANS = $(MAN5) $(MAN8)
+ # If they haven't overridden mandir, fix it (never /man!)
+ mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
+ 
+ TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions
+ 
+-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
++if MANPAGES
++man_MANS = $(MAN5) $(MAN8)
++endif
+ 
+ sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static
+ bin_PROGRAMS = lsmod
diff --git a/packages/module-init-tools/module-init-tools_3.2-pre7.bb b/packages/module-init-tools/module-init-tools_3.2-pre7.bb
deleted file mode 100644
index 017f288e7d..0000000000
--- a/packages/module-init-tools/module-init-tools_3.2-pre7.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
-removing kernel modules for Linux (versions 2.5.48 and above). It serves \
-the same function that the modutils package serves for Linux 2.4."
-LICENSE = "GPL"
-SECTION = "base"
-PR = "r1"
-
-PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
-RDEPENDS_${PN} += "module-init-tools-depmod"
-
-FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
-FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
-
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
-	   file://ignore_arch_directory;patch=1 \
-	   file://modutils_extension;patch=1 \
-	   file://no_man_rebuild;patch=1 \
-	   file://manpagesopt;patch=1 "
-S = "${WORKDIR}/module-init-tools-${PV}"
-
-EXTRA_OECONF = "--disable-manpages"
-
-bindir = "/bin"
-sbindir = "/sbin"
-
-inherit autotools
-
-do_install() {
-	autotools_do_install
-	for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
-		mv ${D}/$f ${D}/$f.26
-	done
-}
-
-pkg_postinst_module-init-tools() {
-#!/bin/sh
-for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
-bn=`basename $f`
-   update-alternatives --install /$f $bn /$f.26 20
-done
-update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
-update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
-}
-
-pkg_prerm_module-init-tools() {
-#!/bin/sh
-for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
-bn=`basename $f`
-   update-alternatives --remove $bn /$f.26
-done
-update-alternatives --remove bin-lsmod /bin/lsmod.26
-update-alternatives --remove lsmod /bin/lsmod.26
-}
-
-pkg_postinst_module-init-tools-depmod() {
-#!/bin/sh
-update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20
-}
-
-pkg_prerm_module-init-tools() {
-#!/bin/sh
-update-alternatives --remove depmod /sbin/depmod.26
-}
diff --git a/packages/module-init-tools/module-init-tools_3.2-pre9.bb b/packages/module-init-tools/module-init-tools_3.2-pre9.bb
new file mode 100644
index 0000000000..bbd8cca1bf
--- /dev/null
+++ b/packages/module-init-tools/module-init-tools_3.2-pre9.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
+removing kernel modules for Linux (versions 2.5.48 and above). It serves \
+the same function that the modutils package serves for Linux 2.4."
+LICENSE = "GPL"
+SECTION = "base"
+PR = "r0"
+
+PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
+RDEPENDS_${PN} += "module-init-tools-depmod"
+
+FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
+FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
+	   file://ignore_arch_directory;patch=1 \
+	   file://modutils_extension;patch=1 \
+	   file://no_man_rebuild;patch=1 \
+	   file://manpagesopt;patch=1 "
+S = "${WORKDIR}/module-init-tools-${PV}"
+
+EXTRA_OECONF = "--disable-manpages"
+
+bindir = "/bin"
+sbindir = "/sbin"
+
+inherit autotools
+
+do_install() {
+	autotools_do_install
+	for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
+		mv ${D}/$f ${D}/$f.26
+	done
+}
+
+pkg_postinst_module-init-tools() {
+#!/bin/sh
+for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
+bn=`basename $f`
+   update-alternatives --install /$f $bn /$f.26 60
+done
+update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
+update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
+}
+
+pkg_prerm_module-init-tools() {
+#!/bin/sh
+for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
+bn=`basename $f`
+   update-alternatives --remove $bn /$f.26
+done
+update-alternatives --remove bin-lsmod /bin/lsmod.26
+update-alternatives --remove lsmod /bin/lsmod.26
+}
+
+pkg_postinst_module-init-tools-depmod() {
+#!/bin/sh
+update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60
+}
+
+pkg_prerm_module-init-tools() {
+#!/bin/sh
+update-alternatives --remove depmod /sbin/depmod.26
+}
-- 
cgit v1.2.3


From 86d964abe3e75576ae9c5086a76653b1e6a12d47 Mon Sep 17 00:00:00 2001
From: Derek Young <dyoung@nslu2-linux.org>
Date: Wed, 21 Sep 2005 05:18:31 +0000
Subject: openslug-kernel: Add the missing USB Audio modules to the defconfig

---
 packages/linux/openslug-kernel-2.6.12.2/defconfig | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig
index 51434a652d..548ce0e3c6 100644
--- a/packages/linux/openslug-kernel-2.6.12.2/defconfig
+++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.12.2
-# Fri Sep 16 22:26:41 2005
+# Mon Sep 19 00:54:57 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -968,10 +968,13 @@ CONFIG_SOUND=m
 # Advanced Linux Sound Architecture
 #
 CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_RAWMIDI=m
 # CONFIG_SND_SEQUENCER is not set
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
-# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_PCM_OSS=m
 # CONFIG_SND_RTCTIMER is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
@@ -1034,7 +1037,7 @@ CONFIG_SND_MIXER_OSS=m
 #
 # USB devices
 #
-# CONFIG_SND_USB_AUDIO is not set
+CONFIG_SND_USB_AUDIO=m
 
 #
 # Open Sound System
-- 
cgit v1.2.3


From 7aeb533c92164997b72187cc2f08dfb4e2503c94 Mon Sep 17 00:00:00 2001
From: Derek Young <dyoung@nslu2-linux.org>
Date: Wed, 21 Sep 2005 05:20:43 +0000
Subject: openslug-kernel: adjust the package revision for added usb audio bits

---
 packages/linux/nslu2-kernel_2.6.12.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb
index 6f0f400028..e574f86d56 100644
--- a/packages/linux/nslu2-kernel_2.6.12.2.bb
+++ b/packages/linux/nslu2-kernel_2.6.12.2.bb
@@ -1,5 +1,5 @@
 # Kernel for NSLU2
-PR = "r16"
+PR = "r17"
 include nslu2-kernel.inc
 
 # N2K_EXTRA_PATCHES - list of patches to apply (can include
-- 
cgit v1.2.3


From 824442fa8cd5ce702937e3095a0ac7d44a910701 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 21 Sep 2005 09:09:50 +0000
Subject: packages/abiword/abiword_2.3.99.bb: s/AbiSuite-2.2/AbiSuite-2.4/g to
 fix packaging

---
 packages/abiword/abiword_2.3.99.bb | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/abiword/abiword_2.3.99.bb b/packages/abiword/abiword_2.3.99.bb
index 76b569db29..9a83ff3d5b 100644
--- a/packages/abiword/abiword_2.3.99.bb
+++ b/packages/abiword/abiword_2.3.99.bb
@@ -6,28 +6,28 @@ LICENSE="GPLv2"
 DEPENDS     = "cdump-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
 RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
                glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-PR="r4"
+PR="r5"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
 	file://cdump-hack.patch;patch=1"
 S = "${WORKDIR}/abiword-${PV}/abi"
 
 FILES_${PN} += " ${datadir}/icons/* \
-${datadir}/AbiSuite-2.2/AbiWord/glade \
-${datadir}/AbiSuite-2.2/AbiWord/scripts \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en \
-${datadir}/AbiSuite-2.2/AbiWord/system.profile-en_GB \
-#${datadir}/AbiSuite-2.2/templates/A4.awt \
-#${datadir}/AbiSuite-2.2/templates/US-Letter.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt \
-${datadir}/AbiSuite-2.2/templates/normal.awt-en_GB \
-${datadir}/AbiSuite-2.2/templates/Employee-Directory.awt \
-${datadir}/AbiSuite-2.2/templates/Business-Report.awt \
-${datadir}/AbiSuite-2.2/templates/Fax-Coversheet.awt \
-${datadir}/AbiSuite-2.2/templates/Resume.awt \
-${datadir}/AbiSuite-2.2/templates/Two-Columns.awt \
-${datadir}/AbiSuite-2.2/templates/Memo.awt \
-${datadir}/AbiSuite-2.2/templates/Press-Release.awt "
+${datadir}/AbiSuite-2.4/AbiWord/glade \
+${datadir}/AbiSuite-2.4/AbiWord/scripts \
+${datadir}/AbiSuite-2.4/AbiWord/system.profile-en \
+${datadir}/AbiSuite-2.4/AbiWord/system.profile-en_GB \
+#${datadir}/AbiSuite-2.4/templates/A4.awt \
+#${datadir}/AbiSuite-2.4/templates/US-Letter.awt \
+${datadir}/AbiSuite-2.4/templates/normal.awt \
+${datadir}/AbiSuite-2.4/templates/normal.awt-en_GB \
+${datadir}/AbiSuite-2.4/templates/Employee-Directory.awt \
+${datadir}/AbiSuite-2.4/templates/Business-Report.awt \
+${datadir}/AbiSuite-2.4/templates/Fax-Coversheet.awt \
+${datadir}/AbiSuite-2.4/templates/Resume.awt \
+${datadir}/AbiSuite-2.4/templates/Two-Columns.awt \
+${datadir}/AbiSuite-2.4/templates/Memo.awt \
+${datadir}/AbiSuite-2.4/templates/Press-Release.awt "
 
 inherit autotools
 
-- 
cgit v1.2.3