summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--delete.txt27
-rw-r--r--packages/abiword/abiword-2.5.inc40
-rw-r--r--packages/abiword/abiword_2.5.1.bb2
-rw-r--r--packages/angstrom/angstrom-x11-base-depends.bb4
-rw-r--r--packages/gaim/files/purple-OE-branding.patch14
-rw-r--r--packages/gaim/pidgin_2.1.0.bb3
6 files changed, 67 insertions, 23 deletions
diff --git a/delete.txt b/delete.txt
new file mode 100644
index 0000000000..7c9dc251aa
--- /dev/null
+++ b/delete.txt
@@ -0,0 +1,27 @@
+Packages to be removed from OpenEmbedded if no one will fix them.
+
+Dropping stuff from metadata is not best way so this file will be filled
+with informations about which parts of metadata will be removed.
+
+Please sort by removal date
+
+Package Name: recipe, directory or subsystem name
+Removal Date: YYYY-MM-DD
+Maintainer: Surname Name + e-mail
+Reason: description why it will get removed
+Proposed by: person which want entry to be removed
+
+-----------------------------------------------------------------------------
+
+Package Name: Maemo
+Removal Date: 2006-12-15
+Maintainer: none
+Reason: Unfetchable, obsoleted by IT2006 release.
+Proposed by: Marcin 'Hrw' Juszkiewicz
+
+Package Name: task-bootstrap*
+Removal Date: 2006-12-22
+Maintainer: None
+Reason: Obsoleted by task-base
+Proposed by: Koen Kooi
+Note: Moved to packages/obsolete/tasks on 2006-12-22
diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc
index 3184be72b4..42fc6c7d6e 100644
--- a/packages/abiword/abiword-2.5.inc
+++ b/packages/abiword/abiword-2.5.inc
@@ -13,21 +13,21 @@ SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,
FILES_${PN} += " \
${datadir}/icons/* \
- ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/glade \
- ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/scripts \
- ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en \
- ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en_GB \
-# ${datadir}/AbiSuite-${SHRT_VER}/templates/A4.awt \
-# ${datadir}/AbiSuite-${SHRT_VER}/templates/US-Letter.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt-en_GB \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Employee-Directory.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Business-Report.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Fax-Coversheet.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Resume.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Two-Columns.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Memo.awt \
- ${datadir}/AbiSuite-${SHRT_VER}/templates/Press-Release.awt "
+ ${datadir}/abiword-${SHRT_VER}/AbiWord/glade \
+ ${datadir}/abiword-${SHRT_VER}/AbiWord/scripts \
+ ${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en \
+ ${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en_GB \
+# ${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
+# ${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
+ ${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Business-Report.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Fax-Coversheet.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Resume.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Two-Columns.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
+ ${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
inherit autotools pkgconfig
@@ -54,8 +54,8 @@ do_install_append() {
PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
-FILES_abiword-clipart += "${datadir}/AbiSuite-${SHRT_VER}/clipart"
-FILES_abiword-icons += "${datadir}/AbiSuite-${SHRT_VER}/icons"
-FILES_abiword-strings += "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/strings"
-FILES_abiword-systemprofiles += "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile*"
-FILES_abiword-templates += "${datadir}/AbiSuite-${SHRT_VER}/templates"
+FILES_abiword-clipart += "${datadir}/abiword-${SHRT_VER}/clipart"
+FILES_abiword-icons += "${datadir}/abiword-${SHRT_VER}/icons"
+FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/AbiWord/strings"
+FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile*"
+FILES_abiword-templates += "${datadir}/abiword-${SHRT_VER}/templates"
diff --git a/packages/abiword/abiword_2.5.1.bb b/packages/abiword/abiword_2.5.1.bb
index 66d8fae0ad..5fcc1dd1a2 100644
--- a/packages/abiword/abiword_2.5.1.bb
+++ b/packages/abiword/abiword_2.5.1.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
DEFAULT_PREFERENCE = "-1"
-PR = "r0"
+PR = "r1"
RCONFLICTS = "abiword-embedded"
diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb
index f3b5cd9008..036e513547 100644
--- a/packages/angstrom/angstrom-x11-base-depends.bb
+++ b/packages/angstrom/angstrom-x11-base-depends.bb
@@ -1,9 +1,11 @@
DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r32"
+PR = "r33"
ALLOW_EMPTY = "1"
XSERVER ?= "xserver-kdrive-fbdev"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
DEPENDS = "virtual/xserver"
RDEPENDS = "\
diff --git a/packages/gaim/files/purple-OE-branding.patch b/packages/gaim/files/purple-OE-branding.patch
new file mode 100644
index 0000000000..99c61375ce
--- /dev/null
+++ b/packages/gaim/files/purple-OE-branding.patch
@@ -0,0 +1,14 @@
+--- /tmp/irc.h 2007-08-04 20:27:10.000000000 +0200
++++ pidgin-2.1.0/libpurple/protocols/irc/irc.h 2007-08-04 20:28:15.318400000 +0200
+@@ -35,9 +35,9 @@
+ #define IRC_DEFAULT_SSL_PORT 994
+
+ #define IRC_DEFAULT_CHARSET "UTF-8"
+-#define IRC_DEFAULT_ALIAS "purple"
++#define IRC_DEFAULT_ALIAS "OE-user"
+
+-#define IRC_DEFAULT_QUIT "Leaving."
++#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
+
+ #define IRC_INITIAL_BUFSIZE 1024
+
diff --git a/packages/gaim/pidgin_2.1.0.bb b/packages/gaim/pidgin_2.1.0.bb
index e0f865722e..c01db89c04 100644
--- a/packages/gaim/pidgin_2.1.0.bb
+++ b/packages/gaim/pidgin_2.1.0.bb
@@ -4,6 +4,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
file://sanitize-configure.ac.patch;patch=1 \
file://gconf-no-errors.patch;patch=1 \
file://pidgin.desktop-set-icon.patch;patch=1 \
+ file://purple-OE-branding.patch;patch=1 \
"
-PR = "r0"
+PR = "r1"