X-Git-Url: https://git.deb.at/?p=deb%2Fhackedgotchi.git;a=blobdiff_plain;f=config%2Fconfig.ini;h=bf7efc285fac62df9717d0e1c2738ad60ff449e0;hp=d436a50fda3892945dc81473591fc248be4b8df2;hb=eb57a77d0de12e2e07e36536c6aaf208326ecc17;hpb=4baa6d2922964c7304322435181522a1214d07e0

diff --git a/config/config.ini b/config/config.ini
index d436a50..bf7efc2 100644
--- a/config/config.ini
+++ b/config/config.ini
@@ -2,53 +2,68 @@
 
 # Every planet needs a [Planet] section
 [Planet]
-# name: Your planet's name
-# link: Link to the main page
-# owner_name: Your name
-# owner_email: Your e-mail address
+# name: Your planet's name.
+# link: Link to the main planet page
 name = Planet Debian
 link = http://planet.debian.org/
-owner_name = Benjamin Mako Hill
-owner_email = mako@debian.org
 
-# cache_directory: Where cached feeds are stored
+# output_dir: Directory to place output files. Add your 2letter Language code
+# date_format: strftime format for the default 'date' template variable
+# new_date_format: strftime format for the 'new_date' template variable
+# cache_directory: Where cached feeds are stored. Add your 2letter Language code
+output_dir = www
+date_format = %d %B, %Y %I:%M%p
+new_date_format = %B %d, %Y
+cache_directory = cache
+
+# Translate the following to your language. Do not change the names, just the
+# text after the =
+syndicationtext = A complete feed is available in any of your favourite syndication formats linked by the buttons below.
+searchtext = Search
+lastupdatetext = Last updated:
+utctext = All times are UTC.
+contacttext = Contact:
+hiddenfeedstext = Hidden Feeds
+hiddenfeedstext2 = You currently have hidden entries.
+showalltext = Show all
+subscriptionstext = Subscriptions
+feedtext = feed
+otherplanettext = Planetarium
+
+# Do not change config values below here, just skip to the feeds
+# Do not change config values below here, just skip to the feeds
+owner_name = Debian Planet Maintainers
+owner_email = planet@debian.org
+
+search = true
 # 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 = 1
+new_feed_items = 5
 log_level = DEBUG
+spider_threads = 15
 
 # template_files: Space-separated list of output template files
-template_files = templates/index.html.tmpl templates/rss20.xml.tmpl templates/rss10.xml.tmpl templates/opml.xml.tmpl templates/foafroll.xml.tmpl
+template_files = templates/index.html.dj templates/atom.xml.dj templates/rss20.xml.dj templates/rss10.xml.dj templates/opml.xml.dj templates/foafroll.xml.dj
 
 # The following provide defaults for each template:
-# output_dir: Directory to place output files
 # items_per_page: How many items to put on each page
 # days_per_page: How many complete days of posts to put on each page
 #                This is the absolute, hard limit (over the item limit)
-# date_format: strftime format for the default 'date' template variable
-# new_date_format: strftime format for the 'new_date' template variable
 # encoding: output encoding for the file, Python 2.3+ users can use the
 #           special "xml" value to output ASCII with XML character references
 # locale: locale to use for (e.g.) strings in dates, default is taken from your
 #         system
-output_dir = www
 items_per_page = 60
 days_per_page = 0
-date_format = %d %B, %Y %I:%M%p
-new_date_format = %B %d, %Y
 encoding = utf-8
 # locale = C
 
-
-# To define a different value for a particular template you may create
-# a section with the same name as the template file's filename (as given
-# in template_files).
-
-# Provide no more than 7 days articles on the front page
 [templates/index.html.tmpl]
 date_format = %I:%M%P
 
+[templates/index.html.dj]
+date_format = %I:%M%P
+
 
 # Options placed in the [DEFAULT] section provide defaults for the feed
 # sections.  Placing a default here means you only need to override the
@@ -59,6 +74,7 @@ date_format = %I:%M%P
 # can omit these variables.
 facewidth = 65
 faceheight = 85
+future_dates = ignore_date
 
 
 ############################## FEEDS ##############################
@@ -80,8 +96,17 @@ name = Adam Rosi-Kessel
 face = kessel.png
 faceheight = 99
 
-[http://chistera.yi.org/~adeodato/blog/planetd.rss]
-name = Adeodato Simó
+# 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]
+name = Adnan Hodzic
+face = adnan.png
+facewidth = 83
+faceheight = 85
 
 [http://blog.fortytwo.ch/feeds/index.rss2]
 name = Adrian von Bidder
@@ -102,18 +127,17 @@ name = Alexander Sack
 name = Alexander Reichle-Schmehl
 face = tolimar.png
 
-[http://www.formorer.de/webwiki/blog/tags/debian/index.rss]
-name = Alexander Wirt
-face = formorer.png
-facewidth = 94
-faceheight = 101
+#don't want flood the planet while I reinstall my blog :)
+#[http://www.formorer.de/webwiki/blog/tags/debian/index.rss]
+#name = Alexander Wirt
+#face = formorer.png
+#facewidth = 94
+#faceheight = 101
 
 [http://www.sukria.net/en/archives/category/debian/rss2/]
 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
 
@@ -128,17 +152,19 @@ 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]
+[http://www.andrelop.org/blog/category/debian/feed/]
 name = Andre Luis Lopes
 
 [http://debsanity.wordpress.com/feed/]
 name = Andrea De Iacovo
 
-[http://blog.ibluepaper.com/?feed=rss2&cat=4]
+# 2008-12-13 - joerg - No blog behind that url
+# 2009-7-24 - bluekuja - blog updated
+[http://blog.abluepaper.com/?cat=1&feed=atom]
 name = Andrea Veri
 face = bluekuja.png
-facewidth = 70
-faceheight = 95
+facewidth = 74
+faceheight = 100
 
 [http://blogs.turmzimmer.net/en/index.rss]
 name = Andreas Barth
@@ -152,16 +178,18 @@ face = andree.png
 facewidth = 92
 faceheight = 112
 
-
 [http://www.andressh.net/rss/andressh.xml]
 face = andressh.png
 name = Andres Seco Hernandez
 
+[http://flosslinuxblog.blogspot.com/atom.xml]
+name = Andrew Cater
+
 [http://blog.andrew.net.au/planetdebian/index.rss]
 name = Andrew Pollock
 face = apollock.png
 facewidth = 88
-faceheight = 103
+faceheight = 126
 
 [http://rottylog.yi.org/wp-rss2.php]
 name = Andreas Rottmann
@@ -181,22 +209,23 @@ faceheight = 100
 [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
+# 2008-12-13 - joerg - no such server, NXDOMAIN
+#[http://www.pomum.no/feed/]
+#name = Annabelle Tully
+#face = pixie.png
+#facewidth= 85
+#faceheight = 99
 
 [http://blog.anselms.net/debian/index.rss]
 name = Anselm Lingnau
 
-[http://antti-juhani.kaijanaho.info/newblog/archives/category/english/feed]
+[http://antti-juhani.kaijanaho.fi/newblog/archives/tag/debian/feed]
 name = Antti-Juhani Kaijanaho
 face = antti.png
 facewidth = 79
 faceheight = 96
 
-[http://nohar.t1r.net/blog/tags/Geek/index.xml]
+[http://nohar.t1r.net/mlog/rss]
 name = Arnaud Cornet
 face = nohar.png
 facewidth = 81
@@ -214,14 +243,6 @@ face = paulproteus.png
 facewidth = 85
 faceheight = 95
 
-# 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
 face = aurel32.png
@@ -246,27 +267,28 @@ 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
+# 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/category/debian/feed]
+[http://blog.venthur.de/feed]
 name = Bastian Venthur
 face = venthur.png
 facewidth = 85
 faceheight = 115
 
-[http://www.gag.com/cgi-bin/blosxom/index.rss]
+[http://www.gag.com/bdale/blog/index.rss]
 name = Bdale Garbee
 face = bdale.png
 facewidth = 58
 
-[http://syn.theti.ca/xml/rss20/feed.xml]
+[http://syn.theti.ca/?feed=rss2]
 name = Ben Armstrong
 face = synrg.png
 facewidth = 64
@@ -294,12 +316,11 @@ faceheight = 93
 name = Benjamin Seidenberg
 face = astronut.png
 
-#Feed disabled while switching to ikiwiki.
-#[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://bzed.de/tags/debian/index.rss]
+name = Bernd Zeimetz
+face = bzed.png
+facewidth = 73
+faceheight = 98
 
 [http://pcpool00.mathematik.uni-freiburg.de/~brl/blog/changelog.rss]
 name = Bernhard R. Link
@@ -312,11 +333,12 @@ name = Biella Coleman
 # facewidth= = 90
 # faceheight = 90
 
-[http://necrotic.deadbeast.net/~branden/blog/exuberance?flav=rss]
-name = Branden Robinson
-face = branden.png
-facewidth = 90
-faceheight = 103
+# 2008-12-13 - joerg - 404
+#[http://necrotic.deadbeast.net/~branden/blog/exuberance?flav=rss]
+#name = Branden Robinson
+#face = branden.png
+#facewidth = 90
+#faceheight = 103
 
 [http://www.imbrandon.com/tag/planet-debian/feed]
 name = Brandon Holtsclaw
@@ -327,8 +349,9 @@ faceheight = 85
 [http://www.sommitrealweird.co.uk/blog/?flav=atom]
 name = Brett Parker
 
-[http://www.bbassett.net/blog/debian-rss.xml]
-name = Brian Bassett
+# 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
@@ -339,16 +362,18 @@ faceheight = 102
 [http://bgoglin.livejournal.com/data/rss?tag=planet.d.o]
 name = Brice Goglin
 
+[http://wp.colliertech.org/cj/?cat=17&feed=rss2]
+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
 
-# 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
+[http://carlchenet.wordpress.com/category/debian/feed]
+name = Carl Chenet
 
-[http://zork.net/~clavicle/dongs/claviola/debian]
+[http://claviola.livejournal.com/data/rss?tag=debian]
 name = Carlos Laviola
 face = claviola.png
 facewidth = 95
@@ -359,8 +384,9 @@ faceheight = 115
 name = Carlos Villegas
 
 # from the extremadura people
-[http://cek.bitacoras.com/archivos/category/english/feed/]
-name = César Gómez Martín
+# 2008-12-13 - joerg - 404
+#[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
@@ -372,11 +398,6 @@ name = Chris Butler
 # 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
 face = lamby.png
@@ -391,7 +412,13 @@ name = Chris Lawrence
 name = Christian Perrier
 face = bubulle.png
 facewidth = 69
-faceheight = 85
+faceheight = 100
+
+[http://cristianporras.wordpress.com/tag/gsoc/feed/]
+name = Cristian Mauricio Porras Duarte
+face = pollopolis.png
+facewidth = 88
+faceheight = 95
 
 [http://blog.spang.cc/xml/rss20/tag/planet/feed.xml]
 name = Christine Spang
@@ -412,6 +439,10 @@ face = haas.png
 [http://jonnylamb.com/category/planet-debian/feed/]
 name = Jonny Lamb
 
+[http://apebox.org/wordpress/tag/debian/feed]
+name = Jo Shields
+face = directhex.png
+
 [http://beta.blogger.com/feeds/9012838934751300850/posts/full]
 name = Christophe Prud'homme
 face = prudhomm.png
@@ -442,10 +473,6 @@ 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 = daniel.png
@@ -456,7 +483,7 @@ faceheight = 102
 name = Daniel Burrows
 face = dburrows.png
 facewidth = 80
-faceheight = 69
+faceheight = 92
 
 [http://www.debian-administration.org/weblog/feeds/dkg]
 name = Daniel Kahn Gillmor
@@ -479,13 +506,6 @@ 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
-# face = kinnison.png
-# facewidth = 75
-# faceheight = 96
-
 [http://blog.digital-scurf.org/?flav=atom]
 name = Daniel Silverstone
 face = kinnison.png
@@ -503,11 +523,17 @@ face = bremner.png
 facewidth = 100
 faceheight = 128
 
-[http://feeds.feedburner.com/InfinitePigTheorem]
-name = David Moreno Garza
+[http://log.damog.net/category/planet-debian/feed]
+name = David Moreno
 face = damog.png
-facewidth = 64
-faceheight = 95
+facewidth = 79
+faceheight = 105
+
+[http://dwgsoc09blog.blogspot.com/feeds/posts/default/-/to-debian-gsoc]
+name = David Wendt Jr.
+face = dwendt.png
+facewidth = 65
+faceheight = 85
 
 [http://dannf.org/bloggf?flav=rss]
 name = Dann Frazier
@@ -554,29 +580,12 @@ faceheight = 110
 # thats bal fasel. there is a difference between dc6 blog and debian times
 [http://blog.debconf.org/blog/index.rss11]
 name = DebConf team
-face = debconf8.png
-facewidth = 201
-faceheight = 64
-
-# flooded planet with pretty useless (for planet) content. Please do not enable again
-# if it stays like this.
-# -- Joerg Jaspert, 2008-08-16
-#[http://meetings-archive.debian.net/pub/debian-meetings/2008/debconf8/index.rss]
-#name = DebConf 8 video
-#face = debconf8.png
-#facewidth = 201
-#faceheight = 64
-
-# 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
+face = debconf9-1.png
+facewidth = 75
+faceheight = 90
 
-# 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
+[http://dsa.debian.org/dsablog/index.rss]
+name = Debian Sysadmin Team
 
 [http://blog.rupamsunyata.org/feed/planet.xml]
 name = Decklin Foster
@@ -584,6 +593,12 @@ face = decklin.png
 facewidth = 80
 faceheight = 116
 
+[http://blogs.gnome.org/diegoe/category/planetdebian/feed/]
+name = Diego Escalante Urrelo
+face = diegoe.png
+facewidth = 74
+faceheight = 85
+
 [http://dirk.eddelbuettel.com/blog/index.rss]
 name = Dirk Eddelbuettel
 face = dirk.png
@@ -613,7 +628,13 @@ face = pochu.png
 facewidth = 65
 faceheight = 85
 
-[http://www.enricozini.org/blog/pdo.rss]
+[http://emilio.pozuelo.org/?cat=17&feed=atom]
+name = Emilio Pozuelo Monfort (GSoC)
+face = pochu.png
+facewidth = 65
+faceheight = 85
+
+[http://www.enricozini.org/blog/pdo/index.rss]
 name = Enrico Zini
 
 [http://emarocca.livejournal.com/data/rss/]
@@ -649,6 +670,12 @@ face = evan.png
 facewidth = 65
 faceheight = 85
 
+[http://www.die-welt.net/rss.php?tags=planet-debian]
+name = Evgeni Golov
+face = evgeni.png
+facewidth = 100
+faceheight = 100
+
 [http://www.fabbione.net/blog?flav=rss]
 name = Fabio M. Di Nitto
 face = fabbione.png
@@ -680,14 +707,16 @@ face = nanda.png
 facewidth = 55
 faceheight = 70
 
-[http://slider.rack66.net/~mechanix/blog/?flav=atom]
+#[http://feeds.feedburner.com/mechanixthoughts]
+[http://blog.sysfs.net/feeds/atom10.xml]
 name = Filip Van Raemdonck
 face = mechanix.png
 facewidth = 71
 faceheight = 94
 
-[http://filipe.icewall.org/index.php/feed/atom/]
-name = Filipe Lautert
+# 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
@@ -714,18 +743,22 @@ faceheight = 114
 
 [http://feeding.cloud.geek.nz/feeds/posts/default/-/debian]
 name = Francois Marier
+face = francois.png
+facewidth = 65
+faceheight = 93
 
-[http://frank.thomas-alfeld.de/wp/category/english/feed]
+[http://blue-dwarf.de/wp/category/english/feed]
 name = Frank S. Thomas
 
 [http://alioth.debian.org/~fjp/log/index.rss]
 name = Frans Pop
 
-[http://ukai.org/b/log/debian/?flav=rss]
-name = Fumitoshi Ukai
-face = ukai.png
-facewidth = 65
-faceheight = 85
+# 2008-12-13 - joerg - 500
+#[http://ukai.org/b/log/debian/?flav=rss]
+#name = Fumitoshi Ukai
+#face = ukai.png
+#facewidth = 65
+#faceheight = 85
 
 [http://cateee.blogspot.com/feeds/posts/default]
 name = Giacomo Catenazzi
@@ -742,14 +775,6 @@ face = rhonda.png
 facewidth  = 89
 faceheight = 84
 
-# 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
 
@@ -781,8 +806,8 @@ name = Guilherme de S. Pastore
 [http://gwolf.org/rss.xml]
 name = Gunnar Wolf
 face = gwolf.png
-facewidth = 60
-faceheight = 102
+facewidth = 54
+faceheight = 97
 
 [http://stratusandtheswirl.blogspot.com/atom.xml]
 name = Gustavo Franco
@@ -818,11 +843,12 @@ 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
+# 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
@@ -845,10 +871,11 @@ face = isaac.png
 facewidth = 90
 faceheight = 89
 
-# 2005-07-06 jordi
-# Feed is 404.
-# [http://home.o2w.net/~ivo/index/debian/index.rss]
-# name = Ivo Timmermans
+[http://www.dittberner.info/en/taxonomy/term/33/0/feed]
+name = Jan Dittberner
+face = jandd.png
+facewidth = 60
+faceheight = 85
 
 [http://sicherheitsschwankung.de/topic/linux/debian/feed]
 name = Jan Lübbe
@@ -858,11 +885,6 @@ name = Javier Linares
 face = jlinares.png
 facewidth = 60
 
-# 2005-07-06 jordi
-# Feed is 404.
-#[http://blogs.yacoi.com/blogs/vigu/rdf10_xml]
-#name = Javier Viñuales Gutiérrez
-
 [http://www.braincells.com/debian/index.rss]
 name = Jaldhar Vyas
 face = jaldhar.png
@@ -872,14 +894,18 @@ faceheight = 102
 [http://phython.blogspot.com/atom.xml]
 name = 	James Morrison
 
+[http://jhr-online.de/tag/debian/feed]
+name = Jan Hauke Rahm
+
 [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 
+# 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
@@ -887,13 +913,16 @@ name = Jeff Bailey
 [http://www.licquia.org/feed/]
 name = Jeff Licquia
 
-[http://blogs.famille-corbier.net/jeremie/atom-planet-debian.xml]
-name = Jérémie Corer
+[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://jeroen.wolffelaar.nl/blog/debian.rss]
 name = Jeroen van Wolffelaar
 
-# 2006-06-22 mako 
+# 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]
@@ -923,14 +952,14 @@ face = nomeata.png
 facewidth = 64
 faceheight = 64
 
-#[http://ganneff.de/blog/index.rss]
-[http://blog.ganneff.de/blog/index.rss]
+[http://blog.ganneff.de/blog/atom.xml]
 name = Joerg Jaspert
 
-[http://www.wendlandnet.de/joerg/blog/en/index.rss]
-name = Joerg Wendland
-face = jwendland.png
-faceheight = 89
+# 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
@@ -954,6 +983,12 @@ face = noodles.png
 facewidth = 110
 faceheight = 118
 
+[http://jawnsy.wordpress.com/tag/google-summer-of-code/feed/]
+name = Jonathan Yu
+face = jawnsy.png
+facewidth = 75
+faceheight = 85
+
 [http://damad.be/joost/blog/category/debian/rss.xml]
 name = Joost Yervante Damad
 face = andete.png
@@ -989,14 +1024,6 @@ face = bureado.png
 facewidth = 80
 faceheight = 98
 
-# 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
-
 # Debian Maintainer, SoC 2008 student; mentor is Fabio Tranchitella (kobold)
 [http://gnucrash.wordpress.com/category/debianpl/feed/]
 name = Juan Luis Belmonte
@@ -1013,7 +1040,7 @@ faceheight = 89
 [http://julien.danjou.info/blog/index.php/feed/en/atom]
 name = Julien Danjou
 face = jdanjou.png
-facewidth = 100 
+facewidth = 100
 faceheight = 84
 
 [http://www.kirya.net/weblog/tag/planet-debian/feed/]
@@ -1025,7 +1052,7 @@ face = dancer.png
 facewidth = 75
 faceheight = 97
 
-[http://blog.wooyd.org/wp-rss2.php]
+[http://blog.wooyd.org/index.rss]
 name = Jurij Smakov
 face = jurij.png
 facewidth = 71
@@ -1039,7 +1066,7 @@ faceheight = 78
 [http://www.imsc.res.in/~kapil/blog?flav=rss20]
 name = Kapil Paranjape
 
-[http://ftbfs.wordpress.com/feed]
+[http://ftbfs.wordpress.com/feed/atom]
 name = Kartik Mistry
 face = kartik.png
 facewidth = 75
@@ -1052,8 +1079,9 @@ face = kees.png
 facewidth = 92
 faceheight = 84
 
-[http://b9.com/index.rdf]
-name = Kevin Rosenberg
+# 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
@@ -1069,6 +1097,12 @@ name = Kyle McMartin
 face = mcmartin.png
 faceheight = 100
 
+[http://costela.net/tag/debian-planet/feed/]
+name = Leo 'costela' Antunes
+face = costela.png
+faceheight = 105
+facewidth = 72
+
 # 2008-04-24 liw commented out himself
 #[http://blog.liw.fi/tag/planet-debian/index.atom]
 #name = Lars Wirzenius
@@ -1084,12 +1118,24 @@ face = loldebian.png
 facewidth = 130
 faceheight = 65
 
-[http://kaeso.wordpress.com/category/planet-debian/feed/]
+[http://kaeso.wordpress.com/category/planet-debian/feed/atom]
 name = Luca Bruno
 face = lucab.png
 facewidth = 80
 faceheight = 95
 
+[http://slackydeb.blogspot.com/feeds/posts/default/-/gsoc]
+name = Luca Favatella
+face = slackydeb.png
+facewidth = 64
+faceheight = 64
+
+[http://dktrkranz.wordpress.com/category/planet-debian/feed/atom/]
+name = Luca Falavigna
+face = dktrkranz.png
+facewidth = 70
+faceheight = 95
+
 [http://www.lucas-nussbaum.net/blog/?feed=rss2&cat=13]
 name = Lucas Nussbaum
 face = lucas.png
@@ -1100,13 +1146,7 @@ faceheight = 88
 name = Luciano Bello
 face = lucianobello.png
 facewidth = 65
-faceheight = 70 
-
-[https://zomers.be/~luk/blog/index.rss]
-name = Luk Claes
-face = luk.png
-facewidth = 70
-faceheight = 110
+faceheight = 70
 
 [http://www.golden-gryphon.com/blog/manoj/index.rss]
 name = Manoj Srivastava
@@ -1125,7 +1165,7 @@ name = Marc 'Zugschlus' Haber
 face = zugschlus.png
 
 [http://mltplanet.livejournal.com/data/rss]
-name = Marcela Tiznado 
+name = Marcela Tiznado
 face = mlt.png
 facewidth = 65
 faceheight = 71
@@ -1142,17 +1182,19 @@ face = marga.png
 facewidth = 65
 faceheight = 103
 
-[http://blog.marioiseli.com/index.php/feed]
-name = Mario Iseli
-face = mario.png
-facewidth = 65
-faceheight = 93
+# 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
 
-[http://tildemh.com/blog/debian/index.rss]
-name = Mark Howard
+# 2008-12-13 - joerg - 404
+#[http://tildemh.com/blog/debian/index.rss]
+#name = Mark Howard
 
 [http://q-funk.blogspot.com/atom.xml]
 name = Martin-Éric Racine
@@ -1183,13 +1225,20 @@ face = tincho.png
 facewidth = 100
 faceheight = 100
 
+[http://feeds2.feedburner.com/SourceGuru]
+name = Martin Meredith
+face = mez.png
+nick = Mez
+facewidth = 71
+faceheight = 80
+
 [http://www.cyrius.com/journal/?flav=atom]
 name = Martin Michlmayr
 face = tbm.png
 facewidth = 67
 faceheight = 90
 
-[http://blog.zobel.ftbfs.de/feed/]
+[http://blog.zobel.ftbfs.de/rss.xml]
 name = Martin Zobel-Helas
 face = zobel.png
 
@@ -1199,6 +1248,12 @@ face = mattb.png
 facewidth = 65
 faceheight = 85
 
+[http://mdzlog.alcor.net/feed/]
+name = Matt Zimmerman
+face = mdz.png
+facewidth = 65
+faceheight = 90
+
 [http://www.itp.tuwien.ac.at/~mattems/blog/index.rss]
 name = Maximilian Attems
 face = maks.png
@@ -1208,11 +1263,12 @@ faceheight = 83
 [http://www.infodrom.org/~joey/log/joey.rdf]
 name = Joey Schulze
 
-[http://www.mhatta.org/blog/blosxom.cgi/index.atom]
-name = Masayuki Hatta
-face = mhatta.png
-facewidth = 77
-faceheight = 85
+# 2008-12-13 - joerg - No data (looks like config error)
+#[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]
@@ -1257,7 +1313,7 @@ name = Maximilian Attems
 name = Meike Reichle
 face = alphascorpii.png
 facewidth = 76
-faceheight = 92 
+faceheight = 92
 
 [http://www.advogato.org/person/mbanck/rss.xml]
 name = Michael Banck
@@ -1265,12 +1321,25 @@ face = azeem.png
 facewidth = 64
 faceheight = 79
 
+[http://mbanck.livejournal.com/data/rss/]
+name = Michael Banck
+face = azeem.png
+facewidth = 64
+faceheight = 79
+
+[http://www.blogger.com/feeds/4695702196537398257/posts/default]
+name = Michael Casadevall
+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.
-[http://base0.net/feeds/categories/20-Planet-Debian.rss]
-name = Michael Janssen
-face = jamuraa.png
-facewidth = 59
+# 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
@@ -1345,7 +1414,7 @@ faceheight = 84
 [http://muammar.me/blog/index.php?/feeds/categories/17-Debian-English.rss]
 name = Muammar El Khatib
 
-[http://criptonita.com/~nacho/blog/wp-rss2.php?cat=11]
+[http://criptonita.com/~nacho/blog/category/debian/feed/]
 name = Nacho Barrientos Arias
 face = chipi.png
 facewidth = 63
@@ -1354,8 +1423,6 @@ faceheight = 85
 [http://nion.modprobe.de/blog/rss.php?serendipity%5btag%5d=debian]
 name = Nico Golde
 
-# 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
@@ -1373,7 +1440,7 @@ faceheight = 113
 name = Nicolas Valcárcel
 face = nxvl.png
 facewidth = 85
-faceheight = 113 
+faceheight = 113
 
 [http://nlm-morgul.livejournal.com/data/rss?tag=planetdebian]
 name = Noah Meyerhans
@@ -1382,7 +1449,7 @@ face = noahm.png
 [http://aniki.daionet.gr.jp/~knok/blog/blosxom.cgi/index.rss]
 name = NOKUBI Takatsugu
 
-[http://tretkowski.de/blog/feeds/index.rss2]
+[http://tretkowski.de/blog/feeds/categories/3-Debian.rss]
 name = Norbert Tretkowski
 
 [http://www.milliways.fr/cat/debian/feed]
@@ -1394,11 +1461,12 @@ faceheight = 80
 [http://ondrejcertik.blogspot.com/feeds/posts/default/-/debian]
 name = Ondřej Čertík
 
-[http://otavio.ossystems.com.br/?feed=rss2&cat=3]
-name = Otavio Salvador
-face = otavio.png
-facewidth = 63
-faceheight = 85
+# 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
@@ -1410,10 +1478,11 @@ 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
+# 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/]
 name = Patrick Schoenfeld
@@ -1430,14 +1499,6 @@ name = Paul Wise
 #[http://people.dsv.su.se/~pelle/blog.rss]
 #name = Per Olofsson
 
-# 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
-
 # Added by neilm 20070208
 [http://www.lupin.org.uk/blog/computing/index.rss]
 name = Pete Nuttall
@@ -1450,6 +1511,9 @@ faceheight = 68
 
 [http://petereisentraut.blogspot.com/feeds/posts/default/-/Debian/]
 name = Peter Eisentraut
+face = petere.png
+facewidth = 80
+faceheight = 80
 
 [http://peter.makholm.net/feed/?cat=12,13]
 name = Peter Makholm
@@ -1483,6 +1547,12 @@ face = pkern.png
 facewidth = 69
 faceheight = 85
 
+[http://feeds2.feedburner.com/GSoC09-NewWB]
+name = Philipp Kern (GSoC)
+face = pkern.png
+facewidth = 69
+faceheight = 85
+
 [http://blog.madism.org/rss.php?lang=en]
 name = Pierre Habouzit
 face = phabouzit.png
@@ -1494,11 +1564,12 @@ name = Pierre Machard
 face = machard.png
 faceheight = 84
 
-[http://people.debian.org/~dexter/dexter.jogger.pl.rss]
-name = Piotr Roszatycki
-face = dexter.png
-facewidth = 65
-faceheight = 89
+# 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://khensu.org/xml-rss2.php?full=yes]
 name = Randall Donald
@@ -1506,6 +1577,9 @@ face = rdonald.png
 facewidth = 85
 faceheight = 85
 
+[http://www.painless-security.com/blog/feed/atom]
+name = Sam Hartman
+
 # Added by rfrancoise - DM, in NM
 [http://sandrotosi.blogspot.com/feeds/posts/default]
 name = Sandro Tosi
@@ -1526,8 +1600,8 @@ faceheight = 85
 [http://www.ouaza.com/wp/category/english/feed/]
 name = Raphaël Hertzog
 face = hertzog.png
-facewidth = 62
-faceheight = 90
+facewidth = 87
+faceheight = 125
 
 [http://giskard.noblogs.org/rss.php?categoryId=89]
 name = Riccardo Setti
@@ -1535,6 +1609,12 @@ name = Riccardo Setti
 [http://remi.vanicat.free.fr/blog/index.php/category/debian-planet/feed/]
 name = Remi Vanicat
 
+[http://churropolis.org/?feed=rss2&cat=10]
+name = René Mayorga
+face = rmayorga.png
+facewidth = 90
+faceheight = 102
+
 [http://suihkulokki.blogspot.com/feeds/posts/default/-/debian]
 name = Riku Voipio
 face = nchip.png
@@ -1556,13 +1636,17 @@ face = robot101.png
 facewidth = 68
 faceheight = 90
 
+[http://robertmh.wordpress.com/feed/]
+name = Robert Millan
+face = rmh.png
+
 [http://www.nul-unu.com/blogs/bleeding-edge/feed/]
 name = Rodrigo Gallardo
 face = gigio.png
 facewidth = 62
 faceheight = 85
 
-[http://spacehunt.info/feed?tag=debian,open-source] 
+[http://spacehunt.info/feed?tag=debian,open-source]
 name = Roger So
 
 [http://roland.entierement.nu/categories/en.rss]
@@ -1592,8 +1676,11 @@ face = runa.png
 facewidth = 70
 faceheight = 92
 
-[http://stone-head.org/readme/debian/index.rss]
+[http://blog.stone-head.org/category/debian/feed]
 name = Rudy Godoy
+face = rudy.png
+facewidth = 65
+faceheight = 61
 
 [http://www.eyrie.org/~eagle/journal/debian.rss]
 name = Russ Allbery
@@ -1604,8 +1691,9 @@ name = Russell Coker
 [http://www.advogato.org/person/neuro/rss.xml]
 name = Ryan Murray
 
-[http://zac.sprackett.com/site/category/technology/debian/rss2]
-name = S. Zachariah Sprackett
+# 2008-12-13 - joerg - 404
+#[http://zac.sprackett.com/site/category/technology/debian/rss2]
+#name = S. Zachariah Sprackett
 
 [http://sam.zoy.org/blog/rss20.xml?cat=debian]
 name = Sam Hocevar
@@ -1622,11 +1710,6 @@ name = Santiago Ruano Rincon
 [http://www.ringworld.org/~dieman/debianblog/index.xml]
 name = Scott Dier
 
-# 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
-
 [http://www.seanius.net/feeds/planet-debian/index.rss]
 name = Sean Finney
 face = seanius.png
@@ -1651,26 +1734,15 @@ name = Sergio Talens-Oliag
 face = sto.png
 sort_order = seen
 
+[http://sandyleo26.wordpress.com/feed/]
+name = Sha Liu
+face = sandyleo.png
+facewidth = 65
+faceheight = 85
+
 [http://www.earth.li/~huggie/blog/tech/debian/planet/index.atom]
 name = Simon Huggins
 
-# 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
-
 [http://sfllaw.livejournal.com/data/rss?tag=p.d.o]
 name = Simon Law
 face = slaw.png
@@ -1692,6 +1764,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
+
 [http://blog.steve.org.uk/feed/rss2/index.php]
 name = Steve Kemp
 face = skx.png
@@ -1719,6 +1797,7 @@ face = sune.png
 facewidth = 65
 faceheight = 90
 
+# 2008-12-13 - joerg - Server broken
 [http://blog.incase.de/index.php/category/planetdebian/feed/]
 name = Sven Mueller
 face = sven.png
@@ -1751,9 +1830,6 @@ facewidth = 59
 [http://teejeejee.livejournal.com/data/rss?tag=debian]
 name = Thomas Girard
 
-[http://halbgar.com/english/?flav=rss]
-name = Thomas Viehmann
-
 [http://tiagovaz.wordpress.com/category/english/feed/atom/]
 name = Tiago Bortoletto Vaz
 face = tiago.png
@@ -1801,17 +1877,23 @@ face = wouter3.png
 facewidth = 85
 faceheight = 80
 
-# Added by akumar - Giridhar works on elinks and ifplugd, and is a DM and in NM.
 [http://appaji.livejournal.com/data/atom]
 name = Y Giridhar Appaji Nag
+face = appaji.png
+facewidth = 75
+faceheight = 97
 
 [http://www.corsac.net/rss.php?cat=debian]
 name = Yves-Alexis Perez
 face = corsac-planet.png
 facewidth = 80
 faceheight = 81
- 
+
 # 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
+
+# Added by Enrico Zini, currently in NM queue
+[http://jackyf.livejournal.com/data/rss?tag=debian-en]
+name = Eugene V. Lyubimkin