X-Git-Url: https://git.deb.at/?p=deb%2Fhackedgotchi.git;a=blobdiff_plain;f=config%2Fconfig.ini;h=547e2695594ce3ecc873a0bc9e523164400eaea4;hp=6204ab81b0dedfb84812ae6dcfcfbea34e2c0b2f;hb=87f14fceecd4d63d4ef0537c73272c505b546755;hpb=2cefa848a2d149a46377cae64b5f9be9e278e23e

diff --git a/config/config.ini b/config/config.ini
index 6204ab8..547e269 100644
--- a/config/config.ini
+++ b/config/config.ini
@@ -99,10 +99,6 @@ name = Adam Rosi-Kessel
 face = kessel.png
 faceheight = 99
 
-# Away for VAC.
-# [http://chistera.yi.org/~adeodato/blog/planetd.rss]
-# name = Adeodato Simó
-
 # Added 2009-08-21 by jimmy
 # dc9/dc10 attendee and volunteer/orga person, and dc11 bosnian bid team leader
 [http://foolcontrol.org/?feed=rss2]
@@ -111,20 +107,21 @@ face = adnan.png
 facewidth = 83
 faceheight = 85
 
-[http://blog.fortytwo.ch/feeds/index.rss2]
-name = Adrian von Bidder
-face = cmot.png
-facewidth = 71
-faceheight = 85
-
 [http://www.aigarius.com/blog/category/debian-planet/feed/atom/]
 name = Aigars Mahinovs
 face = aigarius_hg.png
 facewidth = 85
 faceheight = 116
 
-[http://blog.sceal.ie/index.rss]
-name = Alastair McKinstry
+# Add comment to trigger upload. Why didn't planet page refresh?
+# [http://blog.sceal.ie/index.rss]
+# 2011-12-13 - joerg - Broken feed display
+#[http://diaspora.sceal.ie/public/amckinstry.atom]
+#name = Alastair McKinstry
+
+[http://blogs.igalia.com/berto/category/debian/feed/]
+name = Alberto García
+face = berto.png
 
 [http://alerios-en.blogspot.com/atom.xml]
 name = Alejandro Rios P.
@@ -143,9 +140,6 @@ face = tolimar.png
 [http://asac.ws/tagged/debian/rss]
 name = Alexander Sack
 
-#[http://www.asoftsite.org/s9y/feeds/categories/1-Debian-OS.rss]
-#name = Alexander Sack (old)
-
 [http://blog.snow-crash.org/atom.xml]
 name = Alexander Wirt
 face = formorer.png
@@ -170,15 +164,6 @@ faceheight = 88
 [http://www.progsoc.org/~wildfire/aum/index.rss]
 name = Anand Kumria
 
-# 2010-12-11 - joerg - timeout
-# [http://www.andrelop.org/blog/category/debian/feed/]
-# name = Andre Luis Lopes
-
-[http://debsanity.wordpress.com/feed/]
-name = Andrea De Iacovo
-
-# 2008-12-13 - joerg - No blog behind that url
-# 2009-07-24 - and - blog updated
 [http://blogs.gnome.org/woody/category/debian/feed/]
 name = Andrea Veri
 face = and.png
@@ -191,13 +176,6 @@ name = Andreas Barth
 [http://www.bebt.de/blog/debian/rss.xml]
 name = Andreas Metzler
 
-# 2010-12-11 - joerg - timeout
-# [http://rottylog.yi.org/wp-rss2.php]
-# name = Andreas Rottmann
-# face = rotty.jpg
-# facewidth = 95
-# faceheight = 115
-
 [http://schuldei.blogspot.com/atom.xml]
 name = Andreas Schuldei
 
@@ -229,16 +207,8 @@ faceheight = 100
 [http://blog.wompom.org/index.php/feed/atom/]
 name = Andrew Stribblehill
 
-# 2008-12-13 - joerg - no such server, NXDOMAIN
-#[http://www.pomum.no/feed/]
-#name = Annabelle Tully
-#face = pixie.png
-#facewidth= 85
-#faceheight = 99
-
-# 2010-12-11 - joerg - 500
-# [http://blog.anselms.net/debian/index.rss]
-# name = Anselm Lingnau
+[http://softwarelivre.org/profile/terceiro/tags/english/feed]
+name = Antonio Terceiro
 
 [http://antti-juhani.kaijanaho.fi/newblog/archives/tag/debian/feed]
 name = Antti-Juhani Kaijanaho
@@ -246,12 +216,8 @@ face = antti.png
 facewidth = 79
 faceheight = 96
 
-# 2010-12-11 - joerg - 404
-# [http://nohar.t1r.net/mlog/rss]
-# name = Arnaud Cornet
-# face = nohar.png
-# facewidth = 81
-# faceheight = 85
+[http://blogs.gnome.org/happyaron/category/debian/feed/rss/]
+name = Aron Xu
 
 [http://blogs.hurdfr.org/xmlsrv/rss2.php?blog=9]
 name = Arnaud Fontaine
@@ -277,30 +243,16 @@ face = xtaran.png
 facewidth = 102
 faceheight = 104
 
-# 2010-12-11 - joerg - 404
-# [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
 
-# 2008-12-13 - joerg - 500 internal server error
-#[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/feed]
+[http://blog.venthur.de/index.php/feed]
 name = Bastian Venthur
 face = venthur.png
 facewidth = 85
@@ -338,47 +290,24 @@ face = bzed.png
 facewidth = 73
 faceheight = 98
 
-[http://pcpool00.mathematik.uni-freiburg.de/~brl/blog/changelog.rss]
+[http://blog.brlink.eu/changelog.rss]
 name = Bernhard R. Link
 
 [http://gabriellacoleman.org/blog/?feed=rss2]
 name = Biella Coleman
 
-# biella tries to get a new one
-# face = biella.png
-# facewidth= = 90
-# faceheight = 90
-
-# 2010-12-11 - joerg - Error 500
-#[http://brad-smith.co.uk/blog_tags/debian.rss]
-#name = Bradley Smith
-
-# 2008-12-13 - joerg - 404
-#[http://necrotic.deadbeast.net/~branden/blog/exuberance?flav=rss]
-#name = Branden Robinson
-#face = branden.png
-#facewidth = 90
-#faceheight = 103
-
-# 2010-12-11 - joerg - 404
-# [http://www.brandonholtsclaw.com/feeds/atom.xml]
-# name = Brandon Holtsclaw
-# face = imbrandon.png
-# facewidth = 85
-# faceheight = 85
+[http://techno-viking.com/tags/Linux/index.rss]
+name = Blars Blarson
 
 [http://www.sommitrealweird.co.uk/blog/?flav=atom]
 name = Brett Parker
 
-# 2008-12-13 - joerg - Connection refused
-#[http://www.bbassett.net/blog/debian-rss.xml]
-#name = Brian Bassett
-
-[http://bignachos.com/?feed=rss2]
-name = Brian Nelson
-face = pyro.png
-facewidth = 71
-faceheight = 102
+# 2011-12-13 - joerg - timeout
+# [http://bignachos.com/?feed=rss2]
+# name = Brian Nelson
+# face = pyro.png
+# facewidth = 71
+# faceheight = 102
 
 [http://bgoglin.livejournal.com/data/rss?tag=planet.d.o]
 name = Brice Goglin
@@ -387,10 +316,6 @@ name = Brice Goglin
 name = C.J. Adams-Collier
 face = cj.png
 
-# 2007-04-25 ajt -- Summer of Code 2007 student
-[http://www.cs.sfu.ca/~camerond/personal/blog/index.rss]
-name = Cameron Dale
-
 [http://carlchenet.wordpress.com/category/debian/feed]
 name = Carl Chenet
 
@@ -400,31 +325,17 @@ face = claviola.png
 facewidth = 95
 faceheight = 115
 
-# SoC 2006: Improve the Debian boot system (mentor: Petter Reinholdtsen)
 [http://bootdebian.blogspot.com/atom.xml]
 name = Carlos Villegas
 
-# from the extremadura people
-# 2008-12-13 - joerg - 404
-#[http://cek.bitacoras.com/archivos/category/english/feed/]
-#name = César Gómez Martín
-
 [http://charles.plessy.org/Debian/planet/index.en.rss]
 name = Charles Plessy
 face = plessy.png
 facewidth = 65
 faceheight = 85
 
-# 2010-12-11 - joerg - NXDOMAIN
-# [http://debian.nullcode.org/b/index.rss]
-# name = Chris Anderson
-
 [http://crispygoth.livejournal.com/data/rss?tag=planet]
 name = Chris Butler
-# disabled due to looking terrible
-# face = chrisb.png
-# facewidth = 66
-# faceheight = 85
 
 # Debian Icedove Maintainer
 [http://www.4949.de/~chris/blog/tags/planetdebian/planetdebian.rss]
@@ -470,11 +381,6 @@ face = christoph.png
 facewidth = 77
 faceheight = 100
 
-# temporarily disabled 31.12.2009 due to workaround.org server move
-#[http://blog.workaround.org/category/debian/feed]
-#name = Christoph Haas
-#face = haas.png
-
 [http://www.code-monkeys.org/blog2/?cat=3;&feed=rss2]
 name = Chris Taylor
 
@@ -508,11 +414,8 @@ name = Craig Sanders
 [http://enc.com.au/feed/]
 name = Craig Small
 
-[http://blog.ikibiki.org/tags/debian/index.rss]
+[http://blog.mraw.org/tags/debian/index.rss]
 name = Cyril Brulebois
-face = kibi.png
-facewidth = 65
-faceheight = 61
 
 [http://www.livejournal.com/users/mirrorlynx/data/rss]
 name = Dan Weber
@@ -535,18 +438,13 @@ face = dkg.png
 facewidth = 65
 faceheight = 89
 
-[http://weblog.false.org/weblog/index.rss]
-name = Daniel Jacobowitz
+# 2011-12-13 - joerg - unreachable
+# [http://weblog.false.org/weblog/index.rss]
+# name = Daniel Jacobowitz
 
-[http://www.wgdd.de/?feed=rss2&cat=2]
-name = Daniel Leidert
-
-# 2010-12-11 - joerg - NXDOMAIN
-# [http://www.flexserv.de/blog/index.rss]
-# name = Daniel J. Priem
-# face = codebreaker.png
-# facewidth = 66
-# faceheight = 91
+# 2011-12-13 - joerg - http error 503
+# [http://www.wgdd.de/?feed=rss2&cat=2]
+# name = Daniel Leidert
 
 [http://blog.digital-scurf.org/?flav=atom]
 name = Daniel Silverstone
@@ -565,17 +463,13 @@ face = dannf.png
 facewidth = 64
 faceheight = 89
 
-# 2010-12-11 - joerg - timeout
-# [http://mrdaven.mine.nu/cgi-bin/blosxom/index.rss]
-# name = Dave Noble
-
 [http://www.cs.unb.ca/profs/bremner/blog/tags/planet/index.rss]
 name = David Bremner
 face = bremner.png
 facewidth = 65
 faceheight = 81
 
-[http://stereonaut.net/tag/debian/feed/atom/]
+[http://stereonaut.net/tag/debian/feed/]
 name = David Moreno
 face = damog.png
 facewidth = 79
@@ -604,7 +498,7 @@ name = David Pashley
 face = jd.png
 faceheight = 84
 
-[http://planetwatson.co.uk/blog/feed/]
+[http://planetwatson.co.uk/feeds/categories/planet-debian]
 name = David Watson
 face = dwatson.png
 facewidth = 65
@@ -627,6 +521,12 @@ face = dc11hlogo.png
 facewidth = 75
 faceheight = 92
 
+# 2011-08-22, joerg
+# disabled due to content not fit for planet and due to
+# not showing who did the post (as required for team blogs)
+#[http://debianmed.blogspot.com/feeds/posts/default?alt=rss]
+#name = Debian Med
+
 [http://dsa.debian.org/dsablog/index.rss]
 name = Debian Sysadmin Team
 
@@ -650,19 +550,18 @@ faceheight = 90
 [http://ddumont.wordpress.com/feed/]
 name = Dominique Dumont
 
+[http://www.donarmstrong.com/tags/debian/index.rss]
+name = Don Armstrong
+face = don.png
+facewidth = 71
+faceheight = 77
+
 [http://brainfood.com/blog/ean/rss]
 name = Ean Schuessler
 face = debian-ean.png
 facewidth = 65
 faceheight = 86
 
-# 2010-12-11 - joerg - 502
-# [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
@@ -678,11 +577,11 @@ faceheight = 90
 [http://eduardo.macan.eng.br/category/debian-en/feed]
 name = Eduardo Marcel Macan
 
-[http://emarocca.livejournal.com/data/rss/]
+[http://kolter.blog.openics.org/index.php?feed/category/planet-debian/atom]
+name = Emmanuel Bouthenot
+
+[http://feeds.feedburner.com/EmaRocca]
 name = Emanuele Rocca
-face = ema.png
-facewidth = 77
-faceheight = 85
 
 [http://emilio.pozuelo.org/?cat=13&feed=atom]
 name = Emilio Pozuelo Monfort
@@ -724,17 +623,10 @@ face = evgeni.png
 facewidth = 100
 faceheight = 100
 
-[http://kobold.it/blog/rss.xml]
-name = Fabio Tranchitella
-
 [http://fboudra.free.fr/wordpress/wp-rss2.php?cat=4]
 name = Fathi Boudra
 face = fabo.png
 
-# 2010-12-11 - joerg - 404
-# [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
 
@@ -747,27 +639,18 @@ face = nanda.png
 facewidth = 55
 faceheight = 70
 
-#[http://feeds.feedburner.com/mechanixthoughts]
 [http://blog.sysfs.net/feeds/atom10.xml]
 name = Filip Van Raemdonck
 face = mechanix.png
 facewidth = 71
 faceheight = 94
 
-# 2008-12-13 - joerg - 404
-#[http://filipe.icewall.org/index.php/feed/atom/]
-#name = Filipe Lautert
-
 [http://www.esaurito.net/blog/debian/?flav=rss]
 name = Filippo Giunchedi
 face = filippo.png
 facewidth = 65
 faceheight = 86
 
-# 2010-12-11 - joerg - 403
-# [http://www.marsmenschen.com/taxonomy/term/5/0/feed]
-# name = Florian Maier
-
 [http://perldition.org/feeds/articles/atom]
 name = Florian Ragwitz
 
@@ -788,16 +671,6 @@ name = Frank Lichtenheld
 face = djpig.png
 facewidth = 72
 
-[http://alioth.debian.org/~fjp/log/index.rss]
-name = Frans Pop
-
-# 2008-12-13 - joerg - 500
-#[http://ukai.org/b/log/debian/?flav=rss]
-#name = Fumitoshi Ukai
-#face = ukai.png
-#facewidth = 65
-#faceheight = 85
-
 [http://rhonda.deb.at/blog/index.planet]
 name = Gerfried Fuchs
 face = rhonda.png
@@ -816,12 +689,6 @@ faceheight = 91
 [http://www.iuculano.it/en/tag/debian-planet/feed/]
 name = Giuseppe Iuculano
 
-[http://orniere-du-globe.net/blog/?feed=rss2&cat=7]
-name = Gonéri Le Bouder
-face = goneri.png
-facewidth = 57
-faceheight = 110
-
 [http://www.gotom.jp/~gotom/cgi-bin/blosxom.cgi/index.rss]
 name = GOTO Masanori
 
@@ -835,22 +702,16 @@ faceheight = 85
 name = Gregory Colpart
 face = reg.png
 
-[http://honk.sigxcpu.org/con/tags/debian/debian.rss]
+[http://honk.sigxcpu.org/con/tags/planetdebian/planetdebian.rss]
 name = Guido Günther
 face = agx.png
 facewidth = 100
 faceheight = 100
 
-# 2010-12-11 - joerg - 404
-# [http://people.quaqua.net/ultrotter/blog/archives/category/debian/feed]
-# name = Guido Trotter
-# face = ultrotter.png
-# facewidth = 65
-# faceheight = 83
-
-# 2010-12-11 - joerg - 404
-# [http://fatalerror-debian.blogspot.com/atom.xml]
-# name = Guilherme de S. Pastore
+# GSoC student 2011
+# 2011-12-13 - joerg - 404
+# [http://respawner.fr/blog/index.php?feed/tag/Planet%20Debian/rss2]
+# name = Guillaume Mazoyer
 
 [http://gwolf.org/rss.xml]
 name = Gunnar Wolf
@@ -864,7 +725,6 @@ 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
 
@@ -877,29 +737,21 @@ faceheight = 86
 [http://www.advogato.org/person/gadek/rss.xml]
 name = Grzegorz B. Prokopski
 
-# 2010-06-30 - lmamane - 404
-# [http://www.srcf.ucam.org/~hmw26/join-the-dots/feed/atom/]
-# name = Hanna Wallach
-# face = hanna.png
-# facewidth = 59
-# faceheight = 85
-
 [http://layer-acht.org/blog/debian/changelog.rss]
 name = Holger Levsen
 face = h01ger.png
 facewidth = 86
 faceheight= 110
 
+[http://orangesquash.org.uk/~laney/tags/planetdebian/index.atom]
+name = Iain Lane
+face = laney.png
+facwidth = 73
+faceheight = 90
+
 [http://www.ianhaken.com/rss.php]
 name = Ian Haken
 
-# 2008-12-13 - joerg - 404
-#[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
 
@@ -960,59 +812,32 @@ face = waja.png
 facewidth = 74
 faceheight = 100
 
-# 2010-12-11 - joerg - 404
-# [http://javierlinares.com/blog/debian.xml]
-# name = Javier Linares
-# face = jlinares.png
-# facewidth = 60
-
-# 2008-12-13 - joerg - no such server, NXDOMAIN
-#[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/feed/]
 name = Jeff Licquia
 
-[http://jelmer.vernstok.nl/blog/feeds/categories/6-debian.rss]
-name = Jelmer Vernooij
+# 2011-12-13 - joerg - error 500
+# [http://jelmer.vernstok.nl/blog/feeds/categories/6-debian.rss]
+# name = Jelmer Vernooij
 
 [http://jeremie.famille-corbier.net/blog.atom]
 name = Jérémie Corbier
 
+[http://people.debian.org/~lunar/blog/index.atom]
+name = Jérémy Bobbio
+face = lunar.png
+facewidth = 63
+faceheight = 65
+
 [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 = hackermooch3.png
-facewidth = 100
-faceheight = 115
-
 [http://apebox.org/wordpress/tag/debian/feed]
 name = Jo Shields
 face = directhex.png
 
-# 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
@@ -1022,12 +847,6 @@ faceheight = 64
 [http://blog.ganneff.de/blog/atom.xml]
 name = Joerg Jaspert
 
-# 2008-12-13 - joerg - 404
-#[http://www.wendlandnet.de/joerg/blog/en/index.rss]
-#name = Joerg Wendland
-#face = jwendland.png
-#faceheight = 89
-
 [http://kitenet.net/~joey/blog/index.rss]
 name = Joey Hess
 face = joeyh2.png
@@ -1040,16 +859,12 @@ name = Joey Schulze
 [http://changelog.complete.org/feed]
 name = John Goerzen
 
-[http://feeds.feedburner.com/wjsullivan]
+[http://pipes.yahoo.com/pipes/pipe.run?_id=FiExI4MS3RG8VVYcM1rX_Q&_render=rss]
 name = John Sullivan
 face = johns.png
 faceheight = 100
 facewidth = 81
 
-# 2010-12-11 - joerg - 404
-# [http://jonbernard.blogspot.com/feeds/posts/default/-/debian]
-# name = Jon Bernard
-
 [http://jmtd.net/log/feed/]
 name = Jon Dowland
 face = jmtd.png
@@ -1078,12 +893,6 @@ faceheight = 85
 [http://jonnylamb.com/category/planet-debian/feed/]
 name = Jonny Lamb
 
-[http://damad.be/joost/blog/category/debian/rss.xml]
-name = Joost Yervante Damad
-face = andete.png
-facewidth = 80
-faceheight = 78
-
 [http://oskuro.net/blog?flav=rss]
 name = Jordi Mallach
 face = oskuro.png
@@ -1107,19 +916,12 @@ face = ghostbar.png
 faceheight = 95
 facewidth = 66
 
-[http://blog.bureado.com.ve/?feed=rss2&cat=12]
-name = José Parrella
-face = bureado.png
-facewidth = 80
-faceheight = 98
-
 [http://www.livejournal.com/users/np237/data/rss]
 name = Josselin Mouette
 face = np237.png
 facewidth = 100
 faceheight = 100
 
-# Debian Maintainer, SoC 2008 student; mentor is Fabio Tranchitella (kobold)
 [http://gnucrash.wordpress.com/category/debianpl/feed/]
 name = Juan Luis Belmonte
 
@@ -1135,7 +937,7 @@ face = jdanjou.png
 facewidth = 100
 faceheight = 84
 
-[http://www.kirya.net/weblog/tag/planet-debian/feed/]
+[http://www.kirya.net/tag/planet-debian/feed/]
 name = Julien Valroff
 
 [http://silicone.homelinux.org/tag/debian-planet/feed/]
@@ -1161,10 +963,11 @@ faceheight = 78
 [http://www.carbon-project.org/tags/debian/debian.rss]
 name = Kai Wasserbäch
 
-[http://www.imsc.res.in/~kapil/blog?flav=rss20]
-name = Kapil Paranjape
+# 2011-12-13 - joerg - 404
+# [http://www.imsc.res.in/~kapil/tags/debian?flav=rss20]
+# name = Kapil Paranjape
 
-[http://ftbfs.wordpress.com/feed/atom]
+[http://0x1f1f.wordpress.com/feed/atom]
 name = Kartik Mistry
 face = kartik.png
 facewidth = 75
@@ -1185,10 +988,6 @@ face = keithp.png
 facewidth = 81
 faceheight = 68
 
-# 2008-12-13 - joerg - 505 server error
-#[http://b9.com/index.rdf]
-#name = Kevin Rosenberg
-
 [http://kmuto.jp/b.cgi/debian/index.rss]
 name = Kenshi Muto
 face = kmuto.png
@@ -1202,14 +1001,14 @@ name = Krzysztof Tyszecki
 [http://www.debian-administration.org/weblog/feeds/kumanna]
 name = Kumar Appaiah
 
-[http://www.roeckx.be/journal/index.rss]
-name = Kurt Roeckx
+# 2011-12-13 - joerg - timeout
+# [http://www.roeckx.be/journal/index.rss]
+# name = Kurt Roeckx
 
-# 2010-12-11 - joerg - 404
-# [http://kyle.mcmartin.ca/.plan/?feed=rss2]
-# name = Kyle McMartin
-# face = mcmartin.png
-# faceheight = 100
+#Leandro from dc12 local-team
+[http://leogg.wordpress.com/category/planet-debian/feed/atom/]
+name = Leandro Gómez
+face = leogg.png
 
 [http://costela.net/tag/debian-planet/feed/]
 name = Leo 'costela' Antunes
@@ -1223,8 +1022,6 @@ face = lars.png
 facewidth = 85
 faceheight = 100
 
-# 2007-07-22 mako
-# commented out lior's blog to test
 [http://liorkaplan.wordpress.com/feed/]
 name = Lior Kaplan
 
@@ -1315,23 +1112,9 @@ face = marga.png
 facewidth = 65
 faceheight = 103
 
-# 2008-12-13 - joerg - ver slow, then error 500
-#[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&cat=10]
 name = Mark Brown
 
-# 2008-12-13 - joerg - 404
-#[http://tildemh.com/blog/debian/index.rss]
-#name = Mark Howard
-
-[http://blog.mhy.org.uk/feed/]
-name = Mark Hymers
-
 [http://q-funk.blogspot.com/atom.xml]
 name = Martin-Éric Racine
 face = qfunk.png
@@ -1361,7 +1144,7 @@ faceheight = 83
 #facewidth = 80
 #faceheight = 90
 
-[http://www.sourceguru.net/feed/]
+[http://www.sourceguru.net/tag/debian/feed/]
 name = Martin Meredith
 face = mez.png
 nick = Mez
@@ -1374,6 +1157,12 @@ face = tbm.png
 facewidth = 67
 faceheight = 90
 
+[http://www.piware.de/category/debian/feed/atom/]
+name = Martin Pitt
+face = pitti.png
+facewidth = 74
+faceheight = 98
+
 [http://blog.zobel.ftbfs.de/rss.xml]
 name = Martin Zobel-Helas
 face = zobel.png
@@ -1404,13 +1193,6 @@ face = maks.png
 facewidth = 110
 faceheight = 83
 
-# 2010-12-11 - joerg - 404
-# [http://www.mhatta.org/blog/blosxom.cgi/index.atom]
-# name = Masayuki Hatta
-# face = mhatta.png
-# facewidth = 77
-# faceheight = 85
-
 # SoC: d-i/Hurd summer of code project (mentor: cjwatson):
 [http://xsunblog.blogspot.com/atom.xml]
 name = Matheus Morais
@@ -1421,7 +1203,8 @@ face = dopey.png
 faceheight = 65
 facewidth = 66
 
-[http://www.livejournal.com/users/mjg59/data/rss]
+# Changed from livejournal to dreamwidth by request from Matthew on irc --liw
+[http://www.dreamwidth.org/users/mjg59/data/rss]
 name = Matthew Garrett
 face = mjg59.png
 facewidth = 69
@@ -1457,6 +1240,10 @@ face = alphascorpii.png
 facewidth = 76
 faceheight = 92
 
+# GSoC'11 student
+[http://mesutcaneng.blogspot.com/feeds/posts/default]
+name = Mesutcan Kurt
+
 [http://micha.lenk.info/Gedankenblitze/Debian/index.rss]
 name = Micha Lenk
 
@@ -1478,14 +1265,6 @@ face = ncommander.png
 facewidth = 65
 faceheight = 82
 
-# Brewster's Millions != Groundhog Day; please fix your blog
-# It's fallen off the feed now, hopefully forever.
-# 2008-12-13 - joerg - 404
-#[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
 
@@ -1499,13 +1278,10 @@ face = schultmc.png
 facewidth = 65
 faceheight = 93
 
-[http://uiae.at/~michi/blog/tags/pdo/index.rss]
-name = Michael Schutte
-
 [http://mvogt.wordpress.com/tag/debian/feed]
 name = Michael Vogt
 
-[http://blog.cihar.com/rss.xml]
+[http://blog.cihar.com/archives/english/index-atom.xml]
 name = Michal Čihař
 face = nijel.png
 facewidth = 64
@@ -1526,7 +1302,13 @@ faceheight = 97
 [http://glandium.org/blog/?feed=rss2&cat=5&tag=en]
 name = Mike Hommey
 
-[http://www.meebey.net/jaws/data/xml/blog.Debian.rss]
+[http://stew.vireo.org/tag/debian/index.rss]
+name = Mike (stew) O'Connor
+face = stew.png
+facewidth = 61
+faceheight = 85
+
+[http://www.meebey.net/tags/planet-debian/index.rss]
 name = Mirco Bauer
 face = meebey.png
 facewidth = 79
@@ -1547,12 +1329,11 @@ faceheight = 98
 [http://www.livejournal.com/users/morayallan/data/rss]
 name = Moray Allan
 face = moray.png
-facewidth = 70
-faceheight = 84
+facewidth = 73
+faceheight = 93
 
-# 2010-12-11 - joerg - 404
-# [http://muammar.me/blog/index.php?/feeds/categories/17-Debian-English.rss]
-# name = Muammar El Khatib
+[http://muammar.me/blog/category/debian-english/feed/]
+name = Muammar El Khatib
 
 [http://criptonita.com/~nacho/blog/category/debian/feed/]
 name = Nacho Barrientos Arias
@@ -1560,14 +1341,22 @@ face = chipi.png
 facewidth = 63
 faceheight = 85
 
+# GSoC student 2011
+# 2011-12-13 - joerg - error 500
+# [http://blog.nhandler.com/category/planet-debian/feed/?mrss=off]
+# name = Nathan Handler
+# face = nhandler.png
+# facewidth = 65
+# faceheight = 84
+
 [http://nion.modprobe.de/blog/rss.php?serendipity%5btag%5d=debian]
 name = Nico Golde
 
-[http://blog.halon.org.uk/index.rss]
-name = Neil McGovern
-face = neilm.png
-facewidth = 65
-faceheight = 75
+[http://neuro.debian.net/feeds/for-debian-planet.xml]
+name = NeuroDebian
+face = neurodebian.png
+facewidth = 128
+faceheight = 87
 
 [http://www.linux.codehelp.co.uk/serendipity/index.php?/feeds/index.rss1]
 name = Neil Williams
@@ -1575,13 +1364,6 @@ face = codehelp.png
 facewidth = 85
 faceheight = 113
 
-# 2010-12-11 - joerg - NXDOMAIN
-# [http://nvalcarcel.aureal.com.pe/?cat=189&feed=rss2]
-# name = Nicolas Valcárcel
-# face = nxvl.png
-# facewidth = 85
-# faceheight = 113
-
 [http://yoush.homelinux.org:8079/category/tech/feed]
 name = Nikita Youshchenko
 
@@ -1598,42 +1380,54 @@ name = NOKUBI Takatsugu
 [http://tretkowski.de/blog/feeds/categories/4-Debian.rss]
 name = Norbert Tretkowski
 
+
+# n0rman - DC12 
+[http://elchipote.wordpress.com/category/planetdebian/feed/atom/]
+name = Norman García
+face = n0rman.png
+
+
 [http://www.milliways.fr/cat/debian/feed]
 name = Obey Arthur Liu
 face = oal.png
 facewidth = 80
 faceheight = 80
 
+# Both my professional blog here, and next...
 [http://www-public.it-sudparis.eu/~berger_o/weblog/tag/debian-en/feed/]
 name = Olivier Berger
+face = obergix.png
+facewidth = 63
+faceheight = 85
+
+# ... my personal blog
+[http://www.olivierberger.com/weblog/index.php?tag/debian_en/feed/rss2]
+name = Olivier Berger
+face = obergix.png
+facewidth = 63
+faceheight = 85
+
+[http://survex.com/~olly/blog/index.atom]
+name = Olly Betts
+face = olly.png
+facewidth = 64
+faceheight = 64
 
 [http://ondrejcertik.blogspot.com/feeds/posts/default/-/debian]
 name = Ondřej Čertík
 
-# 2008-12-13 - joerg - 503 service unavailable
-#[http://otavio.ossystems.com.br/?feed=rss2&cat=3]
-#name = Otavio Salvador
-#face = otavio.png
-#facewidth = 63
-#faceheight = 85
-
-[http://www.nardol.org/feed/debian]
-name = Pablo Lorenzzoni
-face = spectra.png
-faceheight = 89
+# 2011-12-13 - joerg - 404
+# [http://www.nardol.org/feed/debian]
+# 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
 
-# 2008-12-13 - joerg - 404
-#[http://www.redellipse.net/stuff/Debian/index.rss]
-#name = Pascal Hakim
-#face = pasc.png
-#faceheight = 84
-
-[http://justimho.blogspot.com/feeds/posts/default/-/Debian/]
+[http://tech.just-imho.net/atom.xml]
 name = Patrick Schoenfeld
 
 [http://www.der-winnie.de/tag/debian/feed]
@@ -1645,6 +1439,10 @@ face = pgquiles.png
 facewidth = 65
 faceheight = 82
 
+[http://blog.pault.ag/tagged/debian/rss]
+name = Paul Tagliamonte
+face = paultag.png
+
 [http://paul.luon.net/journal/tags/debian-planet/index.xml]
 name = Paul van Tilburg
 
@@ -1658,11 +1456,12 @@ name = Paul Wise
 [http://www.lupin.org.uk/blog/computing/index.rss]
 name = Pete Nuttall
 
-[http://psychaos.be/~p2/wiki/blog/index/index.rss]
-name = Peter De Schrijver
-face = minishroom.png
-facewidth = 90
-faceheight = 68
+# 2011-12-13 - joerg - CONNREFUSED
+# [http://psychaos.be/~p2/wiki/blog/index/index.rss]
+# name = Peter De Schrijver
+# face = minishroom.png
+# facewidth = 90
+# faceheight = 68
 
 [http://petereisentraut.blogspot.com/feeds/posts/default/-/Debian/]
 name = Peter Eisentraut
@@ -1699,7 +1498,7 @@ face = philh.png
 facewidth = 99
 faceheight = 104
 
-[http://www.blogger.com/feeds/5048890463514304208/posts/default]
+[http://www.blogger.com/feeds/5048890463514304208/posts/default?alt=rss]
 name = Philipp Kern
 face = pkern.png
 facewidth = 69
@@ -1722,13 +1521,6 @@ name = Pietro Abate
 [http://piotr.galiszewski.pl/feeds/posts/default/-/planet-debian]
 name = Piotr Galiszewski
 
-# 2008-12-13 - joerg - 404
-#[http://people.debian.org/~dexter/dexter.jogger.pl.rss]
-#name = Piotr Roszatycki
-#face = dexter.png
-#facewidth = 65
-#faceheight = 89
-
 [http://my.opera.com/atomo64/xml/atom/blog/]
 name = Raphael Geissert
 face = raphael.png
@@ -1741,10 +1533,19 @@ face = hertzog.png
 facewidth = 65
 faceheight = 93
 
+[http://tauware.blogspot.com/atom.xml]
+name = Reinhard Tartler
+
+[http://mones.livejournal.com/data/rss?tag=debian]
+name = Ricardo Mones
+face = mones.png
+facewidth = 65
+faceheight = 85
+
 [http://giskard.noblogs.org/rss.php?categoryId=89]
 name = Riccardo Setti
 
-[http://lot-of-stuff.info/pleindetruc/Blog/debian-planet/index.atom]
+[http://blog.lot-of-stuff.info/Blog/debian-planet/index.atom]
 name = Rémi Vanicat
 
 [http://churropolis.org/?feed=rss2&cat=10]
@@ -1793,10 +1594,6 @@ face = gigio.png
 facewidth = 62
 faceheight = 85
 
-# 2010-12-11 - joerg - timeout
-# [http://spacehunt.info/feed?tag=debian,open-source]
-# name = Roger So
-
 [http://rb.doesntexist.org/blog/index.rss]
 name = Rogério Brito
 
@@ -1812,9 +1609,6 @@ face = toots.png
 facewidth = 70
 faceheight = 69
 
-[http://blog.orebokech.com/index.xml]
-name = Romain Francoise
-
 [http://www.burtonini.com/blog/index.rss2]
 name = Ross Burton
 face = ross.png
@@ -1839,9 +1633,13 @@ name = Ryan Murray
 [http://blog.ryan52.info/?feed=rss2]
 name = Ryan Niebur
 
-# 2008-12-13 - joerg - 404
-#[http://zac.sprackett.com/site/category/technology/debian/rss2]
-#name = S. Zachariah Sprackett
+# 2011-12-13 - joerg - NXDOMAIN
+# GSoC student 2011
+# [http://blog.sam-dunne.com/rss]
+# name = Sam Dunne
+# face = samdunne.png
+# facewidth = 75
+# faceheight = 100
 
 [http://www.painless-security.com/blog/feed/atom]
 name = Sam Hartman
@@ -1852,21 +1650,10 @@ face = hocevar2.png
 facewidth = 65
 faceheight = 89
 
-[http://ressukka.net/blog/tags/debian/index.atom]
-name = Sami Haahtinen
-
 # Added by rfrancoise - DM, in NM
 [http://sandrotosi.blogspot.com/feeds/posts/default]
 name = Sandro Tosi
 
-# 2010-12-11 - joerg - NXDOMAIN
-#[http://santiago.tortugacha.org/?feed=rss2]
-#name = Santiago Ruano Rincon
-
-# 2010-12-11 - joerg - 404
-# [http://www.ringworld.org/~dieman/debianblog/index.xml]
-# name = Scott Dier
-
 [http://skitterman.wordpress.com/category/Debian/feed/]
 name = Scott Kitterman
 
@@ -1880,10 +1667,6 @@ faceheight = 93
 name = Sean Harshbarger
 file = harshy.png
 
-# 2010-12-11 - joerg - 404
-# [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
@@ -1922,19 +1705,15 @@ face = smcv.png
 facewidth = 80
 faceheight = 80
 
-# 2010-12-11 - joerg - 503
-# [http://www.hogyros.de/?q=blog/feed/1]
-# name = Simon Richter
-# face = sjr.png
-# facewidth = 54
-# faceheight = 80
-
 [http://sjoerd.luon.net/blog/index.atom]
 name = Sjoerd Simons
 face = sjoerd.png
 facewidth = 73
 faceheight = 100
 
+[http://sonnenburgs.de/soeren/category/blog/feed]
+name = Soeren Sonnenburg
+
 [http://upsilon.cc/~zack/blog/planet-debian/index.rss]
 name = Stefano Zacchiroli
 
@@ -1944,11 +1723,12 @@ face = sesse.png
 facewidth = 74
 faceheight = 85
 
-[http://blog.peijnik.at/topics/gsoc/feed/]
-name = Stephan Peijnik
-face = sp.png
-facewidth = 85
-faceheight = 85
+# 2011-12-13 - joerg - NXDOMAIN
+# [http://blog.peijnik.at/topics/gsoc/feed/]
+# name = Stephan Peijnik
+# face = sp.png
+# facewidth = 85
+# faceheight = 85
 
 [http://blog.steve.org.uk/index.rss]
 name = Steve Kemp
@@ -1956,10 +1736,7 @@ face = skx.png
 facewidth = 76
 faceheight= 105
 
-[http://www.livejournal.com/users/stevenk/data/rss/]
-name = Steve Kowalik
-
-[http://web.dodds.net/~vorlon/wiki/blog.rss]
+[http://web.dodds.net/~vorlon/wiki/blog/index.rss]
 name = Steve Langasek
 face = vorlon.png
 facewidth = 68
@@ -1984,6 +1761,9 @@ face = sven.png
 facewidth = 75
 faceheight = 95
 
+[http://blog.beuc.net/tags/planet_debian/index.atom]
+name = Sylvain Beucler
+
 [http://le-gall.net/sylvain+violaine/blog/index.php?feed/atom]
 name = Sylvain Le Gall
 face = gildor.png
@@ -1996,8 +1776,15 @@ name = Sylvestre Ledru
 [http://edmonds-debian.livejournal.com/data/rss]
 name = Robert Edmonds
 
-[http://thunk.org/tytso/blog/feed]
-name = Theodore Ts'o
+[http://tanguy.ortolo.eu/blog/planet/debian.rss]
+name = Tanguy Ortolo
+face = tanguy.png
+facewidth = 71
+faceheight = 62
+
+# 2011-12-13 - joerg - CONNREFUSED
+# [http://thunk.org/tytso/blog/feed]
+# name = Theodore Ts'o
 
 [http://theppitak.livejournal.com/data/rss]
 name = Theppitak Karoonboonyanan
@@ -2011,12 +1798,6 @@ face = thijs.png
 facewidth = 65
 faceheight = 67
 
-# 2010-12-11 - joerg - 500
-# [http://haecceity.clearairturbulence.org/xml/atom/category/tech/feed.xml]
-# name = Thom May
-# face = thom.png
-# facewidth = 59
-
 [http://teejeejee.livejournal.com/data/rss?tag=debian]
 name = Thomas Girard
 
@@ -2032,12 +1813,18 @@ face = tg.png
 facewidth = 82
 faceheight = 82
 
-[http://tiagovaz.org/weblog/index.cgi/index.rss2]
+[http://tiagovaz.org/tags/planet-debian/index.atom]
 name = Tiago Bortoletto Vaz
 
 [http://retout.co.uk/blog/index.atom]
 name = Tim Retout
 
+[http://losca.blogspot.com/feeds/posts/default/-/debian?alt=rss]
+name = Timo Jyrinki
+face = timo.png
+faceheight = 100
+facewidth = 100
+
 [http://www.livejournal.com/users/ttroxell/data/rss]
 name = Todd Troxell
 # image is broken somehow
@@ -2068,14 +1855,21 @@ name = Torsten Werner
 [http://www.hermann-uwe.de/node/feed]
 name = Uwe Hermann
 
+[http://www.luffy.cx/en/blog/atom.xml]
+name = Vincent Bernat
+face = bernat.png
+facewidth = 67
+faceheight = 82
+
 [http://vince-debian.blogspot.com/feeds/posts/default]
 name = Vincent Fourmond
 
 [http://vincentsanders.blogspot.com/feeds/posts/default]
 name = Vincent Sanders
 
-[http://www.wiggy.net/index.atom]
-name = Wichert Akkerman
+# 2011-12-13 - joerg - 404
+# [http://www.wiggy.net/index.atom]
+# name = Wichert Akkerman
 
 # Added by micah - William Pitcock (nenolod) works on IRC packages, a syslog replacement, audacity, etc. I've sponsored a number of his packages
 #[http://nenoblog.net/?feed=rss2]
@@ -2101,14 +1895,9 @@ face = corsac-planet.png
 facewidth = 80
 faceheight = 81
 
-[http://blog.zakame.net/tags/debian/rss]
-name = Zak B. Elep
-face = zakame.png
-facewidth = 86
-faceheight = 108
-
-[http://www.piware.de/category/debian/feed/atom/]
-name = Martin Pitt
-face = pitti.png
-facewidth = 74
-faceheight = 98
+# 2011-12-13 - joerg - 404
+# [http://blog.zakame.net/tags/debian/rss]
+# name = Zak B. Elep
+# face = zakame.png
+# facewidth = 86
+# faceheight = 108