merge of '68d786d826a65a1207a0d57228f667514ce0e74b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 08:59:10 +0000 (08:59 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 08:59:10 +0000 (08:59 +0000)
     and '9bffa04e210205375d9a75632e31368255316a3b'

25 files changed:
conf/distro/include/preferred-opie-versions.inc
contrib/distro-packages/debian/openembedded-essential-1.1/debian/changelog [deleted file]
contrib/distro-packages/debian/openembedded-essential-1.1/debian/copyright [deleted file]
contrib/distro-packages/debian/openembedded-essential-1.2/.mtn2git_empty [moved from contrib/distro-packages/debian/openembedded-essential-1.1/.mtn2git_empty with 100% similarity]
contrib/distro-packages/debian/openembedded-essential-1.2/debian/.mtn2git_empty [moved from contrib/distro-packages/debian/openembedded-essential-1.1/debian/.mtn2git_empty with 100% similarity]
contrib/distro-packages/debian/openembedded-essential-1.2/debian/changelog [new file with mode: 0644]
contrib/distro-packages/debian/openembedded-essential-1.2/debian/compat [moved from contrib/distro-packages/debian/openembedded-essential-1.1/debian/compat with 100% similarity]
contrib/distro-packages/debian/openembedded-essential-1.2/debian/control [moved from contrib/distro-packages/debian/openembedded-essential-1.1/debian/control with 79% similarity]
contrib/distro-packages/debian/openembedded-essential-1.2/debian/copyright [new file with mode: 0644]
contrib/distro-packages/debian/openembedded-essential-1.2/debian/rules [moved from contrib/distro-packages/debian/openembedded-essential-1.1/debian/rules with 75% similarity]
packages/contacts/contacts_0.2.bb [new file with mode: 0644]
packages/dbus/dbus-native_1.0.1.bb [new file with mode: 0644]
packages/gnome/libbacon_cvs.bb [new file with mode: 0644]
packages/linux/linux-handhelds-2.6/24-hostap_cs_id.diff [deleted file]
packages/linux/linux-handhelds-2.6/h4000/defconfig
packages/linux/linux-handhelds-2.6/hrw-pcmcia-ids-r2.patch [deleted file]
packages/linux/linux-handhelds-2.6_cvs.bb
packages/plinciv/plinciv-0.16/FC1.14.1-PC0.16.diff.gz [new file with mode: 0644]
packages/plinciv/plinciv_0.16.bb
packages/slugos-init/files/modulefunctions
packages/slugos-init/slugos-init_0.10.bb
packages/tinymail/files/iconv-detect.h [new file with mode: 0644]
packages/tinymail/files/no-iconv-detect.patch [new file with mode: 0644]
packages/tinymail/tinymail_svn.bb
removal.txt

index 34c1fd4..d7c5b94 100644 (file)
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHRE
 PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
 PREFERRED_VERSION_qte-mt = "${QTE_VERSION}"
 PREFERRED_VERSION_qte = "${QTE_VERSION}"
-PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_libopie2 ?= "${OPIE_VERSION}"
 PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}"
 PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}"
 PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.1/debian/changelog b/contrib/distro-packages/debian/openembedded-essential-1.1/debian/changelog
deleted file mode 100644 (file)
index 4320fca..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-openembedded-essential (1.1-1) unstable; urgency=low
-
-  * added gawk
-
- -- Marcin Juszkiewicz <hrw@hrw.one.pl>  Wed,  8 Nov 2006 11:17:42 +0100
-
-openembedded-essential (1.0-1) unstable; urgency=low
-
-  * Initial release
-
- -- Marcin Juszkiewicz <hrw@openembedded.org>  Tue, 17 Oct 2006 12:05:35 +0200
-
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.1/debian/copyright b/contrib/distro-packages/debian/openembedded-essential-1.1/debian/copyright
deleted file mode 100644 (file)
index 6eabc18..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-This package was debianized by Marcin Juszkiewicz <hrw@hrw.one.pl> on
-Tue, 17 Oct 2006 12:05:35 +0200.
-
-It was downloaded from <fill in http/ftp site>
-
-Upstream Author: <put author(s) name and email here>
-
-Copyright: <put the year(s) of the copyright, and the names of the
-            copyright holder(s) here>
-
-License:
-
-<Put the license of the package here>
-
-
-The Debian packaging is (C) 2006, Marcin Juszkiewicz <hrw@hrw.one.pl> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/changelog b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/changelog
new file mode 100644 (file)
index 0000000..c0eb3d6
--- /dev/null
@@ -0,0 +1,19 @@
+openembedded-essential (1.2) unstable; urgency=low
+
+  * fixed packaging to make lintian happy
+  * switched to native numbering
+
+ -- Marcin Juszkiewicz <hrw@openembedded.org>  Wed,  8 Nov 2006 11:17:42 +0100
+
+openembedded-essential (1.1) unstable; urgency=low
+
+  * added gawk
+
+ -- Marcin Juszkiewicz <hrw@openembedded.org>  Wed,  8 Nov 2006 11:17:42 +0100
+
+openembedded-essential (1.0-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Marcin Juszkiewicz <hrw@openembedded.org>  Tue, 17 Oct 2006 12:05:35 +0200
+
@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
 
 Package: openembedded-essential
 Architecture: all
-Depends: python (>= 2.3), ccache, build-essential, quilt, sed, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk
+Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk
 Description: Metapackage to install all needed packages to start using OpenEmbedded
  OpenEmbedded is a full-featured development environment allowing users to
  target a wide variety of devices. Supporting multiple build, release paths and
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.2/debian/copyright b/contrib/distro-packages/debian/openembedded-essential-1.2/debian/copyright
new file mode 100644 (file)
index 0000000..9e4905f
--- /dev/null
@@ -0,0 +1,12 @@
+This package was debianized by Marcin Juszkiewicz <hrw@hrw.one.pl> on
+Tue, 17 Oct 2006 12:05:35 +0200.
+
+Upstream Author: Marcin Juszkiewicz <hrw@hrw.one.pl>
+
+Copyright: 
+2006 Marcin Juszkiewicz <hrw@hrw.one.pl>
+
+License: GPLv2
+
+The Debian packaging is (C) 2006, Marcin Juszkiewicz <hrw@hrw.one.pl> and
+is licensed under the GPLv2, see `/usr/share/common-licenses/GPL-2'.
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 build:
+binary-arch:
 
 clean:
 
@@ -16,4 +17,4 @@ binary-indep:
        dh_builddeb
 
 binary: binary-indep
-.PHONY: build clean binary-indep binary
+.PHONY: build clean binary-indep binary binary-arch
diff --git a/packages/contacts/contacts_0.2.bb b/packages/contacts/contacts_0.2.bb
new file mode 100644 (file)
index 0000000..071c827
--- /dev/null
@@ -0,0 +1,22 @@
+LICENSE = "LGPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ libglade libbacon eds-dbus"
+DESCRIPTION = "Contacts is an address-book application."
+PR = "r0"
+
+SRC_URI = "http://projects.o-hand.com/sources/contacts/contacts-0.2.tar.gz \
+          file://stock_contact.png \
+          file://stock_person.png"
+
+inherit autotools pkgconfig
+
+
+do_install_append () {
+       install -d ${D}/${datadir}/pixmaps
+       install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
+       install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
+}
+
+FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
+               ${datadir}/pixmaps/stock_person.png"
+
diff --git a/packages/dbus/dbus-native_1.0.1.bb b/packages/dbus/dbus-native_1.0.1.bb
new file mode 100644 (file)
index 0000000..a897ae5
--- /dev/null
@@ -0,0 +1,31 @@
+DESCRIPTION = "message bus system for applications to talk to one another"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+LICENSE = "GPL"
+SECTION = "base"
+
+PR = "r0"
+
+DEPENDS = "glib-2.0-native libxml2-native expat-native"
+
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.1"
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+          file://cross.patch;patch=1 \
+          "
+
+inherit autotools pkgconfig gettext native
+
+S = "${WORKDIR}/dbus-${PV}"
+
+EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
+               --disable-checks --disable-xml-docs --disable-doxygen-docs \
+               --with-xml=expat --without-x"
+
+do_stage () {
+       oe_runmake install
+       autotools_stage_all
+
+       # for dbus-glib-native introspection generation
+       install -d ${STAGING_DATADIR}/dbus
+       install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
+}
diff --git a/packages/gnome/libbacon_cvs.bb b/packages/gnome/libbacon_cvs.bb
new file mode 100644 (file)
index 0000000..cbe1a9a
--- /dev/null
@@ -0,0 +1,20 @@
+DESCRIPTION = "Bacon is a multimedia library"
+LICENSE = "GPLv2"
+
+DEPENDS = "glib-2.0"
+
+PV = "0.0+cvs${SRCDATE}"
+
+inherit gnome
+
+SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+do_stage() {
+       autotools_stage_all
+}      
+
+
+
+
diff --git a/packages/linux/linux-handhelds-2.6/24-hostap_cs_id.diff b/packages/linux/linux-handhelds-2.6/24-hostap_cs_id.diff
deleted file mode 100644 (file)
index b90ead9..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-Add more IDs for PCMCIA cards
-
-From: Pavel Roskin <proski@gnu.org>
-
-Add string IDs for cards that were covered by 0x0156,0x0002, which is no
-longer used in hostap_cs due to conflict with Orinoco cards.
-
-Also add more IDs for cards that are supported by linux-wlan-ng.  Thanks
-to Arnold Schulz <arnysch@gmx.net> for providing the list.
-
-Signed-off-by: Pavel Roskin <proski@gnu.org>
----
-
- drivers/net/wireless/hostap/hostap_cs.c |   46 +++++++++++++++++++++++++++++++
- 1 files changed, 46 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
-index 55bed92..9ac1aec 100644
---- a/drivers/net/wireless/hostap/hostap_cs.c
-+++ b/drivers/net/wireless/hostap/hostap_cs.c
-@@ -832,9 +832,11 @@ static int hostap_cs_resume(struct pcmci
- static struct pcmcia_device_id hostap_cs_ids[] = {
-       PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
-       PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
-+      PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0002),
-       PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
-       PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
-       PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
-+      PCMCIA_DEVICE_MANF_CARD(0x01ff, 0x0008),
-       PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
-       PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b),
-       PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
-@@ -844,7 +846,10 @@ static struct pcmcia_device_id hostap_cs
-       PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
-       PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
-       PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
-+      PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021),
-+      PCMCIA_DEVICE_MANF_CARD(0xc001, 0x0008),
-       PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
-+      PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002),
-       PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
-       PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
-       PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
-@@ -862,22 +867,63 @@ static struct pcmcia_device_id hostap_cs
-               "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
-               0xe6ec52ce, 0x08649af2, 0x4b74baa0),
-       PCMCIA_DEVICE_PROD_ID123(
-+              "Belkin", "11Mbps Wireless Notebook Network Adapter",
-+              "Version 01.02", 0x3805a391, 0xad4c7744, 0x4b74baa0),
-+      PCMCIA_DEVICE_PROD_ID123(
-               "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
-               0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
-       PCMCIA_DEVICE_PROD_ID123(
-               "Instant Wireless ", " Network PC CARD", "Version 01.02",
-               0x11d901af, 0x6e9bd926, 0x4b74baa0),
-       PCMCIA_DEVICE_PROD_ID123(
-+              "Intersil", "PRISM Freedom PCMCIA Adapter", "ISL37100P",
-+              0x4b801a17, 0xf222ec2d, 0x630d52b2),
-+      PCMCIA_DEVICE_PROD_ID123(
-+              "OEM", "PRISM2 IEEE 802.11 PC-Card", "Version 01.02",
-+              0xfea54c90, 0x48f2bdd6, 0x4b74baa0),
-+      PCMCIA_DEVICE_PROD_ID123(
-+              "Pretec", "CompactWLAN Card 802.11b", "2.5",
-+              0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
-+      PCMCIA_DEVICE_PROD_ID123(
-               "SMC", "SMC2632W", "Version 01.02",
-               0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
-+      PCMCIA_DEVICE_PROD_ID123(
-+              "The Linksys Group, Inc.", "Instant Wireless Network PC Card",
-+              "ISL37300P", 0xa5f472c2, 0x590eb502, 0xc9049a39),
-+      PCMCIA_DEVICE_PROD_ID123(
-+              "U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",
-+              0xc7b8df9d, 0x1700d087, 0x4b74baa0),
-+      PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11b_PC_CARD_25",
-+                              0x78fc06ee, 0xdb9aa842),
-+      PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11B_CF_CARD_25",
-+                              0x78fc06ee, 0x45a50c1e),
-       PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G", 
-                               0x2decece3, 0x82067c18),
-       PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
-                               0x54f7c49c, 0x15a75e5b),
-+      PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCC-11",
-+                              0x5261440f, 0xa6405584),
-+      PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCCA-11",
-+                              0x5261440f, 0xdf6115f9),
-+      PCMCIA_DEVICE_PROD_ID12("D", "Link DRC-650 11Mbps WLAN Card",
-+                              0x71b18589, 0xf144e3ac),
-+      PCMCIA_DEVICE_PROD_ID12("Digital Data Communications", "WPC-0100",
-+                              0xfdd73470, 0xe0b6f146),
-       PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE",
-                               0x74c5e40d, 0xdb472a18),
-+      PCMCIA_DEVICE_PROD_ID12("LeArtery",
-+                              "SYNCBYAIR 11Mbps Wireless LAN PC Card",
-+                              0x7e3b326a, 0x49893e92),
-       PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card",
-                               0x0733cc81, 0x0c52f395),
-+      PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401 Wireless PC", "Card",
-+                              0xa37434e9, 0x9762e8f1),
-+      PCMCIA_DEVICE_PROD_ID12("OTC", "Wireless AirEZY 2411-PCC WLAN Card",
-+                              0x4ac44287, 0x235a6bed),
-+      PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-CF110",
-+                              0x209f40ab, 0xd9715264),
-+      PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-NS110",
-+                              0x209f40ab, 0x46263178),
-       PCMCIA_DEVICE_PROD_ID12(
-               "ZoomAir 11Mbps High", "Rate wireless Networking",
-               0x273fe3db, 0x32a1eaee),
index 14d1ccf..28a78fa 100644 (file)
@@ -1,15 +1,19 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.17-hh0
-# Fri Sep 22 02:44:30 2006
+# Linux kernel version: 2.6.18-hh0
+# Sat Nov 18 21:26:56 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
 # Code maturity level options
@@ -27,16 +31,17 @@ CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
+# CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 # CONFIG_MINIMAL_OOPS is not set
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -51,10 +56,11 @@ CONFIG_SHMEM=y
 CONFIG_USELIB=y
 CONFIG_CORE_DUMP=y
 CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
-CONFIG_OBSOLETE_INTERMODULE=m
 
 #
 # Loadable module support
@@ -87,18 +93,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 #
 # System Type
 #
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
 # CONFIG_ARCH_IOP3XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
@@ -106,12 +120,6 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91RM9200 is not set
 
 #
 # Intel PXA2xx Implementations
@@ -123,9 +131,10 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_ESERIES is not set
 # CONFIG_MACH_A620 is not set
 # CONFIG_MACH_A716 is not set
+# CONFIG_MACH_A730 is not set
 # CONFIG_ARCH_H1900 is not set
 # CONFIG_ARCH_H2200 is not set
-# CONFIG_ARCH_H3900 is not set
+# CONFIG_MACH_H3900 is not set
 CONFIG_MACH_H4000=y
 CONFIG_IPAQ_H4000_SERIAL=m
 CONFIG_IPAQ_H4000_UDC=y
@@ -146,8 +155,9 @@ CONFIG_IPAQ_H4300_KBD=m
 # CONFIG_MACH_HTCAPACHE is not set
 # CONFIG_MACH_BLUEANGEL is not set
 # CONFIG_MACH_HTCBEETLES is not set
-# CONFIG_ARCH_AXIMX5 is not set
+# CONFIG_MACH_HW6900 is not set
 # CONFIG_ARCH_AXIMX3 is not set
+# CONFIG_ARCH_AXIMX5 is not set
 # CONFIG_MACH_X30 is not set
 # CONFIG_ARCH_ROVERP1 is not set
 # CONFIG_ARCH_ROVERP5P is not set
@@ -236,6 +246,7 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -303,6 +314,8 @@ CONFIG_NET=y
 CONFIG_PACKET=m
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -322,6 +335,8 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
 # CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_BIC=y
@@ -338,7 +353,10 @@ CONFIG_IPV6=m
 # CONFIG_INET6_IPCOMP is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
 # CONFIG_IPV6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
@@ -364,6 +382,7 @@ CONFIG_IP_NF_IRC=m
 # CONFIG_IP_NF_AMANDA is not set
 # CONFIG_IP_NF_PPTP is not set
 # CONFIG_IP_NF_H323 is not set
+# CONFIG_IP_NF_SIP is not set
 # CONFIG_IP_NF_QUEUE is not set
 
 #
@@ -400,7 +419,6 @@ CONFIG_LLC=m
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -492,6 +510,7 @@ CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -503,7 +522,7 @@ CONFIG_FW_LOADER=y
 #
 CONFIG_MTD=y
 CONFIG_MTD_DEBUG=y
-CONFIG_MTD_DEBUG_VERBOSE=3
+CONFIG_MTD_DEBUG_VERBOSE=1
 CONFIG_MTD_CONCAT=y
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -513,9 +532,8 @@ CONFIG_MTD_PARTITIONS=y
 #
 # User Modules And Translation Layers
 #
-# CONFIG_MTD_CHAR is not set
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
@@ -578,7 +596,17 @@ CONFIG_MTD_XIP=y
 #
 # NAND Flash Device Drivers
 #
-# CONFIG_MTD_NAND is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_H1900 is not set
+CONFIG_MTD_NAND_IDS=y
+CONFIG_MTD_NAND_DISKONCHIP=y
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+# CONFIG_MTD_NAND_SHARPSL is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
 
 #
 # OneNAND Flash Device Drivers
@@ -598,12 +626,13 @@ CONFIG_MTD_XIP=y
 # Block devices
 #
 # CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=6
 CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
@@ -721,6 +750,7 @@ CONFIG_NET_RADIO=y
 # CONFIG_HOSTAP is not set
 CONFIG_ACX=y
 CONFIG_ACX_MEM=y
+# CONFIG_ACX_H4000 is not set
 CONFIG_NET_WIRELESS=y
 
 #
@@ -763,7 +793,14 @@ CONFIG_INPUT_EVDEV=y
 #
 # Input Device Drivers
 #
-# CONFIG_INPUT_KEYBOARD is not set
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_GPIO_KEYS=y
+CONFIG_KEYBOARD_ASIC3=y
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
@@ -781,6 +818,7 @@ CONFIG_INPUT_EVDEV=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -819,6 +857,7 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_ELV is not set
 CONFIG_I2C_PXA=y
 # CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_PCA_ISA is not set
@@ -858,6 +897,7 @@ CONFIG_I2C_PXA=y
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 CONFIG_SA1100_RTC=y
 # CONFIG_DTLK is not set
@@ -901,13 +941,13 @@ CONFIG_SPI_MASTER=y
 #
 # Dallas's 1-wire bus
 #
-# CONFIG_W1 is not set
 
 #
 # Hardware Monitoring support
 #
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -923,6 +963,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
 # CONFIG_SENSORS_LM75 is not set
 # CONFIG_SENSORS_LM77 is not set
 # CONFIG_SENSORS_LM78 is not set
@@ -935,8 +976,10 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
 # CONFIG_SENSORS_W83792D is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
@@ -991,18 +1034,20 @@ CONFIG_VIDEO_V4L2=y
 #
 # Graphics support
 #
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MACMODES is not set
-CONFIG_FB_FIRMWARE_EDID=y
+# CONFIG_FB_BACKLIGHT is not set
 # CONFIG_FB_MODE_HELPERS is not set
 CONFIG_FB_TILEBLITTING=y
 # CONFIG_FB_IMAGEON is not set
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_PXA=y
 CONFIG_FB_PXA_PARAMETERS=y
+# CONFIG_FB_MBX is not set
 # CONFIG_FB_VIRTUAL is not set
 
 #
@@ -1070,15 +1115,9 @@ CONFIG_SND_DEBUG_DETECT=y
 #
 # ALSA ARM devices
 #
-# CONFIG_SND_A716 is not set
-# CONFIG_SND_H1910 is not set
-# CONFIG_SND_H2200 is not set
-CONFIG_SND_H4000=m
-# CONFIG_SND_HTCMAGICIAN is not set
-# CONFIG_SND_HX4700 is not set
-# CONFIG_SND_HTCUNIVERSAL is not set
-# CONFIG_SND_H5XXX_AK4535 is not set
-CONFIG_SND_PXA2xx_I2SOUND=m
+CONFIG_SND_H4000=y
+# CONFIG_SND_HTCSABLE is not set
+CONFIG_SND_PXA2xx_I2SOUND=y
 # CONFIG_SND_PXA2XX_AC97 is not set
 
 #
@@ -1086,7 +1125,7 @@ CONFIG_SND_PXA2xx_I2SOUND=m
 #
 # CONFIG_SND_VXPOCKET is not set
 # CONFIG_SND_PDAUDIOCF is not set
-CONFIG_SND_UDA1380=m
+CONFIG_SND_UDA1380=y
 
 #
 # Open Sound System
@@ -1163,6 +1202,7 @@ CONFIG_EXT2_FS=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
@@ -1210,6 +1250,7 @@ CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=1
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 # CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
@@ -1305,14 +1346,19 @@ CONFIG_NLS_UTF8=y
 #
 # CONFIG_PRINTK_TIME is not set
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=15
 CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
-CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_RWSEMS is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_INFO is not set
@@ -1375,3 +1421,6 @@ CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_REED_SOLOMON=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_PLIST=y
diff --git a/packages/linux/linux-handhelds-2.6/hrw-pcmcia-ids-r2.patch b/packages/linux/linux-handhelds-2.6/hrw-pcmcia-ids-r2.patch
deleted file mode 100644 (file)
index 3d5d197..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-
-The ident for Seagate 8GB microdrive is
-"SEAGATE", "ST1"
-hash 0x76dc4190, 0xcfba9599
-manfid 0x0111, 0x0000
-
-Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
-
- drivers/ide/legacy/ide-cs.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c
-===================================================================
---- linux-2.6.16.orig/drivers/ide/legacy/ide-cs.c      2006-04-20 12:41:41.000000000 +0200
-+++ linux-2.6.16/drivers/ide/legacy/ide-cs.c   2006-04-20 12:45:19.640621552 +0200
-@@ -444,6 +444,7 @@
-       PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591),
-       PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
-       PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),
-+      PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883),      /* Seagate 8GB microdrive */
-       PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
-       PCMCIA_DEVICE_PROD_ID1("TRANSCEND    512M   ", 0xd0909443),
-       PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
-
-
--------------------------------------------------------------------------
-With pcmcia-cs -> pcmciautils change some cards which was working with
-hostap driver now are bound into orinoco driver.
-
-This patch made them bound into hostap like it was before.
-
-Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
-
-// will add some here
-
index 107b014..e921643 100644 (file)
@@ -10,8 +10,6 @@ K_MICRO = "18"
 HHV     = "0"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
-           file://24-hostap_cs_id.diff;patch=1;maxdate=20061104 \
-           file://hrw-pcmcia-ids-r2.patch;patch=1;maxdate=20061104 \
            file://defconfig"
 
 require linux-handhelds-2.6.inc
diff --git a/packages/plinciv/plinciv-0.16/FC1.14.1-PC0.16.diff.gz b/packages/plinciv/plinciv-0.16/FC1.14.1-PC0.16.diff.gz
new file mode 100644 (file)
index 0000000..70fa33c
Binary files /dev/null and b/packages/plinciv/plinciv-0.16/FC1.14.1-PC0.16.diff.gz differ
index 073515f..6afaf40 100644 (file)
@@ -2,9 +2,10 @@ LICENSE = "GPL"
 SECTION = "x11/games"
 DEPENDS = "gtk+"
 DESCRIPTION = "Embedded version of a popular FreeCiv game"
+HOMEPAGE = "http://www.handhelds.org/moin/moin.cgi/PlinCiv"
 
 SRC_URI = "ftp://ftp.freeciv.org/freeciv/stable/freeciv-1.14.1.tar.bz2 \
-       http://gregorr.homelinux.org/plinciv/FC1.14.1-PC0.16.diff.gz;patch=1 \
+       file://FC1.14.1-PC0.16.diff.gz;patch=1 \
        file://configure.patch;patch=1"
 
 inherit autotools
index c6719d4..5603b9a 100644 (file)
@@ -23,11 +23,6 @@ loaddiskmods(){
 
 loadnetmods(){
        modprobe af_packet
-       case "$(machine)" in
-           ixdp425|nslu2|nas100d)
-               modprobe ixp4xx_mac
-               ;;                     
-       esac
 }
 
 loadmiscmods(){
index efd396e..99996c4 100644 (file)
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r71"
+PR = "r72"
 
 SRC_URI = "file://boot/flash \
           file://boot/disk \
diff --git a/packages/tinymail/files/iconv-detect.h b/packages/tinymail/files/iconv-detect.h
new file mode 100644 (file)
index 0000000..46f476d
--- /dev/null
@@ -0,0 +1,5 @@
+/* This is an auto-generated header, DO NOT EDIT! */
+
+#define ICONV_ISO_D_FORMAT "iso-%d-%d"
+#define ICONV_ISO_S_FORMAT "iso-%d-%s"
+#define ICONV_10646 "iso-10646"
diff --git a/packages/tinymail/files/no-iconv-detect.patch b/packages/tinymail/files/no-iconv-detect.patch
new file mode 100644 (file)
index 0000000..558cbb2
--- /dev/null
@@ -0,0 +1,78 @@
+--- /tmp/ticonv.m4     2006-11-19 12:01:18.000000000 +0100
++++ trunk/m4/ticonv.m4 2006-11-19 12:14:50.378554000 +0100
+@@ -14,12 +14,7 @@
+ save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $ICONV_CFLAGS"
+ LIBS="$LIBS $ICONV_LIBS -liconv"
+-AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+-#include <iconv.h>
+-]], [[
+-      iconv_t cd;
+-      cd = iconv_open ("UTF-8", "ISO-8859-1");
+-]])],[ac_cv_libiconv=yes],[ac_cv_libiconv=no]))
++
+ if test $ac_cv_libiconv = yes; then
+       ICONV_LIBS="$ICONV_LIBS -liconv"
+       have_iconv=yes
+@@ -33,39 +28,6 @@
+       if test $ac_cv_libiconv = no; then
+               AC_CHECK_FUNCS(gnu_get_libc_version)
+       fi
+-      AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-#include <iconv.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#ifdef HAVE_GNU_GET_LIBC_VERSION
+-#include <gnu/libc-version.h>
+-#endif
+-
+-int main (int argc, char **argv)
+-{
+-      const char *from = "Some Text \xA4";
+-      const char *utf8 = "Some Text \xC2\xA4";
+-      char *transbuf = malloc (20), *trans = transbuf;
+-      iconv_t cd;
+-      size_t from_len = strlen (from), utf8_len = 20;
+-      size_t utf8_real_len = strlen (utf8);
+-
+-#ifdef HAVE_GNU_GET_LIBC_VERSION
+-      /* glibc 2.1.2's iconv is broken in hard to test ways. */
+-      if (!strcmp (gnu_get_libc_version (), "2.1.2"))
+-              exit (1);
+-#endif
+-
+-      cd = iconv_open ("UTF-8", "ISO-8859-1");
+-      if (cd == (iconv_t) -1)
+-              exit (1);
+-      if (iconv (cd, &from, &from_len, &trans, &utf8_len) == -1 || from_len != 0)
+-              exit (1);
+-      if (memcmp (utf8, transbuf, utf8_real_len) != 0)
+-              exit (1);
+-
+-      exit (0);
+-}]])],[ac_cv_libiconv_utf8=yes],[ac_cv_libiconv_utf8=no; have_iconv=no],[ac_cv_libiconv_utf8=no; have_iconv=no]))
+ fi
+ if test "$have_iconv" = no; then
+@@ -73,20 +35,5 @@
+ fi
+ AC_SUBST(ICONV_CFLAGS)
+ AC_SUBST(ICONV_LIBS)
+-
+-CFLAGS="$CFLAGS -I$srcdir"
+-
+-AC_MSG_CHECKING(preferred charset formats for system iconv)
+-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-#define CONFIGURE_IN
+-#include "iconv-detect.c"
+-]])],[
+-      AC_MSG_RESULT(found)
+-],[
+-      AC_MSG_RESULT(not found)
+-],[])
+-
+-CFLAGS="$save_CFLAGS"
+-LIBS="$save_LIBS"
+-
+ ])
++
index cc88948..416aa0f 100644 (file)
@@ -1,16 +1,17 @@
 SECTION = "x11/utils"
-DEPENDS = "gtk+ glib-2.0 gnome-vfs-dbus libgnomeui eds-dbus libiconv"
+DEPENDS = "gtk+ glib-2.0 gnome-vfs-dbus gconf-dbus libgnomeui eds-dbus"
 DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile devices"
 LICENSE = "GPL"
 
 PV = "0.0+svn${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none"
 
-#camel-lite-configure-hack.patch is still needed after the maxdate, but needs fixing
 SRC_URI = "svn://svn.tinymail.org/svn/tinymail/;module=trunk;proto=http \
           file://camel-lite-configure-hack.patch;patch=1;maxdate=20061113 \
+          file://no-iconv-detect.patch;patch=1;mindate=20061114 \
+          file://iconv-detect.h \      
           file://gtk-doc.m4 \
            file://gtk-doc.make"
 
@@ -21,6 +22,8 @@ do_configure_prepend() {
         mkdir -p m4
         install ${WORKDIR}/gtk-doc.m4 ./m4/
         install ${WORKDIR}/gtk-doc.make ./
+
+       cp ${WORKDIR}/iconv-detect.h ${S}/libtinymail-camel/camel-lite/
 }
 
 
@@ -50,7 +53,4 @@ FILES_tinymail-camel-lite-dev +=  "${libdir}/libcamel-lite*.so \
                                   ${libdir}/camel-lite-1.2/camel-providers/*.a "                             
 FILES_tinymail-camel-lite-dbg +=  "${libdir}/camel-lite-1.2/camel-providers/.debug"
 
-PARALLEL_MAKE = ""
-LDFLAGS += "-liconv"
-
 
index 60dfe95..b50f1de 100644 (file)
@@ -10,11 +10,6 @@ Reason:         description why it will get removed
 
 -----------------------------------------------------------------------------
 
-Package Name:   plinciv
-Removal Date:   2006-11-20
-Maintainer:     none
-Reason:         Unfetchable version from 2003 year.
-
 Package Name:   Maemo
 Removal Date:   2006-12-12
 Maintainer:     none