Merge oe-devel@oe-devel.bkbits.net:openembedded

into hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA

4 files changed, 0 insertions, 127 deletions

diff --git a/mp3blaster/mp3blaster-3.1.3/includedir.patch b/mp3blaster/mp3blaster-3.1.3/includedir.patch
deleted file mode 100644
index d6522736d0..0000000000
--- a/mp3blaster/mp3blaster-3.1.3/includedir.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- mp3blaster-3.1.3/src/Makefile.am~includedir
-+++ mp3blaster-3.1.3/src/Makefile.am
-@@ -36,7 +36,7 @@
- mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
- mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
- mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
--INCLUDES		= -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
-+INCLUDES		= -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer
- mp3blaster_LDADD	= @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
- EXTRA_DIST = FILES
- CXXFLAGS	= @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
---- mp3blaster-3.1.3/mpegsound/Makefile.am~includedir
-+++ mp3blaster-3.1.3/mpegsound/Makefile.am
-@@ -11,5 +11,5 @@
- 
- noinst_HEADERS		= mpegsound.h mpegsound_locals.h
- 
--INCLUDES                = -I$(srcdir) -I$(includedir)
-+INCLUDES                = -I$(srcdir)
- CXXFLAGS                = @CXXFLAGS@ @NAS_CFLAGS@
---- mp3blaster-3.1.3/nmixer/Makefile.am~includedir
-+++ mp3blaster-3.1.3/nmixer/Makefile.am
-@@ -2,7 +2,7 @@
- nmixer_SOURCES	= main.cc
- nmixer_DEPENDENCIES = @LIBNMIXER@
- LDADD           = @LIBNMIXER@ @NCURSES_LIBS@
--INCLUDES		= -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
-+INCLUDES		= -I$(srcdir)
- noinst_LIBRARIES = libnmixer.a
- libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h \
-                       getopt.c getopt1.c getopt.h
---- mp3blaster-3.1.3/src/Makefile.in~includedir
-+++ mp3blaster-3.1.3/src/Makefile.in
-@@ -86,7 +86,7 @@
- mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
- mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
- mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
--INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
-+INCLUDES = -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer
- mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
- EXTRA_DIST = FILES
- CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
---- mp3blaster-3.1.3/nmixer/Makefile.in~includedir
-+++ mp3blaster-3.1.3/nmixer/Makefile.in
-@@ -79,7 +79,7 @@
- nmixer_SOURCES = main.cc
- nmixer_DEPENDENCIES = @LIBNMIXER@
- LDADD = @LIBNMIXER@ @NCURSES_LIBS@
--INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
-+INCLUDES = -I$(srcdir)
- noinst_LIBRARIES = libnmixer.a
- libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h                       getopt.c getopt1.c getopt.h
- 
---- mp3blaster-3.1.3/mpegsound/Makefile.in~includedir
-+++ mp3blaster-3.1.3/mpegsound/Makefile.in
-@@ -82,7 +82,7 @@
- 
- noinst_HEADERS = mpegsound.h mpegsound_locals.h
- 
--INCLUDES = -I$(srcdir) -I$(includedir)
-+INCLUDES = -I$(srcdir)
- CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/mp3blaster/mp3blaster-3.2.0/includedir.patch b/mp3blaster/mp3blaster-3.2.0/includedir.patch
deleted file mode 100644
index 8ae45e2f48..0000000000
--- a/mp3blaster/mp3blaster-3.2.0/includedir.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- mp3blaster-3.2.0/src/Makefile.am~includedir	2003-09-08 17:48:56.000000000 -0400
-+++ mp3blaster-3.2.0/src/Makefile.am	2004-03-20 22:51:26.000000000 -0500
-@@ -36,7 +36,7 @@
- mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
- mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
- mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
--INCLUDES		= -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
-+INCLUDES		= -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer
- mp3blaster_LDADD	= @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
- EXTRA_DIST = FILES
- CXXFLAGS	= @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
---- mp3blaster-3.2.0/mpegsound/Makefile.am~includedir	2002-09-20 16:38:16.000000000 -0400
-+++ mp3blaster-3.2.0/mpegsound/Makefile.am	2004-03-20 22:50:29.000000000 -0500
-@@ -11,5 +11,5 @@
- 
- noinst_HEADERS		= mpegsound.h mpegsound_locals.h
- 
--INCLUDES                = -I$(srcdir) -I$(includedir)
-+INCLUDES                = -I$(srcdir)
- CXXFLAGS                = @CXXFLAGS@ @NAS_CFLAGS@
---- mp3blaster-3.2.0/nmixer/Makefile.am~includedir	2002-10-20 10:08:20.000000000 -0400
-+++ mp3blaster-3.2.0/nmixer/Makefile.am	2004-03-20 22:50:29.000000000 -0500
-@@ -2,7 +2,7 @@
- nmixer_SOURCES	= main.cc
- nmixer_DEPENDENCIES = @LIBNMIXER@
- LDADD           = @LIBNMIXER@ @NCURSES_LIBS@
--INCLUDES		= -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
-+INCLUDES		= -I$(srcdir)
- noinst_LIBRARIES = libnmixer.a
- libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h \
-                       getopt.c getopt1.c getopt.h
---- mp3blaster-3.2.0/src/Makefile.in~includedir	2004-03-20 22:49:26.000000000 -0500
-+++ mp3blaster-3.2.0/src/Makefile.in	2004-03-20 22:51:32.000000000 -0500
-@@ -217,7 +217,7 @@
- mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
- mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
- mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
--INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
-+INCLUDES = -I$(top_srcdir)/mpegsound -I$(top_srcdir)/nmixer
- mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
- EXTRA_DIST = FILES
- all: all-am
---- mp3blaster-3.2.0/nmixer/Makefile.in~includedir	2004-03-20 22:49:26.000000000 -0500
-+++ mp3blaster-3.2.0/nmixer/Makefile.in	2004-03-20 22:50:29.000000000 -0500
-@@ -181,7 +181,7 @@
- nmixer_SOURCES = main.cc
- nmixer_DEPENDENCIES = @LIBNMIXER@
- LDADD = @LIBNMIXER@ @NCURSES_LIBS@
--INCLUDES = -I/usr/include/ncurses -I$(srcdir) -I$(includedir)
-+INCLUDES = -I$(srcdir)
- noinst_LIBRARIES = libnmixer.a
- libnmixer_a_SOURCES = nmixer.cc mixers.cc ossmixer.cc nasmixer.cc nmixer.h \
-                       getopt.c getopt1.c getopt.h
diff --git a/mp3blaster/mp3blaster_3.1.3.bb b/mp3blaster/mp3blaster_3.1.3.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/mp3blaster/mp3blaster_3.1.3.bb
+++ /dev/null
diff --git a/mp3blaster/mp3blaster_3.2.0.bb b/mp3blaster/mp3blaster_3.2.0.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/mp3blaster/mp3blaster_3.2.0.bb
+++ /dev/null