merge of '3fc90cd6e5ca8fdb9040cd52f97c35c106987f7b'

     and 'dd6e61bbe142013de981e7c21ec321925aa41d52'

32 files changed, 2121 insertions, 178 deletions

diff --git a/packages/classpath/classpath-minimal_0.95.bb b/packages/classpath/classpath-minimal_0.95.bb
index 3a4756094f..bca7a46919 100644
--- a/packages/classpath/classpath-minimal_0.95.bb
+++ b/packages/classpath/classpath-minimal_0.95.bb
@@ -5,6 +5,7 @@ PRIORITY = "optional"
 LICENSE = "Classpath"
 PROVIDES = "classpath"
 RPROVIDES = "classpath"
+PR = "r1"
 
 S = "${WORKDIR}/classpath-${PV}"
 
diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb
index 52d7d86473..c932d21bdc 100644
--- a/packages/fbreader/fbreader_0.8.2a.bb
+++ b/packages/fbreader/fbreader_0.8.2a.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL2"
 HOMEPAGE = "http://only.mawhrin.net/fbreader/"
 SECTION = "x11/utils"
 PRIORITY = "optional"
-DEPENDS = "gtk+ enca expat bzip2 libgpewidget"
+DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv"
 PR = "r5"
 
 # The RESOLUTION is defined at compile time which makes
diff --git a/packages/gaim/pidgin.inc b/packages/gaim/pidgin.inc
index bb2daf2314..4184848daa 100644
--- a/packages/gaim/pidgin.inc
+++ b/packages/gaim/pidgin.inc
@@ -2,7 +2,7 @@ SECTION = "x11/network"
 DESCRIPTION = "multi-protocol instant messaging client"
 LICENSE = "GPL"
 
-DEPENDS = "gtk+ ncurses gnutls virtual/libintl gstreamer dbus"
+DEPENDS = "avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus"
 RRECOMMENDS_${PN} = "libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp"
 
 EXTRA_OECONF = " \
diff --git a/packages/gaim/pidgin_2.1.0.bb b/packages/gaim/pidgin_2.1.1.bb
index c01db89c04..5531880669 100644
--- a/packages/gaim/pidgin_2.1.0.bb
+++ b/packages/gaim/pidgin_2.1.1.bb
@@ -7,4 +7,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
 	   file://purple-OE-branding.patch;patch=1 \
 	  " 
 
-PR = "r1"
+PR = "r0"
diff --git a/packages/gpe-bootsplash/files/angstrom/splash-p.svg b/packages/gpe-bootsplash/files/angstrom/splash-p.svg
index 45383e2072..4a86e4d5f8 100644
--- a/packages/gpe-bootsplash/files/angstrom/splash-p.svg
+++ b/packages/gpe-bootsplash/files/angstrom/splash-p.svg
@@ -13,13 +13,15 @@
    height="1052.3622"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43+0.44pre4"
+   inkscape:version="0.45"
    version="1.0"
-   sodipodi:docbase="j:\"
-   sodipodi:docname="foo.svg"
+   sodipodi:docbase="/tmp"
+   sodipodi:docname="splash-p.svg"
    inkscape:export-filename="/Users/koen/Projects/Ångström/angstrom-background.png"
    inkscape:export-xdpi="55.049999"
-   inkscape:export-ydpi="55.049999">
+   inkscape:export-ydpi="55.049999"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
   <defs
      id="defs4">
     <linearGradient
@@ -167,8 +169,8 @@
      inkscape:current-layer="layer1"
      inkscape:window-width="1280"
      inkscape:window-height="968"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4" />
+     inkscape:window-x="1600"
+     inkscape:window-y="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -258,9 +260,16 @@
          id="path621"
          sodipodi:nodetypes="cssssss" />
     </g>
-    <path
-       style="font-size:24px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       d="M 245.74955,585.39436 L 245.74955,563.04013 L 229.53613,563.04013 L 229.53613,553.78626 L 255.57587,553.78626 L 255.57587,589.5196 C 251.74354,592.60423 247.51823,594.94559 242.89991,596.54362 C 238.28153,598.10453 233.35199,598.88497 228.11133,598.88497 C 216.64728,598.88497 207.67256,595.09426 201.18722,587.51275 C 194.7346,579.89412 191.50831,569.30236 191.50831,555.73741 C 191.50831,542.13535 194.7346,531.54357 201.18722,523.96205 C 207.67256,516.34345 216.64728,512.53413 228.11133,512.53409 C 232.89341,512.53413 237.42988,513.2031 241.72077,514.54092 C 246.04429,515.87893 250.02392,517.84862 253.65974,520.45003 L 253.65974,532.43548 C 249.99117,528.90496 246.09344,526.24769 241.96641,524.46377 C 237.83933,522.67994 233.49936,521.788 228.94657,521.78795 C 219.97182,521.788 213.22443,524.63108 208.70434,530.31713 C 204.21697,536.00327 201.97331,544.47669 201.97331,555.73741 C 201.97331,566.96099 204.21697,575.41583 208.70434,581.10192 C 213.22443,586.78803 219.97182,589.63111 228.94657,589.63111 C 232.45124,589.63111 235.57928,589.29665 238.3307,588.62766 C 241.08198,587.92154 243.55497,586.84379 245.74955,585.39436 M 283.67911,523.2931 L 283.67911,554.5667 L 296.15855,554.5667 C 300.77687,554.56674 304.34708,553.21029 306.86922,550.49727 C 309.39128,547.7843 310.65233,543.91922 310.65237,538.90206 C 310.65233,533.92208 309.39128,530.0756 306.86922,527.36255 C 304.34708,524.64967 300.77687,523.29317 296.15855,523.2931 L 283.67911,523.2931 M 273.75456,514.0392 L 296.15855,514.0392 C 304.37982,514.0393 310.5868,516.15765 314.77941,520.39429 C 319.00466,524.59392 321.11732,530.76314 321.11738,538.90206 C 321.11732,547.11537 319.00466,553.32174 314.77941,557.52129 C 310.5868,561.72088 304.37982,563.8206 296.15855,563.8206 L 283.67911,563.8206 L 283.67911,597.26835 L 273.75456,597.26835 L 273.75456,514.0392 M 334.48116,514.0392 L 380.86136,514.0392 L 380.86136,523.51607 L 344.40574,523.51607 L 344.40574,548.15592 L 379.33828,548.15592 L 379.33828,557.6328 L 344.40574,557.6328 L 344.40574,587.79148 L 381.74574,587.79148 L 381.74574,597.26835 L 334.48116,597.26835 L 334.48116,514.0392 M 439.62269,587.79148 L 474.26044,587.79148 L 474.26044,597.26835 L 427.68376,597.26835 L 427.68376,587.79148 C 431.45047,583.36893 436.57654,577.44127 443.06193,570.00844 C 449.58002,562.53845 453.6743,557.72568 455.34478,555.57013 C 458.52195,551.5193 460.73286,548.10022 461.97759,545.31284 C 463.25492,542.48842 463.89366,539.71969 463.89371,537.00668 C 463.89366,532.58416 462.51797,528.97927 459.76663,526.19189 C 457.04802,523.40465 453.49414,522.01099 449.10509,522.01091 C 445.99341,522.01099 442.70157,522.62423 439.22963,523.85054 C 435.79044,525.07703 432.10555,526.93521 428.17507,529.42518 L 428.17507,518.05293 C 432.17107,516.23201 435.90505,514.85693 439.37705,513.92775 C 442.84898,512.99869 446.02614,512.53413 448.90857,512.53409 C 456.50756,512.53413 462.56709,514.68968 467.08726,519.00062 C 471.60732,523.31175 473.86735,529.07217 473.8674,536.28195 C 473.86735,539.70114 473.29415,542.95298 472.14783,546.03756 C 471.03411,549.08504 468.98695,552.68997 466.00634,556.8523 C 465.18746,557.9301 462.5835,561.05189 458.19443,566.21767 C 453.80533,571.34634 447.61475,578.53761 439.62269,587.79148 M 495.14137,583.10876 L 505.50815,583.10876 L 505.50815,597.26835 L 495.14137,597.26835 L 495.14137,583.10876 M 524.66944,514.0392 L 571.83575,514.0392 L 571.83575,518.83342 L 545.20645,597.26835 L 534.83968,597.26835 L 559.89676,523.51607 L 524.66944,523.51607 L 524.66944,514.0392"
-       id="text1326" />
+    <text
+       xml:space="preserve"
+       style="font-size:96px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="192.20483"
+       y="568.35547"
+       id="text2200"
+       sodipodi:linespacing="100%"><tspan
+         sodipodi:role="line"
+         id="tspan2202"
+         x="192.20483"
+         y="568.35547">GPE 2.8</tspan></text>
   </g>
 </svg>
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
index 8c4428cfc2..c947587207 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+ libsvg-cairo"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r8"
+PR = "r9"
 
 SRC_URI += "file://splash-p.svg \
 	    file://splash-l.svg \
diff --git a/packages/gpephone/libsettings_0.3.bb b/packages/gpephone/libsettings_0.3.bb
index c429bb2481..22f8c4f3e0 100644
--- a/packages/gpephone/libsettings_0.3.bb
+++ b/packages/gpephone/libsettings_0.3.bb
@@ -6,8 +6,6 @@ DEPENDS = "glib-2.0 gconf-dbus"
 
 inherit gpephone pkgconfig autotools
 
-SRC_URI = "${GPEPHONE_MIRROR}/${PN}/${P}.tar.gz"
-
 FILES_${PN} += " ${libdir}/*.so.*"
 FILES_${PN}-dbg += "${libdir}/.debug/*.so.*"
 FILES_${PN}-dev += "${includedir} ${libdir}/*.la ${libdir}/*.so"
diff --git a/packages/gsm/files/default b/packages/gsm/files/default
index 161c97f5fb..43f4a2db0d 100644
--- a/packages/gsm/files/default
+++ b/packages/gsm/files/default
@@ -1,9 +1,44 @@
 # gsmd	This shell script configures for the gsmd init script.
 
-# If you must specify special options, uncomment and modify the next line
-#GSMD_OPTS="-s 115200 -F"
+. /etc/init.d/functions
 
-# If your GSM device needs to be powered up, uncomment and modify the next line
-#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
+case `cpuinfo_id` in
+	"GTA01", "GTA02")
+		GSMD_OPTS="-s 115200 -F"
+		GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
+		GSM_DEV="/dev/ttySAC0"
+		;;
+	"HTC Apache", "HTC Blueangel")
+		GSMD_OPTS="-s 115200 -F"
+		GSM_DEV="/dev/ttyS0"
+		;;
+	"HTC Himalaya")
+		GSMD_OPTS="-s 115200 -F"
+		GSM_DEV="/dev/ttyS2"
+		;;
+	"HTC Magician")
+		GSMD_OPTS="-s 115200 -F"
+		GSM_DEV="/dev/ttyS1"
+		;;
+        "HTC Universal")
+		GSMD_OPTS="-s 115200 -F -w 1"
+		GSM_DEV="/dev/ttyS0"
+		;;
+	"Palm Treo 650")
+		GSMD_OPTS="-s 460800 -F -w 1"
+		GSM_DEV="/dev/ttyS0"
+		;;
+	*)
+		# Unknown board
 
-#GSM_DEV="/dev/ttyS1"
+		# If you must specify special options, uncomment and modify the next line
+		#GSMD_OPTS="-s 115200 -F"
+
+		# If your GSM device needs to be powered up, uncomment and modify the next line
+		#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
+
+		# This should be in a common /etc/default/serial, together with
+		# BT_DEV and IR_DEV for devices that have those on a serial port
+		#GSM_DEV="/dev/ttyS1"
+		;;
+esac
diff --git a/packages/gsm/files/fic-gta01/default b/packages/gsm/files/fic-gta01/default
deleted file mode 100644
index 1511376a6c..0000000000
--- a/packages/gsm/files/fic-gta01/default
+++ /dev/null
@@ -1,9 +0,0 @@
-# gsmd	This shell script configures for the gsmd init script.
-
-# If you must specify special options, uncomment and modify the next line
-GSMD_OPTS="-s 115200 -F"
-
-# If your GSM device needs to be powered up, uncomment and modify the next line
-GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
-
-GSM_DEV="/dev/ttySAC0"
diff --git a/packages/gsm/files/fix-mlbuf.patch b/packages/gsm/files/fix-mlbuf.patch
deleted file mode 100644
index ed4aa2519d..0000000000
--- a/packages/gsm/files/fix-mlbuf.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: gsm/src/gsmd/atcmd.c
-===================================================================
---- gsm/src/gsmd/atcmd.c	(revision 2745)
-+++ gsm/src/gsmd/atcmd.c	(working copy)
-@@ -370,8 +370,8 @@
- 	if (g->mlbuf_len)
- 		g->mlbuf[g->mlbuf_len ++] = '\n';
- 	DEBUGP("Appending buf to mlbuf\n");
--	if (len > sizeof(g->mlbuf) - g->mlbuf_len)
--		len = sizeof(g->mlbuf) - g->mlbuf_len;
-+	if (len > MLPARSE_BUF_SIZE - g->mlbuf_len)
-+		len = MLPARSE_BUF_SIZE - g->mlbuf_len;
- 	memcpy(g->mlbuf + g->mlbuf_len, buf, len);
- 	g->mlbuf_len += len;
- 
-@@ -470,7 +470,7 @@
- 			if (cr)
- 				len = cr - pos->cur;
- 			else
--				len = pos->buflen;
-+				len = pos->buflen - 1;  /* assuming zero-terminated strings */
- 			rc = write(fd, pos->cur, len);
- 			if (rc == 0) {
- 				gsmd_log(GSMD_ERROR, "write returns 0, aborting\n");
-@@ -480,8 +480,8 @@
- 					fd, rc);
- 				return rc;
- 			}
--			if (cr && rc == len)
--				rc ++;	/* Skip the \n */
-+			if (!cr || rc == len)
-+				rc ++;	/* Skip the \n or \0 */
- 			pos->buflen -= rc;
- 			pos->cur += rc;
- 			write(fd, "\r", 1);
-Index: gsm/src/gsmd/gsmd.c
-===================================================================
---- gsm/src/gsmd/gsmd.c	(revision 2745)
-+++ gsm/src/gsmd/gsmd.c	(working copy)
-@@ -301,6 +301,10 @@
- {
- 	INIT_LLIST_HEAD(&g->users);
- 
-+	g->mlbuf = talloc_array(gsmd_tallocs, unsigned char, MLPARSE_BUF_SIZE);
-+	if (!g->mlbuf)
-+		return -ENOMEM;
-+
- 	return 0;
- }
- 
diff --git a/packages/gsm/files/htcuniversal/.mtn2git_empty b/packages/gsm/files/htcuniversal/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gsm/files/htcuniversal/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gsm/files/htcuniversal/default b/packages/gsm/files/htcuniversal/default
deleted file mode 100644
index b09d433d1e..0000000000
--- a/packages/gsm/files/htcuniversal/default
+++ /dev/null
@@ -1,10 +0,0 @@
-# gsmd	This shell script configures for the gsmd init script.
-
-GSMD_OPTS="-s 115200 -F -w 1"
-
-# If your GSM device needs to be powered up, uncomment and modify the next line
-#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
-
-# this should be in a common /etc/default/serial, together
-# with BT_DEV, and IR_DEV
-GSM_DEV="/dev/ttyS0"
diff --git a/packages/gsm/files/magician/.mtn2git_empty b/packages/gsm/files/magician/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gsm/files/magician/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gsm/files/magician/default b/packages/gsm/files/magician/default
deleted file mode 100644
index 523d0b9479..0000000000
--- a/packages/gsm/files/magician/default
+++ /dev/null
@@ -1,10 +0,0 @@
-# gsmd	This shell script configures for the gsmd init script.
-
-GSMD_OPTS="-s 115200 -F"
-
-# If your GSM device needs to be powered up, uncomment and modify the next line
-#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
-
-# this should be in a common /etc/default/serial, together
-# with BT_DEV, and IR_DEV
-GSM_DEV="/dev/ttyS1"
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index a814f3fb72..b815a227b6 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -4,12 +4,9 @@ LICENSE = "GPL LGPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.1+svn${SRCDATE}"
-PR = "r19"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+PR = "r20"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
-           file://fix-mlbuf.patch;patch=1 \
            file://gsmd \
            file://default"
 S = "${WORKDIR}/gsm"
@@ -32,15 +29,24 @@ do_install_append() {
 
 PACKAGES =+ "${PN}-tools gsmd gsmd-plugins \
              gsmd-plugin-machine-generic gsmd-plugin-machine-tihtc \
-             gsmd-plugin-vendor-qc gsmd-plugin-vendor-ti \
-             gsmd-plugin-vendor-tihtc"
+             gsmd-plugin-vendor-bcm \
+             gsmd-plugin-vendor-qc \
+             gsmd-plugin-vendor-ti \
+             gsmd-plugin-vendor-tihtc \
+             "
+
 RDEPENDS_${PN} = "gsmd"
 RDEPENDS_gsmd-plugins = "gsmd-plugin-machine-generic \
                          gsmd-plugin-machine-tihtc \
+                         gsmd-plugin-vendor-bcm \
                          gsmd-plugin-vendor-qc \
                          gsmd-plugin-vendor-ti \
-                         gsmd-plugin-vendor-tihtc"
+                         gsmd-plugin-vendor-tihtc \
+                         "
+
+RDEPENDS_gsmd = "initscripts"
 RRECOMMENDS_gsmd = "gsmd-plugins"
+FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*"
 FILES_${PN}-tools = "${bindir}/*"
 FILES_gsmd = "${sbindir}/gsmd ${sysconfdir}"
 FILES_gsmd-plugins = ""
diff --git a/packages/gstreamer/gst-common.inc b/packages/gstreamer/gst-common.inc
index 31629d7572..04f3f309fa 100644
--- a/packages/gstreamer/gst-common.inc
+++ b/packages/gstreamer/gst-common.inc
@@ -7,6 +7,9 @@ DEFAULT_PREFERENCE = "-1"
 
 inherit autotools pkgconfig
 
+OE_LT_RPATH_ALLOW = "any"
+OE_LT_RPATH_ALLOW[export]="1"
+
 do_stage() {
     rm -rf ${STAGE_TEMP}
     mkdir -p ${STAGE_TEMP}
diff --git a/packages/gstreamer/gst-plugins-bad_0.10.5.bb b/packages/gstreamer/gst-plugins-bad_0.10.5.bb
index 4bd76f871c..a6a7d19a3d 100644
--- a/packages/gstreamer/gst-plugins-bad_0.10.5.bb
+++ b/packages/gstreamer/gst-plugins-bad_0.10.5.bb
@@ -1,11 +1,11 @@
 require gst-plugins.inc
 
 SRC_URI += "file://vorbisenc.h file://vorbisdec.h"
-DEPENDS += "gst-plugins-base"
+DEPENDS += "gst-plugins-base directfb"
 
 do_compile_prepend() {
 	# work around missing files in upstream tarball (upstream bug #454078)
 	install -m 0644 ${WORKDIR}/vorbis*.h ${S}/ext/ivorbis/
 }
 
-PR = "r0"
+PR = "r1"
diff --git a/packages/gstreamer/gst-plugins.inc b/packages/gstreamer/gst-plugins.inc
index 2acf1997c8..37ba2e6698 100644
--- a/packages/gstreamer/gst-plugins.inc
+++ b/packages/gstreamer/gst-plugins.inc
@@ -10,6 +10,9 @@ EXTRA_OECONF = "--disable-aalib --disable-shout2 --disable-sdl"
 
 acpaths = "-I ${S}/common/m4 -I ${S}/m4"
 
+OE_LT_RPATH_ALLOW = "any"
+OE_LT_RPATH_ALLOW[export]="1"
+
 LIBV = "0.10"
 
 python populate_packages_prepend () {
diff --git a/packages/gtk-webcore/midori_0.0.5.bb b/packages/gtk-webcore/midori_0.0.5.bb
new file mode 100644
index 0000000000..4f39f7bab3
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.5.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz"
+
+
+
diff --git a/packages/librsvg/librsvg_2.11.1.bb b/packages/librsvg/librsvg_2.11.1.bb
new file mode 100644
index 0000000000..f2123ea24f
--- /dev/null
+++ b/packages/librsvg/librsvg_2.11.1.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Library for rendering SVG files"
+SECTION = "x11/utils"
+DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt"
+LICENSE = "LGPL"
+
+PR = "r2"
+
+inherit autotools pkgconfig gnome
+
+EXTRA_OECONF = "--disable-mozilla-plugin"
+
+
+PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_rsvg = "${bindir}/rsvg \
+	      ${bindir}/rsvg-view \
+	      ${bindir}/rsvg-convert \
+	      ${datadir}/pixmaps/svg-viewer.svg"
+FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
+FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.la \
+			  ${libdir}/gtk-2.0/*/*.la \
+			  ${libdir}/gtk-2.0/*/*/*.la \
+			  "
+FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
+                          ${libdir}/gtk-2.0/*/*/.debug"
+
+pkg_postinst_librsvg-gtk() {
+if [ "x$D" != "x" ]; then
+        exit 1
+fi
+        gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+}
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01 b/packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01
new file mode 100644
index 0000000000..f30d145355
--- /dev/null
+++ b/packages/linux/linux-gta01/defconfig-2.6.21.6-fic-gta01
@@ -0,0 +1,1861 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.21.3
+# Mon Jun 11 18:32:32 2007
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_GENERIC_TIME is not set
+CONFIG_MMU=y
+CONFIG_NO_IOPORT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION="-moko11"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=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
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=m
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=m
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+
+#
+# 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_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IOP13XX 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_NS9XXX is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+CONFIG_ARCH_S3C2410=y
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+CONFIG_PLAT_S3C24XX=y
+CONFIG_CPU_S3C244X=y
+# CONFIG_S3C2410_BOOT_WATCHDOG is not set
+CONFIG_S3C2410_BOOT_ERROR_RESET=y
+CONFIG_S3C2410_PM_DEBUG=y
+# CONFIG_S3C2410_PM_CHECK is not set
+CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
+CONFIG_S3C2410_DMA=y
+# CONFIG_S3C2410_DMA_DEBUG is not set
+CONFIG_MACH_SMDK=y
+
+#
+# S3C2400 Machines
+#
+CONFIG_CPU_S3C2410=y
+CONFIG_CPU_S3C2410_DMA=y
+CONFIG_S3C2410_PM=y
+CONFIG_S3C2410_GPIO=y
+CONFIG_S3C2410_CLOCK=y
+
+#
+# S3C2410 Machines
+#
+# CONFIG_ARCH_SMDK2410 is not set
+# CONFIG_ARCH_H1940 is not set
+# CONFIG_MACH_N30 is not set
+# CONFIG_ARCH_BAST is not set
+# CONFIG_MACH_OTOM is not set
+# CONFIG_MACH_AML_M5900 is not set
+# CONFIG_MACH_VR1000 is not set
+CONFIG_MACH_QT2410=y
+CONFIG_MACH_NEO1973_GTA01=y
+
+#
+# S3C2412 Machines
+#
+# CONFIG_MACH_SMDK2413 is not set
+# CONFIG_MACH_VSTMS is not set
+CONFIG_CPU_S3C2440=y
+CONFIG_S3C2440_DMA=y
+
+#
+# S3C2440 Machines
+#
+# CONFIG_MACH_ANUBIS is not set
+# CONFIG_MACH_OSIRIS is not set
+# CONFIG_MACH_RX3715 is not set
+CONFIG_ARCH_S3C2440=y
+# CONFIG_MACH_NEXCODER_2440 is not set
+CONFIG_SMDK2440_CPU2440=y
+CONFIG_MACH_HXD8=y
+CONFIG_MACH_NEO1973_GTA02=y
+
+#
+# S3C2442 Machines
+#
+# CONFIG_SMDK2440_CPU2442 is not set
+
+#
+# S3C2443 Machines
+#
+# CONFIG_MACH_SMDK2443 is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM920T=y
+CONFIG_CPU_32v4T=y
+CONFIG_CPU_ABRT_EV4T=y
+CONFIG_CPU_CACHE_V4WT=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_PREEMPT=y
+CONFIG_NO_IDLE_HZ=y
+CONFIG_HZ=200
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+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_ZONE_DMA_FLAG=1
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttySAC0,115200n8  ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0: