feed browser: add screenshot support, update angstrom sample config

2 files changed, 765 insertions, 120 deletions

diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc
index 195363df3c..fd7f126477 100644
--- a/contrib/feed-browser/includes/config.inc
+++ b/contrib/feed-browser/includes/config.inc
@@ -1,6 +1,7 @@
 <?php
 
 define('DB_FILENAME', '/home/angstrom/website/repo/feeds.db');
+define('FB_BASE_DIR', '/home/angstrom/website/repo/');
 $feed_base_url = "http://www.angstrom-distribution.org/unstable/feed/";
 
 $feeds = array(
@@ -74,10 +75,6 @@ $feeds = array(
 						'name'=>'armv5te python',
 						'url'=>'armv5te/python',
 				     ),
-				array(  
-						'name'=>'armv5te debug',
-						'url'=>'armv5te/debug',
-				     ),
 				array(
 						'name'=>'armv5te gstreamer',
 						'url'=>'armv5te/gstreamer',
@@ -91,10 +88,6 @@ $feeds = array(
 						'url'=>'avr32/python',
 				     ),
 				array(
-						'name'=>'avr32 debug',
-						'url'=>'avr32/debug',
-				     ),
-				array(
 						'name'=>'avr32 gstreamer',
 						'url'=>'avr32/gstreamer',
 				     ),
@@ -108,10 +101,6 @@ $feeds = array(
 						'url'=>'blackfin/python',
 				     ),
 				array(
-						'name'=>'blackfin debug',
-						'url'=>'blackfin/debug',
-				     ),
-				array(
 						'name'=>'blackfin gstreamer',
 						'url'=>'blackfin/gstreamer',
 				     ),
@@ -123,10 +112,6 @@ $feeds = array(
 						'name'=>'armv4t python',
 						'url'=>'armv4t/python',
 				     ),
-				array(  
-						'name'=>'armv4t debug',
-						'url'=>'armv4t/debug',
-				     ),
 				array(
 						'name'=>'armv4t gstreamer',
 						'url'=>'armv4t/gstreamer',
@@ -141,10 +126,6 @@ $feeds = array(
 						'url'=>'armv6/python',
 				     ),
 				array(
-						'name'=>'armv6 debug',
-						'url'=>'armv6/debug',
-				     ),
-				array(
 						'name'=>'armv6 gstreamer',
 						'url'=>'armv6/gstreamer',
 				     ),
@@ -158,10 +139,6 @@ $feeds = array(
 						'url'=>'i686/python',
 				     ),
 				array(  
-						'name'=>'i686 debug',
-						'url'=>'i686/debug',
-				     ),
-				array(  
 						'name'=>'i686 gstreamer',
 						'url'=>'i686/gstreamer',
 				     ),
@@ -174,10 +151,6 @@ $feeds = array(
 						'url'=>'ppc603e/python',
 				     ),
 				array(
-						'name'=>'ppc603e debug',
-						'url'=>'ppc603e/debug',
-				     ),
-				array(
 						'name'=>'ppc603e gstreamer',
 						'url'=>'ppc603e/gstreamer',
 				     ),
@@ -251,7 +224,7 @@ $feeds = array(
 				     ),
 				array(
 						'name'=>'FIC gta01/Neo1973 phone',
-						'url'=>'armv4t/machine/om-gta01',
+						'url'=>'armv4t/machine/fic-gta01',
 				     ),
 
 				array(
@@ -280,7 +253,7 @@ $feeds = array(
 		), //end distro
 		array(
 			'distro_name'=>'Ångström',
-			'distro_version'=>'2007.12',
+			'distro_version'=>'2007.12 glibc',
 			'feed_base_url'=>'http://www.angstrom-distribution.org/feeds/2007/ipk/glibc/',
 			'feeds'=>
 			array( 
@@ -305,10 +278,6 @@ $feeds = array(
 					'url'=>'arm-oabi/python',
 				     ),
 				array(  
-					'name'=>'arm-oabi architecture debug feed',
-					'url'=>'arm-oabi/debug',
-				     ),
-				array(  
 					'name'=>'armv4t architecture base feed',
 					'url'=>'armv4t/base',
 				     ),
@@ -325,10 +294,6 @@ $feeds = array(
 					'url'=>'armv4t/python',
 				     ),
 				array(  
-					'name'=>'armv4t architecture debug feed',
-					'url'=>'armv4t/debug',
-				     ),
-				array(  
 					'name'=>'armv5te architecture base feed',
 					'url'=>'armv5te/base',
 				     ),
@@ -345,10 +310,6 @@ $feeds = array(
 					'url'=>'armv5te/python',
 				     ),
 				array(  
-					'name'=>'armv5te architecture debug feed',
-					'url'=>'armv5te/debug',
-				     ),
-				array(  
 					'name'=>'armv5teb architecture base feed',
 					'url'=>'armv5teb/base',
 				     ),
@@ -365,10 +326,6 @@ $feeds = array(
 					'url'=>'armv5teb/python',
 				     ),
 				array(  
-					'name'=>'armv5teb architecture debug feed',
-					'url'=>'armv5teb/debug',
-				     ),
-				array(  
 					'name'=>'armv6 architecture base feed',
 					'url'=>'armv6/base',
 				     ),
@@ -385,10 +342,6 @@ $feeds = array(
 					'url'=>'armv6/python',
 				     ),
 				array(  
-					'name'=>'armv6 architecture debug feed',
-					'url'=>'armv6/debug',
-				     ),
-				array(  
 					'name'=>'i486 architecture base feed',
 					'url'=>'i486/base',
 				     ),
@@ -405,10 +358,6 @@ $feeds = array(
 					'url'=>'i486/python',
 				     ),
 				array(  
-					'name'=>'i486 architecture debug feed',
-					'url'=>'i486/debug',
-				     ),
-				array(  
 					'name'=>'i586 architecture base feed',
 					'url'=>'i586/base',
 				     ),
@@ -425,10 +374,6 @@ $feeds = array(
 					'url'=>'i586/python',
 				     ),
 				array(  
-					'name'=>'i586 architecture debug feed',
-					'url'=>'i586/debug',
-				     ),
-				array(  
 					'name'=>'i686 architecture base feed',
 					'url'=>'i686/base',
 				     ),
@@ -445,10 +390,6 @@ $feeds = array(
 					'url'=>'i686/python',
 				     ),
 				array(  
-					'name'=>'i686 architecture debug feed',
-					'url'=>'i686/debug',
-				     ),
-				array(  
 					'name'=>'iwmmxt architecture base feed',
 					'url'=>'iwmmxt/base',
 				     ),
@@ -465,10 +406,6 @@ $feeds = array(
 					'url'=>'iwmmxt/python',
 				     ),
 				array(  
-					'name'=>'iwmmxt architecture debug feed',
-					'url'=>'iwmmxt/debug',
-				     ),
-				array(  
 					'name'=>'ppc405 architecture base feed',
 					'url'=>'ppc405/base',
 				     ),
@@ -485,10 +422,6 @@ $feeds = array(
 					'url'=>'ppc405/python',
 				     ),
 				array(  
-					'name'=>'ppc405 architecture debug feed',
-					'url'=>'ppc405/debug',
-				     ),
-				array(  
 					'name'=>'ppc603e architecture base feed',
 					'url'=>'ppc603e/base',
 				     ),
@@ -504,15 +437,188 @@ $feeds = array(
 					'name'=>'ppc603e architecture python feed',
 					'url'=>'ppc603e/python',
 				     ),
-				array(  
-					'name'=>'ppc603e architecture debug feed',
-					'url'=>'ppc603e/debug',
-				     )
+                                //machines
+                                array(  
+                                        'name'=>'ep93xx machine feed',
+                                        'url'=>'armv4t/machine/ep93xx',
+                                     ),
+                                array(  
+                                        'name'=>'h6300 machine feed',
+                                        'url'=>'armv4t/machine/h6300',
+                                     ),
+                                array(  
+                                        'name'=>'fic-gta01 machine feed',
+                                        'url'=>'armv4t/machine/fic-gta01',
+                                     ),
+                                array(  
+                                        'name'=>'fic-gta02 machine feed',
+                                        'url'=>'armv4t/machine/fic-gta02',
+                                     ),
+                                array(  
+                                        'name'=>'davinci-dvevm machine feed',
+                                        'url'=>'armv5te/machine/davinci-dvevm',
+                                     ),
+                                array(  
+                                        'name'=>'gumstix-connex machine feed',
+                                        'url'=>'armv5te/machine/gumstix-connex',
+                                     ),
+                                array(  
+                                        'name'=>'gumstix-verdex machine feed',
+                                        'url'=>'armv5te/machine/gumstix-verdex',
+                                     ),
+                                array(  
+                                        'name'=>'gumstix machine feed',
+                                        'url'=>'armv5te/machine/gumstix',
+                                     ),
+                                array(  
+                                        'name'=>'e680 machine feed',
+                                        'url'=>'armv5te/machine/e680',
+                                     ),
+                                array(  
+                                        'name'=>'a780 machine feed',
+                                        'url'=>'armv5te/machine/a780',
+                                     ),
+                                array(  
+                                        'name'=>'a1200 machine feed',
+                                        'url'=>'armv5te/machine/a1200',
+                                     ),
+                                array(  
+                                        'name'=>'at91sam9263ek machine feed',
+                                        'url'=>'armv5te/machine/at91sam9263ek',
+                                     ),
+                                array(  
+                                        'name'=>'rokre6 machine feed',
+                                        'url'=>'armv5te/machine/rokre6',
+                                     ),
+                                array(  
+                                        'name'=>'rokre2 machine feed',
+                                        'url'=>'armv5te/machine/rokre2',
+                                     ),
+                                array(  
+                                        'name'=>'rokr-e2 machine feed',
+                                        'url'=>'armv5te/machine/rokr-e2',
+                                     ),
+                                array(  
+                                        'name'=>'akita machine feed',
+                                        'url'=>'armv5te/machine/akita',
+                                     ),
+                                array(  
+                                        'name'=>'c7x0 machine feed',
+                                        'url'=>'armv5te/machine/c7x0',
+                                     ),
+                                array(  
+                                        'name'=>'h2200 machine feed',
+                                        'url'=>'armv5te/machine/h2200',
+                                     ),
+                                array(  
+                                        'name'=>'h3900 machine feed',
+                                        'url'=>'armv5te/machine/h3900',
+                                     ),
+                                array(  
+                                        'name'=>'h4000 machine feed',
+                                        'url'=>'armv5te/machine/h4000',
+                                     ),
+                                array(  
+                                        'name'=>'h5000 machine feed',
+                                        'url'=>'armv5te/machine/h5000',
+                                     ),
+                                array(  
+                                        'name'=>'htcapache machine feed',
+                                        'url'=>'armv5te/machine/htcapache',
+                                     ),
+                                array(  
+                                        'name'=>'htctornado machine feed',
+                                        'url'=>'armv5te/machine/htctornado',
+                                     ),
+                                array(  
+                                        'name'=>'htcblueangel machine feed',
+                                        'url'=>'armv5te/machine/htcblueangel',
+                                     ),
+                                array(  
+                                        'name'=>'htcuniversal machine feed',
+                                        'url'=>'armv5te/machine/htcuniversal',
+                                     ),
+                                array(  
+                                        'name'=>'hx4700 machine feed',
+                                        'url'=>'armv5te/machine/hx4700',
+                                     ),
+                                array(  
+                                        'name'=>'nslu2le machine feed',
+                                        'url'=>'armv5te/machine/nslu2le',
+                                     ),
+                                array(  
+                                        'name'=>'hx2000 machine feed',
+                                        'url'=>'armv5te/machine/hx2000',
+                                     ),
+                                array(  
+                                        'name'=>'ixp4xxle machine feed',
+                                        'url'=>'armv5te/machine/ixp4xxle',
+                                     ),
+                                array(  
+                                        'name'=>'magician machine feed',
+                                        'url'=>'armv5te/machine/magician',
+                                     ),
+                                array(  
+                                        'name'=>'netbook-pro machine feed',
+                                        'url'=>'armv5te/machine/netbook-pro',
+                                     ),
+                                array(  
+                                        'name'=>'nokia770 machine feed',
+                                        'url'=>'armv5te/machine/nokia770',
+                                     ),
+                                array(  
+                                        'name'=>'qemuarm machine feed',
+                                        'url'=>'armv5te/machine/qemuarm',
+                                     ),
+                                array(  
+                                        'name'=>'omap5912osk machine feed',
+                                        'url'=>'armv5te/machine/omap5912osk',
+                                     ),
+                                array(  
+                                        'name'=>'poodle machine feed',
+                                        'url'=>'armv5te/machine/poodle',
+                                     ),
+                                array(  
+                                        'name'=>'spitz machine feed',
+                                        'url'=>'armv5te/machine/spitz',
+                                     ),
+                                array(  
+                                        'name'=>'tosa machine feed',
+                                        'url'=>'armv5te/machine/tosa',
+                                     ),
+                                array(  
+                                        'name'=>'h3600 machine feed',
+                                        'url'=>'arm-oabi/machine/h3600',
+                                     ),
+                                array(  
+                                        'name'=>'h3800 machine feed',
+                                        'url'=>'arm-oabi/machine/h3800',
+                                     ),
+                                array(  
+                                        'name'=>'collie machine feed',
+                                        'url'=>'arm-oabi/machine/collie',
+                                     ),
+                                array(  
+                                        'name'=>'simpad machine feed',
+                                        'url'=>'arm-oabi/machine/simpad',
+                                     ),
+                                array(  
+                                        'name'=>'htcwallaby machine feed',
+                                        'url'=>'arm-oabi/machine/htcwallaby',
+                                     ),
+                                array(  
+                                        'name'=>'atngw100 machine feed',
+                                        'url'=>'avr32/machine/atngw100',
+                                     ),
+                                array(  
+                                        'name'=>'at32stk1000 machine feed',
+                                        'url'=>'avr32/machine/at32stk1000',
+                                     ),
 			) // end distro['feeds'] 
 		), //end distro
 		array(
 			'distro_name'=>'Ångström',
-			'distro_version'=>'2008.6',
+			'distro_version'=>'2008.6 glibc',
 			'feed_base_url'=>'http://www.angstrom-distribution.org/feeds/2008/ipk/glibc/',
 			'feeds'=>
 			array( 
@@ -537,10 +643,6 @@ $feeds = array(
 											'url'=>'arm-oabi/python',
 										     ),
 										array(  
-												'name'=>'arm-oabi architecture debug feed',
-												'url'=>'arm-oabi/debug',
-										     ),
-										array(  
 												'name'=>'armv4t architecture base feed',
 												'url'=>'armv4t/base',
 										     ),
@@ -557,10 +659,6 @@ $feeds = array(
 												'url'=>'armv4t/python',
 										     ),
 										array(  
-												'name'=>'armv4t architecture debug feed',
-												'url'=>'armv4t/debug',
-										     ),
-										array(  
 												'name'=>'armv5te architecture base feed',
 												'url'=>'armv5te/base',
 										     ),
@@ -577,10 +675,6 @@ $feeds = array(
 												'url'=>'armv5te/python',
 										     ),
 										array(  
-												'name'=>'armv5te architecture debug feed',
-												'url'=>'armv5te/debug',
-										     ),
-										array(  
 												'name'=>'armv5teb architecture base feed',
 												'url'=>'armv5teb/base',
 										     ),
@@ -597,10 +691,6 @@ $feeds = array(
 												'url'=>'armv5teb/python',
 										     ),
 										array(  
-												'name'=>'armv5teb architecture debug feed',
-												'url'=>'armv5teb/debug',
-										     ),
-										array(  
 												'name'=>'armv6 architecture base feed',
 												'url'=>'armv6/base',
 										     ),
@@ -616,10 +706,22 @@ $feeds = array(
 												'name'=>'armv6 architecture python feed',
 												'url'=>'armv6/python',
 										     ),
-										array(  
-												'name'=>'armv6 architecture debug feed',
-												'url'=>'armv6/debug',
-										     ),
+                                                                                array(
+                                                                                                'name'=>'armv7-a architecture base feed',
+                                                                                                'url'=>'armv7a/base',
+                                                                                     ),
+                                                                                array(
+                                                                                                'name'=>'armv7-a architecture gstreamer feed',
+                                                                                                'url'=>'armv7a/gstreamer',
+                                                                                     ),
+                                                                                array(
+                                                                                                'name'=>'armv7-a architecture perl feed',
+                                                                                                'url'=>'armv7a/perl',
+                                                                                     ),
+                                                                                array(
+                                                                                                'name'=>'armv7-a architecture python feed',
+                                                                                                'url'=>'armv7a/python',
+                                                                                     ),
 										array(  
 												'name'=>'i486 architecture base feed',
 												'url'=>'i486/base',
@@ -637,10 +739,6 @@ $feeds = array(
 												'url'=>'i486/python',
 										     ),
 										array(  
-												'name'=>'i486 architecture debug feed',
-												'url'=>'i486/debug',
-										     ),
-										array(  
 												'name'=>'i586 architecture base feed',
 												'url'=>'i586/base',
 										     ),
@@ -657,10 +755,6 @@ $feeds = array(
 												'url'=>'i586/python',
 										     ),
 										array(  
-												'name'=>'i586 architecture debug feed',
-												'url'=>'i586/debug',
-										     ),
-										array(  
 												'name'=>'i686 architecture base feed',
 												'url'=>'i686/base',
 										     ),
@@ -677,10 +771,6 @@ $feeds = array(
 												'url'=>'i686/python',
 										     ),
 										array(  
-												'name'=>'i686 architecture debug feed',
-												'url'=>'i686/debug',
-										     ),
-										array(  
 												'name'=>'iwmmxt architecture base feed',
 												'url'=>'iwmmxt/base',
 										     ),
@@ -697,10 +787,6 @@ $feeds = array(
 												'url'=>'iwmmxt/python',
 										     ),
 										array(  
-												'name'=>'iwmmxt architecture debug feed',
-												'url'=>'iwmmxt/debug',
-										     ),
-										array(  
 												'name'=>'ppc405 architecture base feed',
 												'url'=>'ppc405/base',
 										     ),
@@ -717,10 +803,6 @@ $feeds = array(
 												'url'=>'ppc405/python',
 										     ),
 										array(  
-												'name'=>'ppc405 architecture debug feed',
-												'url'=>'ppc405/debug',
-										     ),
-										array(  
 												'name'=>'ppc603e architecture base feed',
 												'url'=>'ppc603e/base',
 										     ),
@@ -736,10 +818,567 @@ $feeds = array(
 												'name'=>'ppc603e architecture python feed',
 												'url'=>'ppc603e/python',
 										     ),
+                                array(  
+                                        'name'=>'ep93xx machine feed',
+                                        'url'=>'armv4t/machine/ep93xx',
+                                     ),
+                                array(  
+                                        'name'=>'h6300 machine feed',
+                                        'url'=>'armv4t/machine/h6300',
+                                     ),
+                                array(  
+                                        'name'=>'fic-gta01 machine feed',
+                                        'url'=>'armv4t/machine/fic-gta01',
+                                     ),
+                                array(  
+                                        'name'=>'fic-gta02 machine feed',
+                                        'url'=>'armv4t/machine/fic-gta02',
+                                     ),
+                                array(  
+                                        'name'=>'davinci-dvevm machine feed',
+                                        'url'=>'armv5te/machine/davinci-dvevm',
+                                     ),
+                                array(  
+                                        'name'=>'gumstix-connex machine feed',
+                                        'url'=>'armv5te/machine/gumstix-connex',
+                                     ),
+                                array(  
+                                        'name'=>'gumstix-verdex machine feed',
+                                        'url'=>'armv5te/machine/gumstix-verdex',
+                                     ),
+                                array(  
+                                        'name'=>'gumstix machine feed',
+                                        'url'=>'armv5te/machine/gumstix',
+                                     ),
+                                array(  
+                                        'name'=>'e680 machine feed',
+                                        'url'=>'armv5te/machine/e680',
+                                     ),
+                                array(  
+                                        'name'=>'a780 machine feed',
+                                        'url'=>'armv5te/machine/a780',
+                                     ),
+                                array(  
+                                        'name'=>'a1200 machine feed',
+                                        'url'=>'armv5te/machine/a1200',
+                                     ),
+                                array(  
+                                        'name'=>'at91sam9263ek machine feed',
+                                        'url'=>'armv5te/machine/at91sam9263ek',
+                                     ),
+                                array(  
+                                        'name'=>'rokre6 machine feed',
+                                        'url'=>'armv5te/machine/rokre6',
+                                     ),
+                                array(  
+                                        'name'=>'rokre2 machine feed',
+                                        'url'=>'armv5te/machine/rokre2',
+                                     ),
+                                array(  
+                                        'name'=>'rokr-e2 machine feed',
+                                        'url'=>'armv5te/machine/rokr-e2',
+                                     ),
+                                array(  
+                                        'name'=>'akita machine feed',
+                                        'url'=>'armv5te/machine/akita',
+                                     ),
+                                array(  
+                                        'name'=>'c7x0 machine feed',
+                                        'url'=>'armv5te/machine/c7x0',
+                                     ),
+                                array(  
+                                        'name'=>'h2200 machine feed',
+                                        'url'=>'armv5te/machine/h2200',
+                                     ),
+                                array(  
+                                        'name'=>'h3900 machine feed',
+                                        'url'=>'armv5te/machine/h3900',
+                                     ),
+                                array(  
+                                        'name'=>'h4000 machine feed',
+                                        'url'=>'armv5te/machine/h4000',
+                                     ),
+                                array(  
+                                        'name'=>'h5000 machine feed',
+                                        'url'=>'armv5te/machine/h5000',
+                                     ),
+                                array(  
+                                        'name'=>'htcapache machine feed',
+                                        'url'=>'armv5te/machine/htcapache',
+                                     ),
+                                array(  
+                                        'name'=>'htctornado machine feed',
+                                        'url'=>'armv5te/machine/htctornado',
+                                     ),
+                                array(  
+                                        'name'=>'htcblueangel machine feed',
+                                        'url'=>'armv5te/machine/htcblueangel',
+                                     ),
+                                array(  
+                                        'name'=>'htcuniversal machine feed',
+                                        'url'=>'armv5te/machine/htcuniversal',
+                                     ),
+                                array(  
+                                        'name'=>'hx4700 machine feed',
+                                        'url'=>'armv5te/machine/hx4700',
+                                     ),
+                                array(  
+                                        'name'=>'nslu2le machine feed',
+                                        'url'=>'armv5te/machine/nslu2le',
+                                     ),
+                                array(  
+                                        'name'=>'hx2000 machine feed',
+                                        'url'=>'armv5te/machine/hx2000',
+                                     ),
+                                array(  
+                                        'name'=>'ixp4xxle machine feed',
+                                        'url'=>'armv5te/machine/ixp4xxle',
+                                     ),
+                                array(  
+                                        'name'=>'magician machine feed',
+                                        'url'=>'armv5te/machine/magician',
+                                     ),
+                                array(  
+                                        'name'=>'netbook-pro machine feed',
+                                        'url'=>'armv5te/machine/netbook-pro',
+                                     ),
+                                array(  
+                                        'name'=>'nokia770 machine feed',
+                                        'url'=>'armv5te/machine/nokia770',
+                                     ),
+                                array(  
+                                        'name'=>'qemuarm machine feed',
+                                        'url'=>'armv5te/machine/qemuarm',
+                                     ),
+                                array(  
+                                        'name'=>'omap5912osk machine feed',
+                                        'url'=>'armv5te/machine/omap5912osk',
+                                     ),
+                                array(  
+                                        'name'=>'poodle machine feed',
+                                        'url'=>'armv5te/machine/poodle',
+                                     ),
+                                array(  
+                                        'name'=>'spitz machine feed',
+                                        'url'=>'armv5te/machine/spitz',
+                                     ),
+                                array(  
+                                        'name'=>'tosa machine feed',
+                                        'url'=>'armv5te/machine/tosa',
+                                     ),
+				array(
+                                        'name'=>'Beagle Board  machine feed',
+                                        'url'=>'armv7a/machine/beagleboard',
+                                     ),
+                                array(  
+                                        'name'=>'h3600 machine feed',
+                                        'url'=>'arm-oabi/machine/h3600',
+                                     ),
+                                array(  
+                                        'name'=>'h3800 machine feed',
+                                        'url'=>'arm-oabi/machine/h3800',
+                                     ),
+                                array(  
+                                        'name'=>'collie machine feed',
+                                        'url'=>'arm-oabi/machine/collie',
+                                     ),
+                                array(  
+                                        'name'=>'simpad machine feed',
+                                        'url'=>'arm-oabi/machine/simpad',
+                                     ),
+                                array(  
+                                        'name'=>'htcwallaby machine feed',
+                                        'url'=>'arm-oabi/machine/htcwallaby',
+                                     ),
+                                array(  
+                                        'name'=>'atngw100 machine feed',
+                                        'url'=>'avr32/machine/atngw100',
+                                     ),
+                                array(  
+                                        'name'=>'at32stk1000 machine feed',
+                                        'url'=>'avr32/machine/at32stk1000',
+                                     )
+			)// end distro[feeds]s		
+		),// end distro
+		array(
+			'distro_name'=>'Ångström',
+			'distro_version'=>'2008.6 uClibc',
+			'feed_base_url'=>'http://www.angstrom-distribution.org/feeds/2008/ipk/uclibc/',
+			'feeds'=>
+			array( 
+				array(
+					'name'=>' noarch feed',
+					'url'=>'all',
+				     ),
+				array(  
+                                        'name'=>' avr32 architecture base feed',
+                                        'url'=>'avr32/base',
+                                     ),
+                                array(  
+                                        'name'=>' avr32 architecture gstreamer feed',
+                                        'url'=>'avr32/gstreamer',
+                                     ),
+                                array(  
+                                        'name'=>' avr32 architecture perl feed',
+                                        'url'=>'avr32/perl',
+                                     ),
+                                                                                array(  
+                                                                                        'name'=>' avr32 architecture python feed',
+                                                                                        'url'=>'avr32/python',
+                                                                                     ),
+     
+				array(  
+					'name'=>' arm-oabi architecture base feed',
+					'url'=>'arm-oabi/base',
+				     ),
+				array(  
+					'name'=>' arm-oabi architecture gstreamer feed',
+					'url'=>'arm-oabi/gstreamer',
+				     ),
+										array(  
+											'name'=>' arm-oabi architecture perl feed',
+											'url'=>'arm-oabi/perl',
+										     ),
+										array(  
+											'name'=>' arm-oabi architecture python feed',
+											'url'=>'arm-oabi/python',
+										     ),
+										array(  
+												'name'=>' armv4t architecture base feed',
+												'url'=>'armv4t/base',
+										     ),
+										array(  
+												'name'=>' armv4t architecture gstreamer feed',
+												'url'=>'armv4t/gstreamer',
+										     ),
+										array(  
+												'name'=>' armv4t architecture perl feed',
+												'url'=>'armv4t/perl',
+										     ),
+										array(  
+												'name'=>' armv4t architecture python feed',
+												'url'=>'armv4t/python',
+										     ),
+										array(  
+												'name'=>' armv5te architecture base feed',
+												'url'=>'armv5te/base',
+										     ),
+										array(  
+												'name'=>' armv5te architecture gstreamer feed',
+												'url'=>'armv5te/gstreamer',
+										     ),
+										array(  
+												'name'=>' armv5te architecture perl feed',
+												'url'=>'armv5te/perl',
+										     ),
+										array(  
+												'name'=>' armv5te architecture python feed',
+												'url'=>'armv5te/python',
+										     ),
 										array(  
-												'name'=>'ppc603e architecture debug feed',
-												'url'=>'ppc603e/debug',
-										     )
+												'name'=>' armv5teb architecture base feed',
+												'url'=>'armv5teb/base',
+										     ),
+										array(  
+												'name'=>' armv5teb architecture gstreamer feed',
+												'url'=>'armv5teb/gstreamer',
+										     ),
+										array(  
+												'name'=>' armv5teb architecture perl feed',
+												'url'=>'armv5teb/perl',
+										     ),
+										array(  
+												'name'=>' armv5teb architecture python feed',
+												'url'=>'armv5teb/python',
+										     ),
+										array(  
+												'name'=>' armv6 architecture base feed',
+												'url'=>'armv6/base',
+										     ),
+										array(  
+												'name'=>' armv6 architecture gstreamer feed',
+												'url'=>'armv6/gstreamer',
+										     ),
+										array(  
+												'name'=>' armv6 architecture perl feed',
+												'url'=>'armv6/perl',
+										     ),
+										array(  
+												'name'=>' armv6 architecture python feed',
+												'url'=>'armv6/python',
+										     ),
+										array(  
+												'name'=>' i486 architecture base feed',
+												'url'=>'i486/base',
+										     ),
+										array(  
+												'name'=>' i486 architecture gstreamer feed',
+												'url'=>'i486/gstreamer',
+										     ),
+										array(  
+												'name'=>' i486 architecture perl feed',
+												'url'=>'i486/perl',
+										     ),
+										array(  
+												'name'=>' i486 architecture python feed',
+												'url'=>'i486/python',
+										     ),
+										array(  
+												'name'=>' i586 architecture base feed',
+												'url'=>'i586/base',
+										     ),
+										array(  
+												'name'=>' i586 architecture gstreamer feed',
+												'url'=>'i586/gstreamer',
+										     ),
+										array(  
+												'name'=>' i586 architecture perl feed',
+												'url'=>'i586/perl',
+										     ),
+										array(  
+												'name'=>' i586 architecture python feed',
+												'url'=>'i586/python',
+										     ),
+										array(  
+												'name'=>' i686 architecture base feed',
+												'url'=>'i686/base',
+										     ),
+										array(  
+												'name'=>' i686 architecture gstreamer feed',
+												'url'=>'i686/gstreamer',
+										     ),
+										array(  
+												'name'=>' i686 architecture perl feed',
+												'url'=>'i686/perl',
+										     ),
+										array(  
+												'name'=>' i686 architecture python feed',
+												'url'=>'i686/python',
+										     ),
+										array(  
+												'name'=>' iwmmxt architecture base feed',
+												'url'=>'iwmmxt/base',
+										     ),
+										array(  
+												'name'=>' iwmmxt architecture gstreamer feed',
+												'url'=>'iwmmxt/gstreamer',
+										     ),
+										array(  
+												'name'=>' iwmmxt architecture perl feed',
+												'url'=>'iwmmxt/perl',
+										     ),
+										array(  
+												'name'=>' iwmmxt architecture python feed',
+												'url'=>'iwmmxt/python',
+										     ),
+										array(  
+												'name'=>' ppc405 architecture base feed',
+												'url'=>'ppc405/base',
+										     ),
+										array(  
+												'name'=>' ppc405 architecture gstreamer feed',
+												'url'=>'ppc405/gstreamer',
+										     ),
+										array(  
+												'name'=>' ppc405 architecture perl feed',
+												'url'=>'ppc405/perl',
+										     ),
+										array(  
+												'name'=>' ppc405 architecture python feed',
+												'url'=>'ppc405/python',
+										     ),
+										array(  
+												'name'=>' ppc603e architecture base feed',
+												'url'=>'ppc603e/base',
+										     ),
+										array(  
+												'name'=>' ppc603e architecture gstreamer feed',
+												'url'=>'ppc603e/gstreamer',
+										     ),
+										array(  
+												'name'=>' ppc603e architecture perl feed',
+												'url'=>'ppc603e/perl',
+										     ),
+										array(  
+												'name'=>' ppc603e architecture python feed',
+												'url'=>'ppc603e/python',
+										     ),
+                                array(  
+                                        'name'=>'ep93xx machine feed',
+                                        'url'=>'armv4t/machine/ep93xx',
+                                     ),
+                                array(  
+                                        'name'=>'h6300 machine feed',
+                                        'url'=>'armv4t/machine/h6300',
+                                     ),
+                                array(  
+                                        'name'=>'fic-gta01 machine feed',
+                                        'url'=>'armv4t/machine/fic-gta01',
+                                     ),
+                                array(  
+                                        'name'=>'fic-gta02 machine feed',
+                                        'url'=>'armv4t/machine/fic-gta02',
+                                     ),
+                                array(  
+                                        'name'=>'davinci-dvevm machine feed',
+                                        'url'=>'armv5te/machine/davinci-dvevm',
+                                     ),
+                                array(  
+                                        'name'=>'gumstix-connex machine feed',
+                                        'url'=>'armv5te/machine/gumstix-connex',
+                                     ),
+                                array(  
+                                        'name'=>'gumstix-verdex machine feed',
+                                        'url'=>'armv5te/machine/gumstix-verdex',
+                                     ),
+                                array(  
+                                        'name'=>'gumstix machine feed',
+                                        'url'=>'armv5te/machine/gumstix',
+                                     ),
+                                array(  
+                                        'name'=>'e680 machine feed',
+                                        'url'=>'armv5te/machine/e680',
+                                     ),
+                                array(  
+                                        'name'=>'a780 machine feed',
+                                        'url'=>'armv5te/machine/a780',
+                                     ),
+                                array(  
+                                        'name'=>'a1200 machine feed',
+                                        'url'=>'armv5te/machine/a1200',
+                                     ),
+                                array(  
+                                        'name'=>'at91sam9263ek machine feed',
+                                        'url'=>'armv5te/machine/at91sam9263ek',
+                                     ),
+                                array(  
+                                        'name'=>'rokre6 machine feed',
+                                        'url'=>'armv5te/machine/rokre6',
+                                     ),
+                                array(  
+                                        'name'=>'rokre2 machine feed',
+                                        'url'=>'armv5te/machine/rokre2',
+                                     ),
+                                array(  
+                                        'name'=>'rokr-e2 machine feed',
+                                        'url'=>'armv5te/machine/rokr-e2',
+                                     ),
+                                array(  
+                                        'name'=>'akita machine feed',
+                                        'url'=>'armv5te/machine/akita',
+                                     ),
+                                array(  
+                                        'name'=>'c7x0 machine feed',
+                                        'url'=>'armv5te/machine/c7x0',
+                                     ),
+                                array(  
+                                        'name'=>'h2200 machine feed',
+                                        'url'=>'armv5te/machine/h2200',
+                                     ),
+                                array(  
+                                        'name'=>'h3900 machine feed',
+                                        'url'=>'armv5te/machine/h3900',
+                                     ),
+                                array(  
+                                        'name'=>'h4000 machine feed',
+                                        'url'=>'armv5te/machine/h4000',
+                                     ),
+                                array(  
+                                        'name'=>'h5000 machine feed',
+                                        'url'=>'armv5te/machine/h5000',
+                                     ),
+                                array(  
+                                        'name'=>'htcapache machine feed',
+                                        'url'=>'armv5te/machine/htcapache',
+                                     ),
+                                array(  
+                                        'name'=>'htctornado machine feed',
+                                        'url'=>'armv5te/machine/htctornado',
+                                     ),
+                                array(  
+                                        'name'=>'htcblueangel machine feed',
+                                        'url'=>'armv5te/machine/htcblueangel',
+                                     ),
+                                array(  
+                                        'name'=>'htcuniversal machine feed',
+                                        'url'=>'armv5te/machine/htcuniversal',
+                                     ),
+                                array(  
+                                        'name'=>'hx4700 machine feed',
+                                        'url'=>'armv5te/machine/hx4700',
+                                     ),
+                                array(  
+                                        'name'=>'nslu2le machine feed',
+                                        'url'=>'armv5te/machine/nslu2le',
+                                     ),
+                                array(  
+                                        'name'=>'hx2000 machine feed',
+                                        'url'=>'armv5te/machine/hx2000',
+                                     ),
+                                array(  
+                                        'name'=>'ixp4xxle machine feed',
+                                        'url'=>'armv5te/machine/ixp4xxle',
+                                     ),
+                                array(  
+                                        'name'=>'magician machine feed',
+                                        'url'=>'armv5te/machine/magician',
+                                     ),
+                                array(  
+                                        'name'=>'netbook-pro machine feed',
+                                        'url'=>'armv5te/machine/netbook-pro',
+                                     ),
+                                array(  
+                                        'name'=>'nokia770 machine feed',
+                                        'url'=>'armv5te/machine/nokia770',
+                                     ),
+                                array(  
+                                        'name'=>'qemuarm machine feed',
+                                        'url'=>'armv5te/machine/qemuarm',
+                                     ),
+                                array(  
+                                        'name'=>'omap5912osk machine feed',
+                                        'url'=>'armv5te/machine/omap5912osk',
+                                     ),
+                                array(  
+                                        'name'=>'poodle machine feed',
+                                        'url'=>'armv5te/machine/poodle',
+                                     ),
+                                array(  
+                                        'name'=>'spitz machine feed',
+                                        'url'=>'armv5te/machine/spitz',
+                                     ),
+                                array(  
+                                        'name'=>'tosa machine feed',
+                                        'url'=>'armv5te/machine/tosa',
+                                     ),
+                                array(  
+                                        'name'=>'h3600 machine feed',
+                                        'url'=>'arm-oabi/machine/h3600',
+                                     ),
+                                array(  
+                                        'name'=>'h3800 machine feed',
+                                        'url'=>'arm-oabi/machine/h3800',
+                                     ),
+                                array(  
+                                        'name'=>'collie machine feed',
+                                        'url'=>'arm-oabi/machine/collie',
+                                     ),
+                                array(  
+                                        'name'=>'simpad machine feed',
+                                        'url'=>'arm-oabi/machine/simpad',
+                                     ),
+                                array(  
+                                        'name'=>'htcwallaby machine feed',
+                                        'url'=>'arm-oabi/machine/htcwallaby',
+                                     ),
+                                array(  
+                                        'name'=>'atngw100 machine feed',
+                                        'url'=>'avr32/machine/atngw100',
+                                     ),
+                                array(  
+                                        'name'=>'at32stk1000 machine feed',
+                                        'url'=>'avr32/machine/at32stk1000',
+                                     )
 									)// end distro[feeds]s		
 								)// end distro
 							); //end $feeds
diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc
index 8b64ca345b..d4454ca708 100644
--- a/contrib/feed-browser/includes/functions.inc
+++ b/contrib/feed-browser/includes/functions.inc
@@ -1,6 +1,6 @@
 <?php
 /*
- * (c) Koen Kooi 2006, 2007
+ * (c) Koen Kooi 2006, 2007, 2008
  * (c) Marcin Juszkiewicz 2006, 2007
  *
  * This program is free software; you can redistribute it and/or  modify it under
@@ -195,7 +195,13 @@ function pkgdetails ($package)
 		$details .= "<dl>";
 
 		$details .= sprintf ("\n<dt>Maintainer:</dt><dd>%s</dd>", str_replace(array('@',', '), array(' at ', '<br />'), htmlentities($package['packages.p_maintainer'])));
-		
+
+		$scapfile = "img/packages/".$package['packages.p_name'][0]."/".$package['packages.p_name'].".png";
+		if(file_exists(FB_BASE_DIR.$scapfile))
+		{
+			$details .= sprintf ("\n<dt>Screenshot:</dt><dd><a href='%s'><img src='%s' width='320px' noborder></a></dd>", $scapfile, $scapfile);
+		}
+
 		if($package['packages.p_homepage']) 
 		{
 			$details .= sprintf ("\n<dt>Homepage:</dt><dd>%s</dd>", $package['packages.p_homepage']);