Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/10 10:19:43+01:00 (none)!XorA
mplayer-atty: update the version to 1.1.4

2005/05/10 10:11:27+01:00 (none)!XorA
Fixed packaging directory typo

BKrev: 42808168NJfoWjGnHzMr3kV8qLhjow

diff --git a/packages/abiword/abiword_2.2.7.bb b/packages/abiword/abiword_2.2.7.bb
index 96ee19d..ac96afc 100644 (file)
--- a/packages/abiword/abiword_2.2.7.bb
+++ b/packages/abiword/abiword_2.2.7.bb
@@ -4,30 +4,30 @@ MAINTAINER="Koen Kooi <koen@handhelds.org>"
 LICENSE="GPLv2"
 
 DEPENDS     = "cdump-native libglade libfribidi enchant jpeg libpng perl glibc"
-RDEPENDS    = "libglade enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
+RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
                glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-PR="r1"
+PR="r2"
 
 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.0/AbiWord/glade \
-${datadir}/AbiSuite-2.0/AbiWord/scripts \
-${datadir}/AbiSuite-2.0/AbiWord/system.profile-en \
-${datadir}/AbiSuite-2.0/AbiWord/system.profile-en_GB \
-#${datadir}/AbiSuite-2.0/templates/A4.awt \
-#${datadir}/AbiSuite-2.0/templates/US-Letter.awt \
-${datadir}/AbiSuite-2.0/templates/normal.awt \
-${datadir}/AbiSuite-2.0/templates/normal.awt-en_GB \
-${datadir}/AbiSuite-2.0/templates/Employee-Directory.awt \
-${datadir}/AbiSuite-2.0/templates/Business-Report.awt \
-${datadir}/AbiSuite-2.0/templates/Fax-Coversheet.awt \
-${datadir}/AbiSuite-2.0/templates/Resume.awt \
-${datadir}/AbiSuite-2.0/templates/Two-Columns.awt \
-${datadir}/AbiSuite-2.0/templates/Memo.awt \
-${datadir}/AbiSuite-2.0/templates/Press-Release.awt"
+${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 "
 
 inherit autotools
 

diff --git a/packages/mplayer/mplayer-atty-1.1.4/Makefile.patch b/packages/mplayer/mplayer-atty-1.1.4/Makefile.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/mplayer/mplayer-atty-1.1.4/dsputil.patch b/packages/mplayer/mplayer-atty-1.1.4/dsputil.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/mplayer/mplayer-atty-1.1.4/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.4/libmpcodecs-ogg-include.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/mplayer/mplayer-atty-1.1.4/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.4/libmpdemux-ogg-include.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/mplayer/mplayer-atty-1.1.4/sdl.patch b/packages/mplayer/mplayer-atty-1.1.4/sdl.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/mplayer/mplayer-atty_1.1.4.bb b/packages/mplayer/mplayer-atty_1.1.4.bb
new file mode 100644 (file)
index 0000000..e69de29