X-Git-Url: https://git.deb.at/?p=deb%2Fhackedgotchi.git;a=blobdiff_plain;f=config%2Fconfig.ini;h=eb34d26583b10194702cfda9a54c57475008d03f;hp=ea1c86b3154c40ac4917171c886be63c3ec60a2d;hb=cf447584456fa78c17b1feef4e8333d298e35f7b;hpb=181a868969198a394642cb72e9735b447f64178c

diff --git a/config/config.ini b/config/config.ini
index ea1c86b..87c7624 100644
--- a/config/config.ini
+++ b/config/config.ini
@@ -15,7 +15,7 @@ owner_email = mako@debian.org
 # new_feed_items: Number of items to take from new feeds
 # log_level: One of DEBUG, INFO, WARNING, ERROR or CRITICAL
 cache_directory = cache
-new_feed_items = 2
+new_feed_items = 1
 log_level = DEBUG
 
 # template_files: Space-separated list of output template files
@@ -72,10 +72,12 @@ faceheight = 85
 # face = filename of your hackergotchi in heads (or leave out entirely)
 # facewidth/faceheight = size of your hackergotchi, if not default
 
-[http://debian.doogie.brainfood.com/blog/?feed=rss2]
-name = Adam Heath
-face = doogie.png
-faceheight = 115
+# 2006-09-04 mako
+# disabled due to a 500 (internal server error)
+# [http://debian.doogie.brainfood.com/blog/?feed=rss2]
+# name = Adam Heath
+# face = doogie.png
+# faceheight = 115
 
 [http://adam.rosi-kessel.org/index.rss]
 name = Adam Rosi-Kessel
@@ -84,21 +86,27 @@ faceheight = 99
 
 [http://chistera.yi.org/~adeodato/blog/rss/debian.xml]
 name = Adeodato Simó
-face = dato3.png
-facewidth = 81
-faceheight = 100
 
-[http://www.aigarius.com/feed/planet.xml]
+[http://fortytwo.ch/blog/rss.xml]
+name = Adrian von Bidder
+face = cmot.png
+facewidth = 71
+faceheight = 85
+
+[http://www.aigarius.com/blog/feed/atom/]
 name = Aigars Mahinovs
 face = aigarius_hg.png
 facewidth = 85
 faceheight = 116
 
+[http://www.asoftsite.org/s9y/feeds/categories/1-Debian-OS.rss]
+name = Alexander Sack
+
 [http://log.schmehl.info/Debian/index.rss]
 name = Alexander Schmehl
 face = tolimar.png
 
-[http://www.formorer.de/blogs/index.php?/feeds/categories/2-Debian.rss]
+[http://www.formorer.de/webwiki//blog/tags/debian.rss]
 name = Alexander Wirt
 face = formorer.png
 facewidth = 94
@@ -108,6 +116,9 @@ faceheight = 101
 name = Alexis Sukrieh
 face = sukria.png
 
+[http://blog.scealnetworks.com/index.rss]
+name = Alastair McKinstry
+
 [http://www.livejournal.com/users/amayita/data/rss/]
 name = Amaya Rodrigo
 face = amaya.png
@@ -116,13 +127,13 @@ faceheight = 111
 [http://www.progsoc.org/~wildfire/aum/index.rss]
 name = Anand Kumria
 
-[http://www.advogato.org/person/andrelop/rss.xml]
+[http://www.andrelop.org/blog/wp-rss2.php?cat=2]
 name = Andre Luis Lopes
 
 [http://blogs.turmzimmer.net/en/index.rss]
 name = Andreas Barth
 
-[http://downhill.aus.cc/blog/debian/atom.xml]
+[http://www.bebt.de/blog/debian/rss.xml]
 name = Andreas Metzler
 
 [http://andreeleidenfrost.blogspot.com/atom.xml]
@@ -148,13 +159,25 @@ face = rotty.jpg
 facewidth = 95
 faceheight = 115
 
-[http://www.schuldei.org/weblog/blog//?flav=rss]
+# 2006-09-04 mako
+# disabled due to a 500 (internal server error)
+# fixed 2006-09-04 andreas
+[http://schuldei.blogspot.com/atom.xml]
 name = Andreas Schuldei
 
+[http://blog.wompom.org/index.php/feed/atom/]
+name = Andrew Stribblehill
+
+[http://www.pomum.no/feed/]
+name = Annabelle Tully
+face = pixie.png
+facewidth= 85
+faceheight = 99
+
 [http://blog.anselms.net/debian/index.rss]
 name = Anselm Lingnau
 
-[http://azure.humbug.org.au/~aj/blog/planetdebian/index.rss]
+[http://azure.humbug.org.au/~aj/blog/planetdebian/index.rss?seemore=yes]
 name = Anthony Towns
 face = ajt.png
 facewidth = 77
@@ -166,16 +189,13 @@ face = antti.png
 facewidth = 79
 faceheight = 96
 
-[http://go-team-ari.livejournal.com/data/rss]
-name = Ari Pollak
-face = ari.png
-facewidth = 75
-faceheight = 92
-
 [http://blogs.hurdfr.org/xmlsrv/rss2.php?blog=9]
 name = Arnaud Fontaine
+face = arnau.png
+facewidth = 63
+faceheight = 85
 
-[http://www.edev.be/blog/wp-rss2.php?cat=2]
+[http://www.edev.be/?q=blog/2/feed]
 name = Arnaud Vandyck
 face = avdyk.png
 facewidth = 65
@@ -207,12 +227,30 @@ faceheight = 100
 
 [http://baruch.ev-en.org/blog/index.rss2]
 name = Baruch Even
+face = baruch.png
+facewidth = 77
+faceheight = 100
+
+[http://bblank.thinkmo.de/blog/topics/Debian/@@rss.xml]
+name = Bastian Blank
+
+[http://blog.venthur.de/category/debian/feed]
+name = Bastian Venthur
+face = venthur.png
+facewidth = 85
+faceheight = 115
 
 [http://www.gag.com/cgi-bin/blosxom/index.rss]
 name = Bdale Garbee
 face = bdale.png
 facewidth = 58
 
+[http://syn.theti.ca/xml/rss20/feed.xml]
+name = Ben Armstrong
+face = synrg.png
+facewidth = 64
+faceheight = 100
+
 [http://www.grassouille.org/blog/index.php/Debian?flav=rss2]
 name = Benjamin Drieu
 face = benj.png
@@ -232,11 +270,11 @@ face = astronut.png
 [http://pcpool00.mathematik.uni-freiburg.de/~brl/blog/changelog.rss]
 name = Bernhard R. Link
 
-[http://healthhacker.org/satoroams/?cat=10&feed=rss2]
+[http://healthhacker.org/satoroams/?cat=10,20,21,28&feed=rss2]
 name = Biella Coleman
 face = biella.png
-facewidth= = 65
-faceheight = 79
+facewidth= = 90
+faceheight = 90
 
 [http://necrotic.deadbeast.net/~branden/blog/exuberance?flav=rss]
 name = Branden Robinson
@@ -256,7 +294,7 @@ face = pyro.png
 facewidth = 71
 faceheight = 102
 
-[http://www.livejournal.com/users/claviola/rss]
+[http://zork.net/~clavicle/dongs/claviola/debian]
 name = Carlos Laviola
 face = claviola.png
 facewidth = 95
@@ -274,14 +312,23 @@ face = christine.png
 facewidth = 78
 faceheight = 95
 
+[http://beta.blogger.com/feeds/9012838934751300850/posts/full]
+name = Christophe Prud'homme
+face = prudhomm.png
+facewidth = 70
+faceheight = 99
+
+
 [http://xana.scru.org/index.atom]
 name = Clint Adams
 
-[http://web.verbum.org/?flav=rss]
-name = Colin Walters
-face = walters.png
-facewidth = 65
-faceheight = 81
+# 2006-09-04 mako
+# disabled due to 404
+# [http://web.verbum.org/?flav=rss]
+# name = Colin Walters
+# face = walters.png
+# facewidth = 65
+# faceheight = 81
 
 [http://riva.ucam.org/~cjwatson/blog/index.rss]
 name = Colin Watson
@@ -294,7 +341,7 @@ name = Craig Small
 
 [http://blog.daniel-baumann.ch/planet-debian-aggregator/index.rss]
 name = Daniel Baumann
-face = panthera.png
+face = daniel.png
 facewidth = 94
 faceheight = 102
 
@@ -307,6 +354,9 @@ faceheight = 69
 [http://www.livejournal.com/users/mirrorlynx/data/rss]
 name = Dan Weber
 
+[http://weblog.false.org/weblog/index.rss]
+name = Daniel Jacobowitz
+
 [http://www.flexserv.de/blog/index.rss]
 name = Daniel J. Priem
 face = codebreaker.png
@@ -348,14 +398,22 @@ name = David Pashley
 face = jd.png
 faceheight = 84
 
+[http://planetwatson.co.uk/blog/feed/atom/]
+name = David Watson
+face = dwatson.png
+facewidth = 65
+faceheight = 80
+
 [http://journal.dedasys.com/xml/rss20/feed.xml]
 name = David Welton
 
-[http://debconf6.debconf.org/blog/index.rss11]
-name = DebConf6 Blog
-face = debconf.png
-facewidth = 71
-faceheigt = 85
+# most people like Planet to be personal blogs only - aba, 2006-08-04
+# thats bal fasel. there is a difference between dc6 blog and debian times
+#[http://debconf6.debconf.org/blog/index.rss11]
+#name = DebConf6 Blog
+#face = debconf.png
+#facewidth = 71
+#faceheigt = 85
 
 [http://dirk.eddelbuettel.com/blog/index.rss]
 name = Dirk Eddelbuettel
@@ -368,10 +426,16 @@ face = edd.png
 facewidth = 62
 faceheight = 80
 
-[http://www.enricozini.org/blog/tags/pdo?flav=rss]
+[http://ramblingfoo.blogspot.com/feeds/posts/default]
+name =  Eddy Petrișor
+face = eddyp.png
+facewidth = 100
+faceheight = 109
+
+[http://www.enricozini.org/blog/pdo.rss]
 name = Enrico Zini
 
-[http://ema.homeip.net/blog/debian/?flav=rss]
+[http://emarocca.livejournal.com/data/rss/]
 name = Emanuele Rocca
 face = ema.png
 facewidth = 77
@@ -404,9 +468,12 @@ face = fabbione.png
 facewidth = 65
 faceheight = 89
 
-[http://people.initd.org/fog/?flav=rss]
+[http://initd.org/blog/fog/debian/?flav=rss]
 name = Federico Di Gregorio
 
+[http://www.advogato.org/person/faw/rss.xml]
+name = Felipe Augusto van de Wiel
+
 [http://www.advogato.org/person/fweiden/rss.xml]
 name = Fernanda Weiden
 face = nanda.png
@@ -419,7 +486,13 @@ face = mechanix.png
 facewidth = 71
 faceheight = 94
 
-[http://www.livejournal.com/users/djpig/data/rss]
+[http://www.esaurito.net/blog/debian/?flav=rss]
+name = Filippo Giunchedi
+face = filippo.png
+facewidth = 65
+faceheight = 86
+
+[http://blog.djpig.de/en/devel/debian/index.rss]
 name = Frank Lichtenheld
 
 [http://frankiebloggie.blogspot.com/atom.xml]
@@ -437,10 +510,20 @@ faceheight = 85
 [http://ganneff.de/blog/index.rss]
 name = Joerg Jaspert
 
+[http://cateee.blogspot.com/feeds/posts/default]
+name = Giacomo Catenazzi
+
+[http://gintasm.blogspot.com/atom.xml]
+name = Gintautas Miliauskas
+face = gintautas.png
+facewidth = 65
+faceheight = 91
+
 [http://alfie.ist.org/blog/index.rss]
 name = Gerfried Fuchs
-face = alfie2.png
-faceheight = 75
+face = alfie3.png
+facewidth  = 86
+faceheight = 111
 
 [http://bonehunter.rulez.org/~algernon/blog/index.atom]
 name = Gergely Nagy
@@ -451,6 +534,12 @@ faceheight = 85
 [http://www.gotom.jp/~gotom/cgi-bin/blosxom.cgi/index.rss]
 name = GOTO Masanori
 
+[http://orniere-du-globe.net/blog/?feed=rss2&cat=7]
+name = Gonéri Le Bouder
+face = goneri.png
+facewidth = 57
+faceheight = 110
+
 [http://fatalerror-debian.blogspot.com/atom.xml]
 name = Guilherme de S. Pastore
 
@@ -538,6 +627,12 @@ faceheight = 102
 [http://phython.blogspot.com/atom.xml]
 name = 	James Morrison
 
+[http://blog.waja.info/index.php?tag=planet&feed=rss2]
+name = Jan Wagner
+face = waja.png
+facewidth = 74
+faceheight = 100
+
 [http://jeanmichel.kelbert.com/?feed=rss2&cat=2]
 name = Jean-Michel Kelbert 
 
@@ -550,18 +645,26 @@ name = Jeff Licquia
 [http://jeroen.wolffelaar.nl/blog/debian.rss]
 name = Jeroen van Wolffelaar
 
-[http://beta.pumuki.org/?q=blog/feed/1]
+# 2006-06-22 mako 
+# this seems to be pushing out strange non-content feeds. maybe an
+# atom issue. please provide a new feed or wait for an upgrade of planet
+[http://www.pumuki.org/?feed=rss2&cat=11]
 name = Jesus Climent
-face = jcliment.png
-faceheight = 79
+face = hackermooch3.png
+facewidth = 100
+faceheight = 115
 
-[http://pensezbien.org/?flav=rss]
-name = Jimmy Kaplowitz
+# 2006-09-04 mako
+# disabled due to a 500 (internal server error)
+# [http://pensezbien.org/?flav=rss]
+# name = Jimmy Kaplowitz
 
-[http://www.sacredchao.net/~piman/journal/feed]
-name = Joe Wreschnig
-face = piman.png
-faceheight = 93
+# 2006-09-04 mako
+# disabled due to 404
+# [http://www.sacredchao.net/~piman/journal/feed]
+# name = Joe Wreschnig
+# face = piman.png
+# faceheight = 93
 
 [http://www.wendlandnet.de/joerg/blog/en/index.rss]
 name = Joerg Wendland
@@ -577,15 +680,28 @@ faceheight = 75
 [http://changelog.complete.org/feeds/index.rss1]
 name = John Goerzen
 
+# deutex maintainer
+[http://alcopop.org/log/debian/feed]
+name = Jon Dowland
+
 [http://www.earth.li/~noodles/blog/index.rss]
 name = Jonathan McDowell
+face = noodles.png
+facewidth = 110
+faceheight = 118
 
 [http://oskuro.net/blog?flav=rss]
 name = Jordi Mallach
 face = oskuro.png
 faceheight = 77
 
-[http://www.tribulaciones.org/blog/index.rss2]
+[http://bencer.cauterized.net/blog/data/xml/blog.rss]
+name = Jorge Salamero Sanz
+face = nm_bencer.png
+faceheight = 80
+facewidth = 56
+
+[http://www.tribulaciones.org/blog/index.rss20]
 name = Jose Carlos Garcia Sogo
 face = jsogo.png
 faceheight = 100
@@ -612,8 +728,11 @@ faceheight = 89
 [http://julien.danjou.info/blog/rss.php?lang=en]
 name = Julien Danjou
 face = jdanjou.png
-facewidth = 50
-faceheight = 57
+facewidth = 100 
+faceheight = 84
+
+[http://www.kirya.net/weblog/category/planet-debian/feed/]
+name = Julien Valroff
 
 [http://www.netfort.gr.jp/~dancer/diary/recententry-en.rdf]
 name = Junichi Uekawa
@@ -626,6 +745,9 @@ name = Kai Hendry
 face = kai.png
 faceheight = 78
 
+[http://kartikmistry.org/blog/?feed=atom]
+name = Kartik Mistry
+
 [http://b9.com/index.rdf]
 name = Kevin Rosenberg
 
@@ -635,21 +757,27 @@ face = kmuto.png
 facewidth = 68
 faceheight = 101
 
-[http://blog.kyle.mcmartin.ca/?feed=rss2]
-name = Kyle McMartin
-face = mcmartin.png
-faceheight = 100
+#[http://blog.kyle.mcmartin.ca/?feed=rss2]
+#name = Kyle McMartin
+#face = mcmartin.png
+#faceheight = 100
 
 [http://liw.iki.fi/liw/log/log.rss]
 name = Lars Wirzenius
 
+[http://www.lucas-nussbaum.net/blog/?feed=rss2&cat=13]
+name = Lucas Nussbaum
+face = lucas.png
+facewidth = 75
+faceheight = 90
+
 [http://community.livejournal.com/lbello_english/data/rss]
 name = Luciano Bello
 face = lucianobello.png
-facewidth = 68
-faceheight = 85
+facewidth = 65
+faceheight = 70 
 
-[http://www.golden-gryphon.com/blog/manoj/index.rss10]
+[http://www.golden-gryphon.com/blog/manoj/index.rss]
 name = Manoj Srivastava
 face = manoj2.png
 facewidth = 65
@@ -661,26 +789,38 @@ face = he.png
 facewidth = 80
 faceheight = 81
 
-[http://blog.zugschlus.de/feeds/categories/15-Debian-English.rss]
+[http://blog.zugschlus.de/rss.php?serendipity%5btag%5d=debian-english]
 name = Marc 'Zugschlus' Haber
 face = zugschlus.png
 
+[http://mltplanet.livejournal.com/data/rss]
+name = Marcela Tiznado 
+face = mlt.png
+facewidth = 65
+faceheight = 71
+
 [http://blog.bofh.it/?format=atom03]
 name = Marco d'Itri
 face = md.jpg
 facewidth = 96
 faceheight = 95
 
-#[http://www.marga.com.ar/blog/index.cgi?flav=rss]
-#name = Margarita Manterola
-#face = marga.png
-#facewidth = 87
-#faceheight = 113
+[http://www.marga.com.ar/blog/index.cgi?flav=rss]
+name = Margarita Manterola
+face = marga.png
+facewidth = 65
+faceheight = 103
+
+[http://blog.marioiseli.com/index.php/feed]
+name = Mario Iseli
+face = marioiseli.png
+facewidth = 70
+faceheight = 96
 
 [http://www.sirena.org.uk/log/?feed=atom]
 name = Mark Brown
 
-[http://blog.zobel.ftbfs.de/debian/index.rss]
+[http://blog.zobel.ftbfs.de/feed/]
 name = Martin Zobel-Helas
 face = zobel.png
 
@@ -694,9 +834,12 @@ facewidth = 57
 
 [http://blog.madduck.net/?flav=rss20]
 name = Martin F. Krafft
-face = madduck.png
-facewidth = 75
-faceheight = 94
+#face = madduck.png
+#facewidth = 75
+#faceheight = 94
+face = devilduck.png
+facewidth = 83
+faceheight = 100
 
 [http://www.cyrius.com/journal/?flav=atom]
 name = Martin Michlmayr
@@ -732,7 +875,7 @@ faceheight = 85
 
 [http://www.advogato.org/person/mjg59/rss.xml]
 name = Matthew Garrett
-face = mjg59-hypno.gif
+face = mjg59.png
 facewidth = 69
 faceheight = 85
 #facewidth = 72
@@ -750,10 +893,14 @@ face = smurf.png
 facewidth = 65
 faceheight = 85
 
-[http://blog.alphascorpii.net/index.rss]
+[http://www.itp.tuwien.ac.at/~mattems/blog/index.rss]
+name = Maximilian Attems
+
+[http://blog.alphascorpii.net/english/index.rss]
 name = Meike Reichle
-face = meike.png
-faceheight = 76
+face = alphascorpii.png
+facewidth = 76
+faceheight = 92 
 
 [http://www.advogato.org/person/mbanck/rss.xml]
 name = Michael Banck
@@ -761,11 +908,12 @@ face = azeem.png
 facewidth = 64
 faceheight = 79
 
-#[http://base0.net/taxonomy/term/25/0/feed]
-#name = Michael Janssen
-#face = jamuraa.png
-#facewidth = 59
-# Disabled for s9y transition
+# Brewster's Millions != Groundhog Day; please fix your blog
+# It's fallen off the feed now, hopefully forever.
+[http://base0.net/feeds/categories/20-Planet-Debian.rss]
+name = Michael Janssen
+face = jamuraa.png
+facewidth = 59
 
 [http://classpath.wildebeest.org/dairy-man-di/wp-rss2.php]
 name = Michael Koch
@@ -785,6 +933,12 @@ faceheight = 97
 [http://web.glandium.org/blog/?feed=rss2&cat=5]
 name = Mike Hommey
 
+[http://www.miriamruiz.es/weblog/?cat=5&feed=rss2]
+name = Miriam Ruiz
+face = miry.png
+faceheight = 95
+facewidth = 95
+
 [http://mjr.towers.org.uk/blog/all.rss]
 name = MJ Ray
 face = mjray2.png
@@ -796,6 +950,13 @@ face = moray.png
 facewidth = 71
 faceheight = 84
 
+
+[http://criptonita.com/~nacho/blog/wp-rss2.php?cat=11]
+name = Nacho Barrientos Arias
+face = chipi.png
+facewidth = 63
+faceheight = 85
+
 [http://www.inittab.de/blog/?flav=rss20]
 name = Norbert Tretkowski
 face = nobse.png
@@ -812,9 +973,12 @@ name = Pascal Hakim
 face = pasc.png
 faceheight = 84
 
-[http://paul.luon.net/journal/index.xml]
+[http://paul.luon.net/journal/tags/debian-planet/index.xml]
 name = Paul van Tilburg
 
+[http://www.advogato.org/person/pabs3/rss.xml]
+name = Paul Wise
+
 [http://perolofsson.livejournal.com/data/rss]
 name = Per Olofsson
 
@@ -829,17 +993,26 @@ name = Peter Palfrader
 face = weasel.png
 facewidth = 56
 
+[http://web.mornfall.net/blog.rss]
+name = Petr Rockai
+
 [http://pvaneynd.blogspot.com/atom.xml]
 name = Peter Van Eynde
 face = pvaneynd.png
 facewidth = 59
 faceheight = 100
 
-[http://blog.philkern.de/feeds/categories/4-Debian.rss]
-name = Philipp Kern
-face = pkern.png
-facewidth = 69
-faceheight = 85
+[http://blog.hands.com/?flav=rss]
+name = Phil Hands
+face = philh.png
+facewidth = 99
+faceheight = 104
+
+#[http://blog.philkern.de/feeds/categories/4-Debian.rss]
+#name = Philipp Kern
+#face = pkern.png
+#facewidth = 69
+#faceheight = 85
 
 [http://blog.madism.org/rss.php?lang=en]
 name = Pierre Habouzit
@@ -852,7 +1025,13 @@ name = Pierre Machard
 face = machard.png
 faceheight = 84
 
-[http://www.khensu.org/xml-rss2.php?full=yes]
+[http://people.debian.org/~dexter/dexter.jogger.pl.rss]
+name = Piotr Roszatycki
+face = dexter.png
+facewidth = 65
+faceheight = 89
+
+[http://khensu.org/xml-rss2.php?full=yes]
 name = Randall Donald
 face = rdonald.png
 facewidth = 85
@@ -864,22 +1043,19 @@ face = hertzog.png
 facewidth = 62
 faceheight = 90
 
+[http://giskard.noblogs.org/rss.php?categoryId=89]
+name = Riccardo Setti
+
 [http://remi.vanicat.free.fr/blog/index.php/category/debian-planet/feed/]
 name = Remi Vanicat
 
-[http://reports.progn.org/cgi-bin/blosxom/index.rss]
-name = René van Bevern
-face = rvb.png
-facewidth = 80
-faceheight = 104
-
 [http://www.livejournal.com/users/nchip/data/rss]
 name = Riku Voipio
 face = nchip.png
 facewidth = 70
 faceheight = 85
 
-[http://www.robster.org.uk/blog/?flav=atom]
+[http://www.robster.org.uk/blog/feed/]
 name = Rob Bradford
 
 [http://blog.floopily.org/feed/]
@@ -890,17 +1066,26 @@ name = Robert Collins
 
 [http://www.robot101.net/feed/]
 name = Robert McQueen
+face = robot101.png
+facewidth = 68
+faceheight = 90
+
+[http://www.nul-unu.com/blogs/bleeding-edge/feed/]
+name = Rodrigo Gallardo
+face = gigio.png
+facewidth = 62
+faceheight = 85
 
 [http://spacehunt.info/lang/en/feed?tag=Debian] 
 name = Roger So
 
-[http://roland.entierement.nu/index.php/archives/category/geek-en/rss2]
+[http://roland.entierement.nu/categories/geek-en.rss]
 name = Roland Mas
 face = lolando.png
-facewidth = 55
-faceheight = 59
+facewidth = 73
+faceheight = 88
 
-[http://orebokech.com/debian/changelog.rss]
+[http://orebokech.blogspot.com/feeds/posts/default/-/planet]
 name = Romain Francoise
 
 [http://www.burtonini.com/blog/index.rss2]
@@ -915,6 +1100,9 @@ name = Ryan Murray
 [http://stone-head.org/readme/debian/index.rss]
 name = Rudy Godoy
 
+[http://etbe.blogspot.com/atom.xml]
+name = Russell Coker
+
 [http://sam.zoy.org/blog/rss20.xml?cat=debian]
 name = Sam Hocevar
 face = hocevar2.png
@@ -924,14 +1112,10 @@ faceheight = 89
 [http://www.ringworld.org/~dieman/debianblog/index.xml]
 name = Scott Dier
 
-[http://www.netsplit.com/blog/index.atom]
+[http://www.netsplit.com/blog/xml/atom10/feed.xml]
 name = Scott James Remnant
 face = keybuk.png
 
-#[http://www.livejournal.com/users/keybuk/data/rss]
-#name = Scott James Remnant
-#face = keybuk.png
-
 [http://www.advogato.org/person/harshy/rss.xml]
 name = Sean Harshbarger
 file = harshy.png
@@ -942,7 +1126,7 @@ face = srittau.png
 facewidth = 75
 faceheight = 100
 
-[http://mixinet.net/stoblog/?flav=rss]
+[http://mixinet.net/~sto/blog.rss]
 name = Sergio Talens-Oliag
 face = sto.png
 sort_order = seen
@@ -959,13 +1143,16 @@ face = sjr.png
 facewidth = 54
 faceheight = 80
 
+[http://www.bononia.it/~zack/blog/tags/planet.rss]
+name = Stefano Zacchiroli
+
 [http://blog.sesse.net/blog/tech/?flav=rss]
 name = Steinar H. Gunderson
 face = sesse.png
 facewidth = 74
 faceheight = 85
 
-[http://blog.steve.org.uk/feed/rss2/]
+[http://blog.steve.org.uk/feed/rss2/index.php]
 name = Steve Kemp
 face = skx.png
 facewidth = 76
@@ -974,8 +1161,11 @@ faceheight= 105
 [http://www.livejournal.com/users/stevenk/data/rss/]
 name = Steve Kowalik
 
-[http://www.advogato.org/person/vorlon/rss.xml]
+[http://web.dodds.net/~vorlon/wiki/blog.rss]
 name = Steve Langasek
+face = vorlon.png
+facewidth = 68
+faceheight = 90
 
 [http://blog.einval.com/index.rss]
 name = Steve McIntyre
@@ -983,11 +1173,25 @@ face = sledge2.png
 facewidth = 59
 faceheight = 72
 
-[http://blog.eltridente.org/planets_xml]
-name = Teófilo Ruiz Suárez
-face = teo.png
-facewidth = 51
-faceheight = 80
+[http://pusling.com/blog/?feed=rss2]
+name = Sune Vuorela
+face = sune.png
+facewidth = 65
+faceheight = 90
+
+# 2004-09-18 mako
+# disabled due to 404
+# [http://blog.eltridente.org/planets_xml]
+# name = Teófilo Ruiz Suárez
+# face = teo.png
+# facewidth = 51
+# faceheight = 80
+
+[http://loeki.tv/log/feeds/index.rss2]
+name = Thijs Kinkhorst
+face = thijs.png
+facewidth = 65
+faceheight = 67
 
 [http://haecceity.clearairturbulence.org/xml/rss20/feed.xml]
 name = Thom May
@@ -999,7 +1203,8 @@ name = Thomas Viehmann
 
 [http://www.livejournal.com/users/ttroxell/data/rss]
 name = Todd Troxell
-face = troxell.png
+# image is broken somehow
+#face = troxell.png
 faceheight = 100
 facewidth = 87
 
@@ -1034,9 +1239,9 @@ faceheight = 85
 
 [http://www.damog.net/?feed=rss2&cat=5]
 name = David Moreno Garza
-face = damogzito.png
-facewidth = 70
-faceheight = 85
+face = damog.png
+facewidth = 92
+faceheight = 95
 
 [http://www.df7cb.de/blog/debian/index.rss]
 name = Christoph Berg
@@ -1044,14 +1249,16 @@ face = myon.png
 facewidth = 71
 faceheight = 95
 
-[http://www.squishy.cc/blog/wp-rss2.php?cat=1]
-name = Andres Salomon
-face = dilinger.png
-facewidth = 93
-faceheight = 94
+# 2006-09-04 mako
+# disabled due to the 404
+# [http://www.squishy.cc/blog/wp-rss2.php?cat=1]
+# name = Andres Salomon
+# face = dilinger.png
+# facewidth = 93
+# faceheight = 94
 
-#[http://nion.modprobe.de/blog/feeds/categories/2-debian.rss]
-#name = Nico Golde
+[http://nion.modprobe.de/blog/feeds/categories/2-debian.rss]
+name = Nico Golde
 
 [http://aniki.daionet.gr.jp/~knok/blog/blosxom.cgi/index.rss]
 name = NOKUBI Takatsugu
@@ -1088,11 +1295,16 @@ faceheight = 85
 # 2005-04-30 mako
 # the problems are still showing up. you didn't get it. we can try again after
 # the next version of planet is released or if you think you have it fixed again
-#[http://www.joachim-breitner.de/blog/feeds/categories/1-English.rss]
-#name = Joachim Breitner
-#face = nomeata.png
-#facewidth = 64
-#faceheight = 64
+# 2006-05-07 nomeata
+# I modified serendipity to not do what is described here. If it does not
+# help, I ll remove my feed myself. Sorry for any inconvenience.
+# http://antti-juhani.kaijanaho.fi/newblog/archives/69
+# For the record: The dates should be 2006 in this discussion.
+[http://www.joachim-breitner.de/blog/feeds/categories/1-English.rss]
+name = Joachim Breitner
+face = nomeata.png
+facewidth = 64
+faceheight = 64
 
 [http://www.hermann-uwe.de/node/feed]
 name = Uwe Hermann
@@ -1122,12 +1334,19 @@ name = Zak B. Elep
 #facewidth = 49
 #faceheight = 74
 
+# And before anyone complains - of course I have the OK :)
+# I just hope it looks ok - 2006-07-25 joerg
 [http://blog.halon.org.uk/index.rss]
 name = Neil McGovern
+#face = neilm.png
 face = neilm.png
 facewidth = 65
 faceheight = 75
 
+# Added by neilm 20070208
+[http://www.lupin.org.uk/blog/computing/index.rss]
+name = Pete Nuttall
+
 [http://people.quaqua.net/ultrotter/blog/archives/category/debian/feed]
 name = Guido Trotter
 face = ultrotter.png
@@ -1140,7 +1359,7 @@ face = mattb.png
 facewidth = 65
 faceheight = 85
 
-[http://blog.windfluechter.net/?q=taxonomy/term/1/0/feed]
+[http://blog.windfluechter.net/index.php?/feeds/categories/2-Debian.rss]
 name = Ingo Juergensmann
 
 [http://ze-dinosaur.livejournal.com/data/rss]
@@ -1155,18 +1374,75 @@ face = bureado.png
 facewidth = 80
 faceheight = 98
 
-[http://perldition.org/?view=rss]
+[http://perldition.org/blog/tags/english.rss]
 name = Florian Ragwitz
 
-[http://womble2.livejournal.com/data/rss]
+[http://womble.decadent.org.uk/blog/index.atom]
 name = Ben Hutchings
+face = benh.png
+facewidth = 109
+faceheight = 100
 
 [http://www.earth.li/~huggie/blog/tech/debian/planet/index.atom]
 name = Simon Huggins
 
-[http://www.carlospc.org/xml/rss/feed.xml]
-name = Carlos Parra Camargo
+# 2006-05-26 mako
+# please provide a feed with only english and find a way not to spam planet
+# [http://www.carlospc.org/xml/rss/feed.xml]
+# name = Carlos Parra Camargo
+
+# SoC: d-i/Hurd summer of code project (mentor: cjwatson):
+[http://xsunblog.blogspot.com/atom.xml]
+name = Matheus Morais
+
+# SoC 2006: Improve the Debian boot system (mentor: Petter Reinholdtsen)
+[http://bootdebian.blogspot.com/atom.xml]
+name = Carlos Villegas
+
+[http://otavio.ossystems.com.br/?feed=rss2&cat=3]
+name = Otavio Salvador
+face = otavio.png
+facewidth = 63
+faceheight = 85
+
+[http://blog.incase.de/index.php/category/planetdebian/feed/]
+name = Sven Mueller
+face = sven.png
+facewidth = 75
+faceheight = 95
+
+[http://www.itp.tuwien.ac.at/~mattems/blog/index.rss]
+name = Maximilian Attems
+face = maks.png
+facewidth = 110
+faceheight = 83
+
+[http://www.corsac.net/rss.php?cat=debian]
+name = Yves-Alexis Perez
+face = corsac-planet.png
+facewidth = 80
+faceheight = 81
+
+[http://andrew.mcmillan.net.nz/taxonomy/term/1/0/feed]
+name = Andrew McMillan
+face = awm.jpg
+facewidth = 68
+faceheight = 100
+
+# 20060-06-22 mako
+# this was showing up in a way that flooded things.
+# check with me before reenabling
+#[http://www.debian.org/News/weekly/dwn.en.rdf]
+#name = Debian Weekly News
+#face = dwn.png
+
+# most people like Planet to be personal blogs only - aba, 2006-08-04
+#[http://times.debian.net/?format=rss20.xml&category=-weekly-news]
+#name = DebianTimes
+
+[http://michael-prokop.at/blog/category/debian/feed/]
+name = Michael Prokop
+face = mikap.png
 
-# Debtags summer of code project:
-[http://www.alextreme.org/drupal/?q=taxonomy/term/6/0/feed]
-name = Alex de Landgraaf
+[http://foolab.org/taxonomy/term/124/0/feed]
+name = Mohammed Sameer