X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=config%2Fconfig.ini;h=58b07735d4f4b6dacca668be379fedab0bd7111a;hb=d1dfa7280bbc657cacf2450fa58e74e16b101c3c;hp=85702a95e093b76a987b9d5c8477f45116c8e3d6;hpb=9cf3b3beff3edb9641e27ab94e7089385073b888;p=deb%2Fhackedgotchi.git

diff --git a/config/config.ini b/config/config.ini
index 85702a9..36bc3eb 100644
--- a/config/config.ini
+++ b/config/config.ini
@@ -19,7 +19,7 @@ new_feed_items = 1
 log_level = DEBUG
 
 # template_files: Space-separated list of output template files
-template_files = templates/index.html.tmpl planet/examples/rss20.xml.tmpl planet/examples/rss10.xml.tmpl planet/examples/opml.xml.tmpl planet/examples/foafroll.xml.tmpl
+template_files = templates/index.html.tmpl templates/rss20.xml.tmpl templates/rss10.xml.tmpl templates/opml.xml.tmpl templates/foafroll.xml.tmpl
 
 # The following provide defaults for each template:
 # output_dir: Directory to place output files
@@ -72,21 +72,20 @@ faceheight = 85
 # face = filename of your hackergotchi in heads (or leave out entirely)
 # facewidth/faceheight = size of your hackergotchi, if not default
 
-# 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://chistera.yi.org/~adeodato/blog/rss/debian.xml]
+[http://chistera.yi.org/~adeodato/blog/index.xml]
 name = Adeodato Simó
 
+[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
@@ -100,7 +99,7 @@ name = Alexander Sack
 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
@@ -110,21 +109,35 @@ faceheight = 101
 name = Alexis Sukrieh
 face = sukria.png
 
+# 2007-07-22 mako: disabled due to 500
+# 2007-07-24 mako: reenabled -- blog was just down
+[http://blog.sceal.ie/index.rss]
+name = Alastair McKinstry
+
 [http://www.livejournal.com/users/amayita/data/rss/]
 name = Amaya Rodrigo
 face = amaya.png
 faceheight = 111
 
+[http://ekaia.org/blog/?cat=5&feed=rss2]
+name = Ana Beatriz Guerrero Lopez
+
 [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://blog.ibluepaper.com/?feed=rss2&cat=4]
+name = Andrea Veri
+face = bluekuja.png
+facewidth = 70
+faceheight = 95
+
 [http://blogs.turmzimmer.net/en/index.rss]
 name = Andreas Barth
 
-[http://downhill.g.la/blog/debian/atom.xml]
+[http://www.bebt.de/blog/debian/rss.xml]
 name = Andreas Metzler
 
 [http://andreeleidenfrost.blogspot.com/atom.xml]
@@ -150,12 +163,20 @@ face = rotty.jpg
 facewidth = 95
 faceheight = 115
 
-# 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
 
@@ -171,23 +192,19 @@ 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]
-name = Arnaud Vandyck
-face = avdyk.png
-facewidth = 65
-faceheight = 82
+# 2007-07-22 mako
+# disabled due to 500
+# [http://www.edev.be/taxonomy/term/1/0/feed]
+# name = Arnaud Vandyck
+# face = avdyk.png
+# facewidth = 65
+# faceheight = 82
 
 [http://blog.aurel32.net/wp-rss2.php?cat=1]
 name = Aurelien Jarno
@@ -219,9 +236,15 @@ face = baruch.png
 facewidth = 77
 faceheight = 100
 
-[http://bblank.thinkmo.de/blog/topics/Debian/@@rss.xml]
+[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
@@ -249,14 +272,22 @@ faceheight = 93
 name = Benjamin Seidenberg
 face = astronut.png
 
+[http://bzed.de/lib/plugins/feed/feed.php?plugin=blog&fn=getBlog&ns=blog&title=Blog]
+name = Bernd Zeimetz
+face = bzed.png
+facewidth = 73
+faceheight = 98
+
 [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
+
+# biella tries to get a new one
+# face = biella.png
+# facewidth= = 90
+# faceheight = 90
 
 [http://necrotic.deadbeast.net/~branden/blog/exuberance?flav=rss]
 name = Branden Robinson
@@ -264,6 +295,12 @@ face = branden.png
 facewidth = 90
 faceheight = 103
 
+[http://www.imbrandon.com/tag/planet-debian/feed]
+name = Brandon Holtsclaw
+face = imbrandon.png
+facewidth = 85
+faceheight = 85
+
 [http://www.sommitrealweird.co.uk/blog/?flav=atom]
 name = Brett Parker
 
@@ -276,23 +313,46 @@ face = pyro.png
 facewidth = 71
 faceheight = 102
 
-[http://www.livejournal.com/users/claviola/rss]
+[http://bgoglin.livejournal.com/data/rss?tag=planet.d.o]
+name = Brice Goglin
+
+# 2007-04-25 ajt -- Summer of Code 2007 student
+[http://www.cs.sfu.ca/~camerond/personal/blog/index.rss]
+name = Cameron Dale
+
+[http://zork.net/~clavicle/dongs/claviola/debian]
 name = Carlos Laviola
 face = claviola.png
 facewidth = 95
 faceheight = 115
 
+# from the extremadura people
+[http://cek.bitacoras.com/archivos/category/english/feed/]
+name = César Gómez Martín
+
 [http://debian.nullcode.org/b/index.rss]
 name = Chris Anderson
 
-[http://cheney.cx/site/blog/feed/atom/]
-name = Chris Cheney
+[http://crispygoth.livejournal.com/data/rss?tag=planet]
+name = Chris Butler
+# disabled due to looking terrible
+# face = chrisb.png
+# facewidth = 66
+# faceheight = 85
+
+# 2007-07-22 mako
+# disabled due to 404
+# [http://cheney.cx/site/blog/feed/atom/]
+# name = Chris Cheney
+
+[http://chris-lamb.co.uk/blog/category/planet-debian/feed/]
+name = Chris Lamb
 
-[http://frisia.middle-earth.us/archives/category/planet/feed]
+[http://blog.spang.cc/xml/rss20/tag/planet/feed.xml]
 name = Christine Spang
 face = christine.png
-facewidth = 78
-faceheight = 95
+facewidth = 100
+faceheight = 100
 
 [http://beta.blogger.com/feeds/9012838934751300850/posts/full]
 name = Christophe Prud'homme
@@ -303,31 +363,36 @@ faceheight = 99
 
 [http://xana.scru.org/index.atom]
 name = Clint Adams
+face = clint.png
+facewidth = 80
+faceheight = 88
 
-# 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]
+[http://www.chiark.greenend.org.uk/ucgi/~cjwatson/blosxom/index.rss]
 name = Colin Watson
 face = cjwatson.png
 facewidth = 70
 faceheight = 82
 
+[http://cord.de/blog/rss.php?c=1]
+name = Cord Beermann
+
 [http://www.advogato.org/person/seeS/rss.xml]
 name = Craig Small
 
+[http://ikibiki.org/tags/debian/index.rss]
+name = Cyril Brulebois
+
+# 2007-07-22 mako
+# disabled due to 500
+# 2007-09-04 daniel
+# re-enabled
 [http://blog.daniel-baumann.ch/planet-debian-aggregator/index.rss]
 name = Daniel Baumann
-face = panthera.png
+face = daniel.png
 facewidth = 94
 faceheight = 102
 
-[http://lambdaman.blogspot.com/atom.xml]
+[http://algebraicthunk.net/~dburrows/blog/index.atom]
 name = Daniel Burrows
 face = dburrows.png
 facewidth = 80
@@ -345,6 +410,9 @@ face = codebreaker.png
 facewidth = 66
 faceheight = 91
 
+[http://www.wgdd.de/?feed=rss2&cat=2]
+name = Daniel Leidert
+
 # Disabled because it's not used any more and not right to feed pdn
 # [http://www.livejournal.com/users/terryfish/data/rss]
 # name = Daniel Silverstone
@@ -369,6 +437,9 @@ face = dannf.png
 facewidth = 64
 faceheight = 89
 
+[http://mrdaven.mine.nu/cgi-bin/blosxom/index.rss]
+name = Dave Noble
+
 [http://gravityboy.livejournal.com/data/rss]
 name = David Nusinow
 face = dnusinow.png
@@ -380,7 +451,7 @@ name = David Pashley
 face = jd.png
 faceheight = 84
 
-[http://planetwatson.co.uk/blog/feed/atom/]
+[http://planetwatson.co.uk/blog/feed/]
 name = David Watson
 face = dwatson.png
 facewidth = 65
@@ -391,27 +462,33 @@ 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://blog.debconf.org/blog/index.rss11]
+name = DebConf team
+face = debconf8.png
+facewidth = 201
+faceheight = 64
 
 [http://dirk.eddelbuettel.com/blog/index.rss]
 name = Dirk Eddelbuettel
 face = dirk.png
 faceheight = 90
 
-[http://usefulinc.com/edd/blog/rss91]
+[http://times.usefulinc.com/tag/linux/atom]
 name = Edd Dumbill
 face = edd.png
 facewidth = 62
 faceheight = 80
 
+[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
@@ -432,7 +509,7 @@ face = erinn.png
 facewidth = 70
 faceheight = 81
 
-[http://evan.prodromou.name/rss]
+[http://evan.prodromou.name/rss1]
 name = Evan Prodromou
 face = evan.png
 facewidth = 65
@@ -444,7 +521,7 @@ 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]
@@ -468,16 +545,17 @@ face = filippo.png
 facewidth = 65
 faceheight = 86
 
-[http://www.livejournal.com/users/djpig/data/rss]
+[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://frankiebloggie.blogspot.com/atom.xml]
+name = Francesco P. Lovergine
+face = frankie.png
+facewidth = 97
+faceheight = 114
+
+[http://alioth.debian.org/~fjp/log/index.rss]
+name = Frans Pop
 
 [http://ukai.org/b/log/debian/?flav=rss]
 name = Fumitoshi Ukai
@@ -485,9 +563,13 @@ face = ukai.png
 facewidth = 65
 faceheight = 85
 
-[http://ganneff.de/blog/index.rss]
+#[http://ganneff.de/blog/index.rss]
+[http://blog.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
@@ -496,29 +578,37 @@ faceheight = 91
 
 [http://alfie.ist.org/blog/index.rss]
 name = Gerfried Fuchs
-face = alfie3.png
-facewidth  = 86
-faceheight = 111
+face = rhonda.png
+facewidth  = 89
+faceheight = 84
 
-[http://bonehunter.rulez.org/~algernon/blog/index.atom]
-name = Gergely Nagy
-face = algernon.png
-facewidth = 110
-faceheight = 85
+# 2007-07-22 mako
+# disabled due to 500
+# [http://bonehunter.rulez.org/~algernon/blog/index.atom]
+# name = Gergely Nagy
+# face = algernon.png
+# facewidth = 110
+# 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 Boudr
+name = Gonéri Le Bouder
 face = goneri.png
 facewidth = 57
 faceheight = 110
 
+[http://info.comodo.priv.at/blog/archives/cat_5/index-rss.xml]
+name = Gregor Herrmann
+face = gregoa.png
+facewidth = 65
+faceheight = 85
+
 [http://fatalerror-debian.blogspot.com/atom.xml]
 name = Guilherme de S. Pastore
 
-[http://www.gwolf.org/data/xml/blog.rss]
+[http://www.gwolf.org/index.php?gadget=Blog&action=RSS]
 name = Gunnar Wolf
 face = gwolf.png
 facewidth = 60
@@ -530,6 +620,10 @@ face = stratus.png
 facewidth = 71
 faceheight = 95
 
+# Debian Maintainer, SoC 2007 student; mentor is Loic Minier (lool)
+[http://grmontesino.blogspot.com/feeds/posts/default/-/Debian/]
+name = Gustavo R. Montesino
+
 [http://www.advogato.org/person/kov/rss.xml]
 name = Gustavo Noronha Silva
 face = kov.png
@@ -551,12 +645,18 @@ face = h01ger.png
 facewidth = 86
 faceheight= 110
 
+[http://www.ianhaken.com/rss.php]
+name = Ian Haken
+
 [http://ianmurdock.com/index-full.xml]
 name = Ian Murdock
 face = imurdock.png
 facewidth = 79
 faceheight = 109
 
+[http://www.technovelty.org/index.rss]
+name = Ian Wienand
+
 [http://genibel.org/blog/rss.php?cat=Debian]
 name = Igor Genibel
 face = igor.genibel.png
@@ -583,6 +683,9 @@ face = jacobo.png
 facewidth = 71
 faceheight = 95
 
+[http://sicherheitsschwankung.de/topic/linux/debian/feed]
+name = Jan Lübbe
+
 [http://javierlinares.com/blog/debian.xml]
 name = Javier Linares
 face = jlinares.png
@@ -602,15 +705,24 @@ 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 
 
 [http://jbailey.livejournal.com/data/rss]
 name = Jeff Bailey
 
-[http://www.licquia.org/wp-rss2.php?cat=6]
+[http://www.licquia.org/feed/]
 name = Jeff Licquia
 
+[http://blogs.famille-corbier.net/jeremie/atom-planet-debian.xml]
+name = Jérémie Corer
+
 [http://jeroen.wolffelaar.nl/blog/debian.rss]
 name = Jeroen van Wolffelaar
 
@@ -619,20 +731,9 @@ name = Jeroen van Wolffelaar
 # 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
-
-# 2006-09-04 mako
-# disabled due to a 500 (internal server error)
-# [http://pensezbien.org/?flav=rss]
-# name = Jimmy Kaplowitz
-
-# 2006-09-04 mako
-# disabled due to 404
-# [http://www.sacredchao.net/~piman/journal/feed]
-# name = Joe Wreschnig
-# face = piman.png
-# faceheight = 93
+face = hackermooch3.png
+facewidth = 100
+faceheight = 115
 
 [http://www.wendlandnet.de/joerg/blog/en/index.rss]
 name = Joerg Wendland
@@ -648,6 +749,9 @@ faceheight = 75
 [http://changelog.complete.org/feeds/index.rss1]
 name = John Goerzen
 
+[http://jonbernard.blogspot.com/feeds/posts/default/-/debian]
+name = Jon Bernard
+
 # deutex maintainer
 [http://alcopop.org/log/debian/feed]
 name = Jon Dowland
@@ -663,17 +767,31 @@ 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
 facewidth = 74
 
-[http://triplehelix.org/blog/wp-rss2.php]
-name = Joshua Kwan
-face = joshk.png
-facewidth = 69
-faceheight = 92
+[http://ghostbar.ath.cx/taxonomy/term/17/0/feed]
+name = Jose Luis Rivas Contreras
+face = ghostbar.png
+faceheight = 95
+facewidth = 66
+
+# 2007-07-22 mako
+# disabled due to 500
+# [http://triplehelix.org/blog/wp-rss2.php]
+# name = Joshua Kwan
+# face = joshk.png
+# facewidth = 69
+# faceheight = 92
 
 [http://www.livejournal.com/users/np237/data/rss]
 name = Josselin Mouette
@@ -687,12 +805,15 @@ face = jblache.png
 facewidth = 65
 faceheight = 89
 
-[http://julien.danjou.info/blog/rss.php?lang=en]
+[http://julien.danjou.info/blog/index.php/feed/en/atom]
 name = Julien Danjou
 face = jdanjou.png
 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
 face = dancer.png
@@ -704,6 +825,12 @@ name = Kai Hendry
 face = kai.png
 faceheight = 78
 
+[http://blog.ftbfs.in/?feed=rss2]
+name = Kartik Mistry
+face = kartik.png
+facewidth = 75
+faceheight = 90
+
 [http://b9.com/index.rdf]
 name = Kevin Rosenberg
 
@@ -713,27 +840,44 @@ 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]
+[http://liw.iki.fi/liw/log2/index.atom]
 name = Lars Wirzenius
 
+# 2007-07-22 mako
+# commented out lior's blog to test
+[http://liorkaplan.wordpress.com/feed/]
+name = Lior Kaplan
+
+[http://loldebian.wordpress.com/feed/]
+name = loldebian - Can I has a RC bug?
+face = loldebian.png
+facewidth = 130
+faceheight = 65
+
 [http://www.lucas-nussbaum.net/blog/?feed=rss2&cat=13]
 name = Lucas Nussbaum
 face = lucas.png
-facewidth = 75
-faceheight = 90
+facewidth = 70
+faceheight = 88
 
 [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://zomers.be/~luk/blog/index.rss]
+name = Luk Claes
+face = luk.png
+facewidth = 70
+faceheight = 110
+
+[http://www.golden-gryphon.com/blog/manoj/index.rss]
 name = Manoj Srivastava
 face = manoj2.png
 facewidth = 65
@@ -769,14 +913,13 @@ faceheight = 103
 
 [http://blog.marioiseli.com/index.php/feed]
 name = Mario Iseli
+face = mario.png
+facewidth = 65
+faceheight = 93
 
-[http://www.sirena.org.uk/log/?feed=atom]
+[http://www.sirena.org.uk/log/?feed=atom&cat=10]
 name = Mark Brown
 
-[http://blog.zobel.ftbfs.de/feed/]
-name = Martin Zobel-Helas
-face = zobel.png
-
 [http://tildemh.com/blog/debian/index.rss]
 name = Mark Howard
 
@@ -787,9 +930,27 @@ 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 = madduck-devilduck.png
+#facewidth = 83
+#faceheight = 100
+#face = madduck-fluffyduck.png
+#facewidth = 96
+#faceheight = 96
+face = madduck-racingduck.png
+facewidth = 85
+faceheight = 83
+#face = madduck-scottishduck.png
+#facewidth = 80
+#faceheight = 90
+
+[http://beta.howtorecognise.mine.nu/blog/index.rss20?tags=Planet%20Debian]
+name = Martín Ferrari
+face = tincho.png
+facewidth = 100
+faceheight = 100
 
 [http://www.cyrius.com/journal/?flav=atom]
 name = Martin Michlmayr
@@ -797,10 +958,14 @@ face = tbm.png
 facewidth = 67
 faceheight = 90
 
+[http://blog.zobel.ftbfs.de/feed/]
+name = Martin Zobel-Helas
+face = zobel.png
+
 [http://www.infodrom.org/~joey/log/joey.rdf]
 name = Joey Schulze
 
-[http://mhatta.livejournal.com/data/rss]
+[http://www.mhatta.org/blog/blosxom.cgi/index.atom]
 name = Masayuki Hatta
 face = mhatta.png
 facewidth = 77
@@ -823,13 +988,8 @@ face = mjg59.png
 facewidth = 69
 faceheight = 85
 
-[http://www.advogato.org/person/mjg59/rss.xml]
-name = Matthew Garrett
-face = mjg59-hypno.gif
-facewidth = 69
-faceheight = 85
-#facewidth = 72
-#faceheight = 83
+[http://www.matthew.ath.cx/articles/tech]
+name = Matthew Johnson
 
 [http://www.hezmatt.org/~mpalmer/blog/general/index.rss]
 name = Matthew Palmer
@@ -843,10 +1003,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
@@ -855,14 +1019,21 @@ facewidth = 64
 faceheight = 79
 
 # Brewster's Millions != Groundhog Day; please fix your blog
-#[http://base0.net/feeds/categories/20-Planet-Debian.rss]
-#name = Michael Janssen
-#face = jamuraa.png
-#facewidth = 59
+# 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://www.michaelandkrissy.com/category/debian/feed/]
+name = Michael Schultheiss
+face = schultmc.png
+facewidth = 65
+faceheight = 93
+
 [http://xerakko.livejournal.com/data/rss]
 name = Miguel Gea
 face = miguelgea.png
@@ -878,6 +1049,15 @@ faceheight = 97
 [http://web.glandium.org/blog/?feed=rss2&cat=5]
 name = Mike Hommey
 
+[http://www.meebey.net/jaws/data/xml/blog.Debian.rss]
+name = Mirco Bauer
+
+[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
@@ -886,39 +1066,58 @@ faceheight = 94
 [http://www.livejournal.com/users/morayallan/data/rss]
 name = Moray Allan
 face = moray.png
-facewidth = 71
+facewidth = 70
 faceheight = 84
 
-[http://www.inittab.de/blog/?flav=rss20]
+[http://criptonita.com/~nacho/blog/wp-rss2.php?cat=11]
+name = Nacho Barrientos Arias
+face = chipi.png
+facewidth = 63
+faceheight = 85
+
+[http://tretkowski.de/blog/feeds/index.rss2]
 name = Norbert Tretkowski
-face = nobse.png
-faceheight = 106
-facewidth = 90
+
+[http://ondrejcertik.blogspot.com/feeds/posts/default/-/debian]
+name = Ondřej Čertík
 
 [http://hackers.propus.com.br/~pablo/rss/]
 name = Pablo Lorenzzoni
 face = spectra.png
 faceheight = 89
 
+[http://pstorralba.blogspot.com/feeds/posts/default/-/tech]
+name = Pablo S. Torralba
+head = pstorralba.png
+faceheight = 140
+
 [http://www.redellipse.net/stuff/Debian/index.rss]
 name = Pascal Hakim
 face = pasc.png
 faceheight = 84
 
-[http://paul.luon.net/journal/index.xml]
-name = Paul van Tilburg
+[http://www.der-winnie.de/tags/debian/index.rss]
+name = Patrick Winnertz
 
-[http://www.advogato.org/person/pabs3/rss.xml]
-name = Paul Wise
+[http://paul.luon.net/journal/tags/debian-planet/index.xml]
+name = Paul van Tilburg
 
-[http://perolofsson.livejournal.com/data/rss]
+[http://people.dsv.su.se/~pelle/blog.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
+# 2007-07-22 mako
+# disabled due to 500
+# [http://www.pure64.net/cgi-bin/blosxom/computer/index.rss]
+# name = Per-Arne Hellarvik
+# face = per-arne.png
+# facewidth = 65
+# faceheight = 85
+
+[http://peter.makholm.net/feed/?cat=12,13]
+name = Peter Makholm
+face = makholm.png
+facewidth = 100
+faceheight = 99
 
 [http://www.advogato.org/person/weasel/rss.xml]
 name = Peter Palfrader
@@ -940,7 +1139,7 @@ face = philh.png
 facewidth = 99
 faceheight = 104
 
-[http://blog.philkern.de/feeds/categories/4-Debian.rss]
+[http://www.philkern.de/weblog/en/debian/index.atom]
 name = Philipp Kern
 face = pkern.png
 facewidth = 69
@@ -969,21 +1168,18 @@ face = rdonald.png
 facewidth = 85
 faceheight = 85
 
-[http://www.ouaza.com/wordpress/category/debian/feed/]
+[http://www.ouaza.com/wp/category/english/feed/]
 name = Raphaël Hertzog
 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
@@ -1001,6 +1197,9 @@ 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
@@ -1011,13 +1210,13 @@ faceheight = 85
 [http://spacehunt.info/lang/en/feed?tag=Debian] 
 name = Roger So
 
-[http://roland.entierement.nu/categories/geek-en.rss]
+[http://roland.entierement.nu/categories/en.rss]
 name = Roland Mas
 face = lolando.png
 facewidth = 73
 faceheight = 88
 
-[http://orebokech.com/debian/changelog.rss]
+[http://blog.orebokech.com/feeds/posts/default/-/planet]
 name = Romain Francoise
 
 [http://www.burtonini.com/blog/index.rss2]
@@ -1032,7 +1231,7 @@ name = Ryan Murray
 [http://stone-head.org/readme/debian/index.rss]
 name = Rudy Godoy
 
-[http://etbe.blogspot.com/atom.xml]
+[http://etbe.coker.com.au/index.php/feed/]
 name = Russell Coker
 
 [http://sam.zoy.org/blog/rss20.xml?cat=debian]
@@ -1041,14 +1240,17 @@ face = hocevar2.png
 facewidth = 65
 faceheight = 89
 
+[http://ressukka.net/blog/tags/debian/index.atom]
+name = Sami Haahtinen
+
+[http://santiago.tortugacha.org/?feed=rss2]
+name = Santiago Ruano Rincon
+
 [http://www.ringworld.org/~dieman/debianblog/index.xml]
 name = Scott Dier
 
-[http://www.netsplit.com/blog/index.atom]
-name = Scott James Remnant
-face = keybuk.png
-
-#[http://www.livejournal.com/users/keybuk/data/rss]
+# disabled by madduck 2007-10-06: he has nothing to do with debian anymore
+#[http://www.netsplit.com/blog/xml/atom/category/tech/feed.xml]
 #name = Scott James Remnant
 #face = keybuk.png
 
@@ -1056,6 +1258,9 @@ face = keybuk.png
 name = Sean Harshbarger
 file = harshy.png
 
+[http://tokkee.org/cgi-bin/blog/debian/index.rss]
+name = Sebastian Harl
+
 [http://www.rittau.org/blog/debian.xml]
 name = Sebastian Rittau
 face = srittau.png
@@ -1067,7 +1272,7 @@ name = Sergio Talens-Oliag
 face = sto.png
 sort_order = seen
 
-[http://www.law.yi.org/~sfllaw/cgi-bin/ljtagfeed.py/p.d.o]
+[http://sfllaw.livejournal.com/data/rss?tag=p.d.o]
 name = Simon Law
 face = slaw.png
 facewidth = 74
@@ -1079,6 +1284,9 @@ 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
@@ -1094,8 +1302,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
@@ -1103,13 +1314,31 @@ 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&cat=3]
+name = Sune Vuorela
+face = sune.png
+facewidth = 65
+faceheight = 90
+
+[http://le-gall.net/sylvain+violaine/blog/rss.php]
+name = Sylvain Le Gall
+face = gildor.png
+facewidth = 65
+faceheight = 81
 
-[http://haecceity.clearairturbulence.org/xml/rss20/feed.xml]
+[http://wiki.tauware.de/doku.php?blog=feed&tag=debian]
+name = Reinhard Tartler
+
+[http://thunk.org/tytso/blog/feed]
+name = Theodore Ts'o
+
+[http://loeki.tv/log/feeds/index.rss2]
+name = Thijs Kinkhorst
+face = thijs.png
+facewidth = 65
+faceheight = 67
+
+[http://haecceity.clearairturbulence.org/xml/atom/category/tech/feed.xml]
 name = Thom May
 face = thom.png
 facewidth = 59
@@ -1129,6 +1358,15 @@ name = Tollef Fog Heen
 face = tollef.png
 faceheight = 92
 
+[http://gunkies.org/blog/?feed=rss2]
+name = Tore S. Bekkedal
+face = toresbe.png
+facewidth = 81
+faceheight = 80
+
+[http://twerner.blogspot.com/feeds/posts/default/-/english]
+name = Torsten Werner
+
 [http://zinosat.blogspot.com/atom.xml]
 name = Davide Viti
 face = zinosat.jpg
@@ -1138,7 +1376,7 @@ faceheight = 110
 [http://www.wiggy.net/index.atom]
 name = Wichert Akkerman
 
-[http://www.grep.be/blog/en/index.rss]
+[http://www.grep.be/blog/en/index.myrss]
 name = Wouter Verhelst
 face = wouter2.png
 facewidth = 68
@@ -1155,26 +1393,21 @@ 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]
+[http://www.df7cb.de/blog/tag/debian.rss]
 name = Christoph Berg
 face = myon.png
 facewidth = 71
 faceheight = 95
+ 
+[http://teejeejee.livejournal.com/data/rss?tag=debian]
+name = Thomas Girard
 
-# 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/rss.php?serendipity%5btag%5d=debian]
+name = Nico Golde
 
 [http://aniki.daionet.gr.jp/~knok/blog/blosxom.cgi/index.rss]
 name = NOKUBI Takatsugu
@@ -1255,9 +1488,13 @@ name = Zak B. Elep
 [http://blog.halon.org.uk/index.rss]
 name = Neil McGovern
 #face = neilm.png
-face = scotsman.png
-facewidth = 100
-faceheight = 20
+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
@@ -1271,7 +1508,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]
@@ -1286,10 +1523,10 @@ 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
@@ -1303,10 +1540,6 @@ name = Simon Huggins
 # [http://www.carlospc.org/xml/rss/feed.xml]
 # name = Carlos Parra Camargo
 
-# SoC: Debtags summer of code project:
-[http://www.alextreme.org/drupal/?q=taxonomy/term/6/0/feed]
-name = Alex de Landgraaf
-
 # SoC: d-i/Hurd summer of code project (mentor: cjwatson):
 [http://xsunblog.blogspot.com/atom.xml]
 name = Matheus Morais
@@ -1321,6 +1554,30 @@ 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
@@ -1331,3 +1588,49 @@ faceheight = 85
 # 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
+
+[http://foolab.org/taxonomy/term/141/0/feed]
+name = Mohammed Sameer
+face = msameer.png
+facewidth = 95
+faceheight = 98
+
+[http://www.linux.codehelp.co.uk/serendipity/index.php?/feeds/index.rss1]
+name = Neil Williams
+face = codehelp.png
+facewidth = 65
+faceheight = 71
+
+[http://blog.cihar.com/rss.xml]
+name = Michal Čihař
+face = nijel.png
+facewidth = 64
+faceheight = 67
+
+[http://www.nerdinne.net/blog/?flav=atom]
+name = Runa Sandvik
+face = runa.png
+facewidth = 70
+faceheight = 92
+
+[http://vireo.org/~stew/blog/index.rss]
+name = Mike O'Connor
+face = stew.png
+
+[http://my.opera.com/atomo64/xml/atom/blog/]
+name = Raphael Geissert
+face = raphael.png
+facewidth = 74
+faceheight = 85
+
+[http://nlm-morgul.livejournal.com/data/rss?tag=planetdebian]
+name = Noah Meyerhans
+face = noahm.png
+
+[http://fboudra.free.fr/wordpress/wp-rss2.php?cat=4]
+name = Fathi Boudra
+face = fabo.png