X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=config%2Fconfig.ini;h=95a23bb38334daf77fd6d9b92d6212bda1bae031;hb=9b7d927b238eae2575efccf2b4b5b985b254ff50;hp=2717a2e06d9055c025cc6359c5e4f3cc19e59218;hpb=353da2cbfdeb8a068c60b0cdfd8fb7f8c6b59209;p=deb%2Fhackedgotchi.git

diff --git a/config/config.ini b/config/config.ini
index 2717a2e..bc40c48 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,23 +72,36 @@ faceheight = 85
 # face = filename of your hackergotchi in heads (or leave out entirely)
 # facewidth/faceheight = size of your hackergotchi, if not default
 
-[http://bostoncoop.net/adam/weblog/index.rss]
-name = Adam Kessel
+# 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
 face = kessel.png
 faceheight = 99
 
-[http://goonie.us.es/~adeodato/temporary-location-of-my-blog/rss/debian.xml]
+[http://chistera.yi.org/~adeodato/blog/rss/debian.xml]
 name = Adeodato Simó
-face = dato.png
-facewidth = 81
-faceheight = 95
 
-[http://aigarius.blogspot.com/atom.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
@@ -99,7 +112,7 @@ face = formorer.png
 facewidth = 94
 faceheight = 101
 
-[http://www.sukria.net/en/feed/rss2/]
+[http://www.sukria.net/en/archives/category/debian/rss2/]
 name = Alexis Sukrieh
 face = sukria.png
 
@@ -108,49 +121,69 @@ name = Amaya Rodrigo
 face = amaya.png
 faceheight = 111
 
-[http://www.advogato.org/person/andrelop/rss.xml]
+[http://www.progsoc.org/~wildfire/aum/index.rss]
+name = Anand Kumria
+
+[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://www.bebt.de/blog/debian/rss.xml]
+name = Andreas Metzler
+
+[http://andreeleidenfrost.blogspot.com/atom.xml]
+name = Andree Leidenfrost
+face = andree.png
+facewidth = 92
+faceheight = 112
+
+
+[http://www.andressh.net/rss/andressh.xml]
+face = andressh.png
+name = Andres Seco Hernandez
+
 [http://blog.andrew.net.au/planetdebian/index.rss]
 name = Andrew Pollock
 face = apollock.png
 facewidth = 88
 faceheight = 103
 
-[http://www.advogato.org/person/rotty/rss.xml]
+[http://rottylog.yi.org/wp-rss2.php]
 name = Andreas Rottmann
 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.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
 faceheight = 96
 
-[http://www.kaijanaho.info/antti-juhani/blog/en/index.rss]
+[http://antti-juhani.kaijanaho.info/newblog/archives/category/english/feed]
 name = Antti-Juhani Kaijanaho
 face = antti.png
 facewidth = 79
 faceheight = 96
 
-[http://www.livejournal.com/users/go_team_ari/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
@@ -162,18 +195,45 @@ face = aurel32.png
 facewidth = 65
 faceheight = 85
 
+[http://noone.org/blog/English/index.rss]
+name = Axel Beckert
+face = xtaran.png
+facewidth = 102
+faceheight = 104
+
 [http://www.yepthatsme.com/wp-feed.php?feed=rss2&cat=9]
 name = Barry Hawkins
 face = barryh.png
 facewidth = 65
 faceheight = 85
 
+[http://jabba.pl/rss?fenio]
+name = Bartosz Feński
+face = fenio.png
+facewidth = 94
+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://www.gag.com/cgi-bin/blosxom/index.rss]
 name = Bdale Garbee
 face = bdale.png
 facewidth = 58
 
-[http://www.grassouille.org/blogmax/rss.xml]
+[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
 facewidth = 72
@@ -185,9 +245,24 @@ face = mako.gif
 facewidth = 65
 faceheight = 93
 
+[http://blog.dlgeek.net/?feed=rss2&cat=5]
+name = Benjamin Seidenberg
+face = astronut.png
+
+[http://pcpool00.mathematik.uni-freiburg.de/~brl/blog/changelog.rss]
+name = Bernhard R. Link
+
+[http://healthhacker.org/satoroams/?feed=rss2&cat=10&cat=2&cat=28]
+name = Biella Coleman
+face = biella.png
+facewidth= = 90
+faceheight = 90
+
 [http://necrotic.deadbeast.net/~branden/blog/exuberance?flav=rss]
 name = Branden Robinson
-# Let me come up with my own "hackergotchi", please.  :-/  --BR, 2005-05-03
+face = branden.png
+facewidth = 90
+faceheight = 103
 
 [http://www.sommitrealweird.co.uk/blog/?flav=atom]
 name = Brett Parker
@@ -201,7 +276,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
@@ -213,24 +288,45 @@ name = Chris Anderson
 [http://cheney.cx/site/blog/feed/atom/]
 name = Chris Cheney
 
-[http://frisia.middle-earth.us/feed/]
+[http://frisia.middle-earth.us/archives/category/planet/feed]
 name = Christine Spang
 face = christine.png
 facewidth = 78
 faceheight = 95
 
-[http://xana.scru.org/cgi-bin/blosxom/index.atom]
+[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
+face = cjwatson.png
+facewidth = 70
+faceheight = 82
 
 [http://www.advogato.org/person/seeS/rss.xml]
 name = Craig Small
 
+[http://blog.daniel-baumann.ch/planet-debian-aggregator/index.rss]
+name = Daniel Baumann
+face = daniel.png
+facewidth = 94
+faceheight = 102
+
 [http://lambdaman.blogspot.com/atom.xml]
 name = Daniel Burrows
 face = dburrows.png
@@ -240,6 +336,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
@@ -264,7 +363,13 @@ name = Daniel Stone
 face = daniels.png
 faceheight = 107
 
-[http://www.livejournal.com/users/gravityboy/data/rss]
+[http://dannf.org/bloggf?flav=rss]
+name = Dann Frazier
+face = dannf.png
+facewidth = 64
+faceheight = 89
+
+[http://gravityboy.livejournal.com/data/rss]
 name = David Nusinow
 face = dnusinow.png
 faceheight = 85
@@ -275,6 +380,23 @@ 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
+
+# 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
 face = dirk.png
@@ -286,6 +408,15 @@ face = edd.png
 facewidth = 62
 faceheight = 80
 
+[http://ramblingfoo.blogspot.com/feeds/posts/default]
+name =  Eddy Petrișor
+face = eddy.png
+facewidth = 100
+faceheight = 109
+
+[http://www.enricozini.org/blog/pdo.rss]
+name = Enrico Zini
+
 [http://ema.homeip.net/blog/debian/?flav=rss]
 name = Emanuele Rocca
 face = ema.png
@@ -301,21 +432,30 @@ face = erich.png
 facewidth = 76
 faceheight = 100
 
-[http://cytosine.org/~helix/lemonade/?flav=rss]
+[http://erinn.org/itis/lieutenant/index.rss]
 name = Erinn Clark
 face = erinn.png
 facewidth = 70
 faceheight = 81
 
+[http://evan.prodromou.name/rss]
+name = Evan Prodromou
+face = evan.png
+facewidth = 65
+faceheight = 85
+
 [http://www.fabbione.net/blog?flav=rss]
 name = Fabio M. Di Nitto
 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
@@ -328,25 +468,46 @@ 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
 
+# 2006-09-04 mako
+# disabled due to 404
+# [http://frankiebloggie.blogspot.com/atom.xml]
+# name = Francesco P. Lovergine
+# face = frankie.png
+# facewidth = 97
+# faceheight = 114
+
 [http://ukai.org/b/log/debian/?flav=rss]
 name = Fumitoshi Ukai
 face = ukai.png
 facewidth = 65
 faceheight = 85
 
-[http://weinholt.se/weblog/debian?flav=rss]
-name = Göran Weinholt
-
 [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
@@ -357,17 +518,32 @@ faceheight = 85
 [http://www.gotom.jp/~gotom/cgi-bin/blosxom.cgi/index.rss]
 name = GOTO Masanori
 
-[http://www.gwolf.org/xml/blog.rss]
+[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
+
+[http://www.gwolf.org/data/xml/blog.rss]
 name = Gunnar Wolf
 face = gwolf.png
 facewidth = 60
 faceheight = 102
 
+[http://stratusandtheswirl.blogspot.com/atom.xml]
+name = Gustavo Franco
+face = stratus.png
+facewidth = 71
+faceheight = 95
+
 [http://www.advogato.org/person/kov/rss.xml]
 name = Gustavo Noronha Silva
 face = kov.png
-facewidth = 74
-faceheight = 67
+facewidth = 65
+faceheight = 86
 
 [http://www.advogato.org/person/gadek/rss.xml]
 name = Grzegorz B. Prokopski
@@ -378,19 +554,19 @@ face = hanna.png
 facewidth = 59
 faceheight = 85
 
-# Removed, 2005-04-30
-# -- please provide a feed without Progeny advertising content
-# -- readded -- Norbert Tretkowski
-# -- Please yank all Ubuntu/Progeny/RedHat mentioning blogs, or
-#    formulate a proper policy, and communicate that _first_ before
-#    yanking feeds -- Manoj Srivastava
+[http://layer-acht.org/blog/debian/changelog.rss]
+name = Holger Levsen
+face = h01ger.png
+facewidth = 86
+faceheight= 110
+
 [http://ianmurdock.com/index-full.xml]
 name = Ian Murdock
 face = imurdock.png
 facewidth = 79
 faceheight = 109
 
-[http://genibel.org/blog/rss.php]
+[http://genibel.org/blog/rss.php?cat=Debian]
 name = Igor Genibel
 face = igor.genibel.png
 facewidth = 65
@@ -435,33 +611,46 @@ faceheight = 102
 [http://phython.blogspot.com/atom.xml]
 name = 	James Morrison
 
-# BANNED -06oct04, keybuk
-#
-# [http://mars.ephaone.org/cgi-bin/pyblosxom.cgi?flav=rss]
-# name = Jean-Michel Kelbert 
-#
-# DO NOT UNDER ANY CIRCUMSTANCES UNCOMMENT THIS ENTRY.
+[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 
 
-[http://www.raspberryginger.com/jbailey/weblog/?flav=rss]
+[http://jbailey.livejournal.com/data/rss]
 name = Jeff Bailey
 
 [http://www.licquia.org/wp-rss2.php?cat=6]
 name = Jeff Licquia
 
-[http://beta.pumuki.org/?q=blog/feed/1]
+[http://jeroen.wolffelaar.nl/blog/debian.rss]
+name = Jeroen van Wolffelaar
+
+# 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://snipsnap.wendlandnet.de/digital-life/exec/rss?snip=start]
+[http://www.wendlandnet.de/joerg/blog/en/index.rss]
 name = Joerg Wendland
 face = jwendland.png
 faceheight = 89
@@ -472,15 +661,31 @@ face = joeyh2.png
 facewidth = 84
 faceheight = 75
 
-[http://changelog.complete.org/rss.xml]
+[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
@@ -495,8 +700,8 @@ faceheight = 92
 [http://www.livejournal.com/users/np237/data/rss]
 name = Josselin Mouette
 face = np237.png
-facewidth = 71
-faceheight = 70
+facewidth = 103
+faceheight = 137
 
 [http://blog.technologeek.org/feed]
 name = Julien Blache
@@ -506,6 +711,9 @@ faceheight = 89
 
 [http://julien.danjou.info/blog/rss.php?lang=en]
 name = Julien Danjou
+face = jdanjou.png
+facewidth = 100 
+faceheight = 84
 
 [http://www.netfort.gr.jp/~dancer/diary/recententry-en.rdf]
 name = Junichi Uekawa
@@ -524,8 +732,8 @@ name = Kevin Rosenberg
 [http://kmuto.jp/b.cgi/debian/index.rss]
 name = Kenshi Muto
 face = kmuto.png
-facewidth = 64
-faceheight = 97
+facewidth = 68
+faceheight = 101
 
 [http://blog.kyle.mcmartin.ca/?feed=rss2]
 name = Kyle McMartin
@@ -535,7 +743,19 @@ faceheight = 100
 [http://liw.iki.fi/liw/log/log.rss]
 name = Lars Wirzenius
 
-[http://www.golden-gryphon.com/blog/manoj/index.rss10]
+[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 = 65
+faceheight = 70 
+
+[http://www.golden-gryphon.com/blog/manoj/index.rss]
 name = Manoj Srivastava
 face = manoj2.png
 facewidth = 65
@@ -543,37 +763,59 @@ faceheight = 83
 
 [http://gonzo.dicp.de/~he/blog/feeds/index.rss2]
 name = Marc 'HE' Brockschmidt
+face = he.png
+facewidth = 80
+faceheight = 81
 
-[http://blog.bofh.it/?format=atom]
-name = Marco d'Itri
-face = marco2.png
+[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 = 86
+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
+facewidth = 65
+faceheight = 103
 
-#[http://www.sirena.org.uk/log/?feed=rss2]
-#name = Mark Brown
+[http://blog.marioiseli.com/index.php/feed]
+name = Mario Iseli
+face = marioiseli.png
+facewidth = 70
+faceheight = 96
 
-[http://www.livejournal.com/users/broonie/data/rss]
+[http://www.sirena.org.uk/log/?feed=atom]
 name = Mark Brown
 
-[http://www.ftbfs.de/~zobel/cgi-bin/blosxom/index.rss]
+[http://blog.zobel.ftbfs.de/feed/]
 name = Martin Zobel-Helas
 face = zobel.png
 
 [http://tildemh.com/blog/debian/index.rss]
 name = Mark Howard
 
-[http://www.iki.fi/q-funk/index.rdf]
+[http://q-funk.blogspot.com/atom.xml]
 name = Martin-Éric Racine
 face = qfunk.png
 facewidth = 57
 
+[http://blog.madduck.net/?flav=rss20]
+name = Martin F. Krafft
+face = madduck.png
+facewidth = 75
+faceheight = 94
+
 [http://www.cyrius.com/journal/?flav=atom]
 name = Martin Michlmayr
 face = tbm.png
@@ -581,17 +823,20 @@ facewidth = 67
 faceheight = 90
 
 [http://www.infodrom.org/~joey/log/joey.rdf]
-name = Martin 'Joey' Schulze
+name = Joey Schulze
 
-[http://www.mhatta.org/blosxom/blosxom.cgi/index.rss]
+[http://mhatta.livejournal.com/data/rss]
 name = Masayuki Hatta
+face = mhatta.png
+facewidth = 77
+faceheight = 85
 
 [http://www.advogato.org/person/mbrubeck/rss.xml]
 name = Matt Brubeck
 face = mbrubeck.png
 faceheight = 88
 
-[http://logicvortex.net/diary/debian/index.rss10]
+[http://logicvortex.net/diary/planetdebian/index.rss10]
 name = Matt Hope
 face = dopey.png
 faceheight = 65
@@ -599,15 +844,23 @@ facewidth = 66
 
 [http://www.livejournal.com/users/mjg59/data/rss]
 name = Matthew Garrett
-face = mjg59-pig.png
-facewidth = 65 
+face = mjg59.png
+facewidth = 69
 faceheight = 85
 
 [http://www.advogato.org/person/mjg59/rss.xml]
 name = Matthew Garrett
-face = mjg59.png
-facewidth = 72
-faceheight = 83
+face = mjg59-hypno.gif
+facewidth = 69
+faceheight = 85
+#facewidth = 72
+#faceheight = 83
+
+[http://www.hezmatt.org/~mpalmer/blog/general/index.rss]
+name = Matthew Palmer
+face = mpalmer.png
+facewidth = 55
+faceheight = 70
 
 [http://www.livejournal.com/users/smurf_debian/data/rss]
 name = Matthias Urlichs
@@ -615,23 +868,46 @@ face = smurf.png
 facewidth = 65
 faceheight = 85
 
+[http://www.itp.tuwien.ac.at/~mattems/blog/index.rss]
+name = Maximilian Attems
+
+[http://blog.alphascorpii.net/index.rss]
+name = Meike Reichle
+face = alphascorpii.png
+faceheight = 85
+facewidht = 61
+
 [http://www.advogato.org/person/mbanck/rss.xml]
 name = Michael Banck
 face = azeem.png
 facewidth = 64
-faceheight = 80
+faceheight = 79
 
-[http://www.base0.net/feed/atom/]
+# 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
+
+[http://xerakko.livejournal.com/data/rss]
+name = Miguel Gea
+face = miguelgea.png
+facewidth = 70
+faceheight = 79
+
 [http://www.debianslashrules.org/index.rss20]
 name = Mike Beattie
 face = mjb.png
 facewidth = 77
 faceheight = 97
 
+[http://web.glandium.org/blog/?feed=rss2&cat=5]
+name = Mike Hommey
+
 [http://mjr.towers.org.uk/blog/all.rss]
 name = MJ Ray
 face = mjray2.png
@@ -640,10 +916,17 @@ faceheight = 94
 [http://www.livejournal.com/users/morayallan/data/rss]
 name = Moray Allan
 face = moray.png
-facewidth = 66
+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/index.rss]
+[http://www.inittab.de/blog/?flav=rss20]
 name = Norbert Tretkowski
 face = nobse.png
 faceheight = 106
@@ -659,24 +942,48 @@ 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
+
 [http://www.pure64.net/cgi-bin/blosxom/computer/index.rss]
 name = Per-Arne Hellarvik
+face = per-arne.png
+facewidth = 65
+faceheight = 85
 
 [http://www.advogato.org/person/weasel/rss.xml]
 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.madism.org/rss.php?cat=Debian]
+[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
 face = phabouzit.png
 facewidth = 64
@@ -687,24 +994,29 @@ name = Pierre Machard
 face = machard.png
 faceheight = 84
 
-[http://www.hackgnu.org/cgi-bin/pyblosxom.cgi/debian/?flav=rss]
-name = Ramakrishnan Muthukrishnan
+[http://people.debian.org/~dexter/dexter.jogger.pl.rss]
+name = Piotr Roszatycki
+face = dexter.png
+facewidth = 65
+faceheight = 89
 
-[http://www.khensu.org/xml-rss2.php?full=yes]
+[http://khensu.org/xml-rss2.php?full=yes]
 name = Randall Donald
 face = rdonald.png
 facewidth = 85
+faceheight = 85
 
 [http://www.ouaza.com/wordpress/category/debian/feed/]
 name = Raphaël Hertzog
+face = hertzog.png
+facewidth = 62
+faceheight = 90
 
-[http://remi.vanicat.free.fr/blog/index.php/category/flos/feed/]
-name = Remi Vanicat
+[http://giskard.noblogs.org/rss.php?categoryId=89]
+name = Riccardo Setti
 
-# 2005-07-06 jordi
-# Feed is 404.
-# [http://pluto.dyndns.info:11811/blog?flav=rss]
-# name = Rene Engelhard
+[http://remi.vanicat.free.fr/blog/index.php/category/debian-planet/feed/]
+name = Remi Vanicat
 
 [http://www.livejournal.com/users/nchip/data/rss]
 name = Riku Voipio
@@ -712,37 +1024,49 @@ 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/]
+name = Rob Taylor
+
 [http://advogato.org/person/robertc/rss.xml]
 name = Robert Collins
 
 [http://www.robot101.net/feed/]
 name = Robert McQueen
 
-[http://spacehunt.info/rss.php]
+[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/rss2]
+[http://roland.entierement.nu/categories/geek-en.rss]
 name = Roland Mas
 face = lolando.png
-facewidth = 55
-faceheight = 59
-
-[http://orebokech.com/debian/changelog.rss]
-name = Romain Francoise
+facewidth = 73
+faceheight = 88
 
-[http://www.burtonini.com/blog/?flav=rss]
+[http://www.burtonini.com/blog/index.rss2]
 name = Ross Burton
 face = ross.png
-facewidth = 60
-faceheight = 78
+facewidth = 69
+faceheight = 85
 
 [http://www.advogato.org/person/neuro/rss.xml]
 name = Ryan Murray
 
-[http://www.advogato.org/person/sh/rss.xml]
+[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
 facewidth = 65
@@ -751,14 +1075,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
@@ -769,21 +1089,33 @@ face = srittau.png
 facewidth = 75
 faceheight = 100
 
-[http://www.advogato.org/person/seb128/rss.xml]
-name = Sebastien Bacher
-
-[http://mixinet.net/stoblog/?flav=rss]
+[http://mixinet.net/~sto/blog.rss]
 name = Sergio Talens-Oliag
 face = sto.png
 sort_order = seen
 
-[http://www.law.yi.org/~sfllaw/cgi-bin/ljtagfeed.py/debian:]
+[http://www.law.yi.org/~sfllaw/cgi-bin/ljtagfeed.py/p.d.o]
 name = Simon Law
 face = slaw.png
 facewidth = 74
 faceheight = 78
 
-[http://blog.steve.org.uk/feed/rss2/]
+[http://www.hogyros.de/?q=blog/feed/1]
+name = Simon Richter
+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/index.php]
 name = Steve Kemp
 face = skx.png
 facewidth = 76
@@ -792,11 +1124,11 @@ faceheight= 105
 [http://www.livejournal.com/users/stevenk/data/rss/]
 name = Steve Kowalik
 
-[http://blog.lavalamp.ca/xml/rss/feed.xml]
-name = Steven Baker
-
-[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
@@ -804,20 +1136,32 @@ 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
+# 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://blog.clearairturbulence.org/?flav=rss]
+[http://haecceity.clearairturbulence.org/xml/rss20/feed.xml]
 name = Thom May
 face = thom.png
 facewidth = 59
 
+[http://thomas.viehmann.net/halbgar/english/?flav=rss]
+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
 
@@ -828,6 +1172,9 @@ faceheight = 92
 
 [http://zinosat.blogspot.com/atom.xml]
 name = Davide Viti
+face = zinosat.jpg
+facewidth = 85
+faceheight = 110
 
 [http://www.wiggy.net/index.atom]
 name = Wichert Akkerman
@@ -847,34 +1194,33 @@ face = jurij.png
 facewidth = 71
 faceheight = 85
 
-[http://damog.puntodeb.net/english-blog.rss]
+[http://www.damog.net/?feed=rss2&cat=5]
 name = David Moreno Garza
 face = damog.png
-facewidth = 87
-faceheight = 115
+facewidth = 92
+faceheight = 95
 
 [http://www.df7cb.de/blog/debian/index.rss]
 name = Christoph Berg
 face = myon.png
-facewidth = 68
-faceheight = 90
+facewidth = 71
+faceheight = 95
 
-[http://weblog.dividedsky.net/~dilinger/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.supersized.org/feeds/categories/1-debian.rss]
-name = Nico Golde
-face = ngolde.png
-facewidth = 65
-faceheight = 84
+#[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
 
-[http://www.red-bean.com/~decklin/blog/tech?flav=atom]
+[http://blog.rupamsunyata.org/feed/planet.xml]
 name = Decklin Foster
 face = decklin.png
 facewidth = 60
@@ -886,16 +1232,32 @@ face = blade.png
 facewidth = 78
 faceheight = 90
 
-[http://www.meebey.net/jaws/data/xml/blog.Debian.rss]
-name = Mirco Bauer
+#removed on user request
+#[http://www.meebey.net/jaws/data/xml/blog.Debian.rss]
+#name = Mirco Bauer
 
-[http://www.perrier.eu.org/weblog/index.rss]
+[http://www.perrier.eu.org/weblog/bubulle/planet-debian/index.rss]
 name = Christian Perrier
 face = bubulle.png
 facewidth = 69
 faceheight = 85
 
-[http://www.joachim-breitner.de/blog/feeds/categories/1.rss]
+# 2005-02-11 mako
+# most recent entry about fixing the blog keeps showing up on top of
+# planet. the old problem may be fixed but this blog is still badly
+# broken.  please check with me *before* re-enabling
+# 2005-04-01 nomeata
+# applied fix as described on http://changelog.complete.org/posts/469-Dupes-really-fixed-now.html
+# re-enabled feed. daily snapshots in ~nomeata/feed-watch
+# 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
+# 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
@@ -904,3 +1266,120 @@ faceheight = 64
 [http://www.hermann-uwe.de/node/feed]
 name = Uwe Hermann
 
+[http://www.hermann-uwe.de/node/feed]
+name = Uwe Hermann
+
+# gtklp-sponsee, added by Andreas Metzler.
+# Please kick me if zakame's feed is broken.
+[http://zakame.spunge.org/index.rss]
+name = Zak B. Elep
+
+# 2005-07-18 jordi
+# Disabled due to broken links and continous reposting of
+# already seen posts. Informed Horms.
+# 2006-01-15
+# Renabled because I think its fixed. I will monitor it and
+# re-disable it if this is not the case
+# 2006-01-30 damog:
+#  I hope nobody minds if I place his real name here.
+# 2006-01-31 mako
+# It's not fixed. Your latest post has been on the top of planet for a couple
+# days now. Please check with me *before* you re-enable.
+#[http://www.vergenet.net/~horms/pleb_blossom/atom.xml]
+#name = Simon Horman
+#face = horms.png
+#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
+
+[http://people.quaqua.net/ultrotter/blog/archives/category/debian/feed]
+name = Guido Trotter
+face = ultrotter.png
+facewidth = 65
+faceheight = 83
+
+[http://www.mattb.net.nz/blog/wp-rss2.php?cat=3,4]
+name = Matt Brown
+face = mattb.png
+facewidth = 65
+faceheight = 85
+
+[http://blog.windfluechter.net/?q=taxonomy/term/1/0/feed]
+name = Ingo Juergensmann
+
+[http://ze-dinosaur.livejournal.com/data/rss]
+name = Eric Dorland
+face = eric.png
+facewidth = 65
+faceheight = 91
+
+[http://blog.bureado.com.ve/?feed=rss2&cat=12]
+name = José Parrella
+face = bureado.png
+facewidth = 80
+faceheight = 98
+
+[http://perldition.org/blog/tags/english.rss]
+name = Florian Ragwitz
+
+[http://womble2.livejournal.com/data/rss]
+name = Ben Hutchings
+face = benh.png
+facewidth = 109
+faceheight = 100
+
+[http://www.earth.li/~huggie/blog/tech/debian/planet/index.atom]
+name = Simon Huggins
+
+# 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
+
+[http://www.corsac.net/rss.php?cat=debian]
+name = Yves-Alexis Perez
+face = corsac-planet.png
+facewidth = 80
+faceheight = 81
+
+# 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