X-Git-Url: https://git.deb.at/?p=deb%2Fhackedgotchi.git;a=blobdiff_plain;f=config%2Fconfig.ini;h=ee435d3af1a64503378bd9bd3dda0cf6c6919703;hp=b7a5e1865c8de5733c030a3e8ae49630b95380e5;hb=315a456e11de6128df7057737af8ced100f9b192;hpb=25c52c4c56822595ca66b064b91e141c42c8b95d

diff --git a/config/config.ini b/config/config.ini
index b7a5e18..ee435d3 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 ##############################
@@ -83,7 +99,7 @@ faceheight = 99
 [http://chistera.yi.org/~adeodato/blog/planetd.rss]
 name = Adeodato Simó
 
-[http://blog.fortytwo.ch/feeds/atom10.xml]
+[http://blog.fortytwo.ch/feeds/index.rss2]
 name = Adrian von Bidder
 face = cmot.png
 facewidth = 71
@@ -112,8 +128,6 @@ 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
 
@@ -134,11 +148,12 @@ name = Andre Luis Lopes
 [http://debsanity.wordpress.com/feed/]
 name = Andrea De Iacovo
 
-[http://blog.ibluepaper.com/?feed=rss2&cat=4]
-name = Andrea Veri
-face = bluekuja.png
-facewidth = 70
-faceheight = 95
+# 2008-12-13 - joerg - No blog behind that url
+#[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
@@ -152,7 +167,6 @@ face = andree.png
 facewidth = 92
 faceheight = 112
 
-
 [http://www.andressh.net/rss/andressh.xml]
 face = andressh.png
 name = Andres Seco Hernandez
@@ -181,11 +195,12 @@ 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
@@ -214,14 +229,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,11 +253,12 @@ 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
@@ -312,11 +320,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 +336,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
@@ -343,11 +353,6 @@ name = Brice Goglin
 [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://zork.net/~clavicle/dongs/claviola/debian]
 name = Carlos Laviola
 face = claviola.png
@@ -359,8 +364,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 +378,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
@@ -442,10 +443,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
@@ -479,13 +476,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,8 +493,8 @@ 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
@@ -524,6 +514,12 @@ face = dnusinow.png
 faceheight = 85
 facewidth = 56
 
+[http://www.hanskalabs.net/taxonomy/term/5/all/feed]
+name = David Paleino
+face = hanska.png
+facewidth = 65
+faceheight = 85
+
 [http://www.davidpashley.com/cgi/pyblosxom.cgi?flav=atom]
 name = David Pashley
 face = jd.png
@@ -552,26 +548,6 @@ 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
-
-# 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://blog.rupamsunyata.org/feed/planet.xml]
 name = Decklin Foster
 face = decklin.png
@@ -601,6 +577,12 @@ face = blade.png
 facewidth = 78
 faceheight = 90
 
+[http://emilio.pozuelo.org/?cat=13&feed=atom]
+name = Emilio Pozuelo Monfort
+face = pochu.png
+facewidth = 65
+faceheight = 85
+
 [http://www.enricozini.org/blog/pdo.rss]
 name = Enrico Zini
 
@@ -643,6 +625,12 @@ face = fabbione.png
 facewidth = 65
 faceheight = 89
 
+[http://www.livejournal.com/users/np237/data/rss]
+name = Josselin Mouette
+face = np237.png
+facewidth = 103
+faceheight = 137
+
 [http://kobold.it/blog/rss.xml]
 name = Fabio Tranchitella
 
@@ -662,14 +650,16 @@ face = nanda.png
 facewidth = 55
 faceheight = 70
 
-[http://slider.rack66.net/~mechanix/blog/?flav=atom]
-name = Filip Van Raemdonck
-face = mechanix.png
-facewidth = 71
-faceheight = 94
+# 2008-12-13 - joerg - server does not exist, NXDOMAIN
+#[http://slider.rack66.net/~mechanix/blog/?flav=atom]
+#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
@@ -677,6 +667,9 @@ face = filippo.png
 facewidth = 65
 faceheight = 86
 
+[http://www.marsmenschen.com/taxonomy/term/5/0/feed]
+name = Florian Maier
+
 [http://perldition.org/feeds/articles/atom]
 name = Florian Ragwitz
 
@@ -694,17 +687,18 @@ faceheight = 114
 [http://feeding.cloud.geek.nz/feeds/posts/default/-/debian]
 name = Francois Marier
 
-[http://frank.thomas-alfeld.de/wp/category/english/debian-english/feed]
+[http://frank.thomas-alfeld.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
@@ -721,14 +715,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
 
@@ -797,11 +783,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
@@ -824,17 +811,6 @@ 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://raw-output.org/feed/rss2]
-name = Jacobo Tarrío Barreiro
-face = jacobo.png
-facewidth = 71
-faceheight = 95
-
 [http://sicherheitsschwankung.de/topic/linux/debian/feed]
 name = Jan Lübbe
 
@@ -843,11 +819,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
@@ -863,8 +834,9 @@ 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
@@ -908,14 +880,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
@@ -923,7 +895,7 @@ face = joeyh2.png
 facewidth = 84
 faceheight = 75
 
-[http://changelog.complete.org/feeds/index.rss1]
+[http://changelog.complete.org/feed]
 name = John Goerzen
 
 [http://jonbernard.blogspot.com/feeds/posts/default/-/debian]
@@ -939,6 +911,12 @@ face = noodles.png
 facewidth = 110
 faceheight = 118
 
+[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
@@ -950,7 +928,7 @@ face = nm_bencer.png
 faceheight = 80
 facewidth = 56
 
-[http://www.tribulaciones.org/blog/index.rss20]
+[http://feeds.feedburner.com/TribulacionesorgEnglish]
 name = Jose Carlos Garcia Sogo
 face = jsogo.png
 faceheight = 100
@@ -968,25 +946,11 @@ 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
-
-[http://www.livejournal.com/users/np237/data/rss]
-name = Josselin Mouette
-face = np237.png
-facewidth = 103
-faceheight = 137
-
 # Debian Maintainer, SoC 2008 student; mentor is Fabio Tranchitella (kobold)
 [http://gnucrash.wordpress.com/category/debianpl/feed/]
 name = Juan Luis Belmonte
 
-[http://juliank.wordpress.com/feed/]
+[http://juliank.wordpress.com/feed/atom]
 name = Julian Andres Klode
 
 [http://blog.technologeek.org/feed]
@@ -1024,7 +988,7 @@ faceheight = 78
 [http://www.imsc.res.in/~kapil/blog?flav=rss20]
 name = Kapil Paranjape
 
-[http://ftbfs.wordpress.com/atom]
+[http://ftbfs.wordpress.com/feed/atom]
 name = Kartik Mistry
 face = kartik.png
 facewidth = 75
@@ -1037,8 +1001,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
@@ -1046,6 +1011,9 @@ face = kmuto.png
 facewidth = 68
 faceheight = 101
 
+[http://www.roeckx.be/journal/index.rss]
+name = Kurt Roeckx
+
 [http://kyle.mcmartin.ca/.plan/?feed=rss2]
 name = Kyle McMartin
 face = mcmartin.png
@@ -1112,7 +1080,7 @@ face = mlt.png
 facewidth = 65
 faceheight = 71
 
-[http://blog.bofh.it/debian/?format=atom03]
+[http://blog.bofh.it/debian/?format=atom]
 name = Marco d'Itri
 face = md.jpg
 facewidth = 96
@@ -1124,17 +1092,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
@@ -1190,11 +1160,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]
@@ -1247,12 +1218,19 @@ 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
@@ -1324,7 +1302,10 @@ face = moray.png
 facewidth = 70
 faceheight = 84
 
-[http://criptonita.com/~nacho/blog/wp-rss2.php?cat=11]
+[http://muammar.me/blog/index.php?/feeds/categories/17-Debian-English.rss]
+name = Muammar El Khatib
+
+[http://criptonita.com/~nacho/blog/category/debian/feed/]
 name = Nacho Barrientos Arias
 face = chipi.png
 facewidth = 63
@@ -1333,8 +1314,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,11 +1352,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
@@ -1389,10 +1369,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
@@ -1409,14 +1390,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,7 +1423,7 @@ face = pvaneynd.png
 facewidth = 59
 faceheight = 100
 
-[http://blog.hands.com/?flav=rss]
+[http://wiki.hands.com/chezfil/index.rss]
 name = Phil Hands
 face = philh.png
 facewidth = 99
@@ -1473,11 +1446,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
@@ -1514,6 +1488,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
@@ -1571,8 +1551,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
@@ -1583,8 +1566,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
@@ -1601,10 +1585,11 @@ 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
+facewidth = 73
+faceheight = 93
 
 [http://www.advogato.org/person/harshy/rss.xml]
 name = Sean Harshbarger
@@ -1627,23 +1612,6 @@ sort_order = seen
 [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 +1660,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
@@ -1704,9 +1673,6 @@ face = gildor.png
 facewidth = 65
 faceheight = 81
 
-[http://wiki.tauware.de/doku.php?blog=feed&tag=debian]
-name = Reinhard Tartler
-
 [http://edmonds-debian.livejournal.com/data/rss]
 name = Robert Edmonds
 
@@ -1727,6 +1693,15 @@ 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
+faceheight = 112
+facewidth = 100
+
 [http://www.livejournal.com/users/ttroxell/data/rss]
 name = Todd Troxell
 # image is broken somehow
@@ -1764,9 +1739,9 @@ face = nenolod.png
 
 [http://www.grep.be/blog/en/index.myrss]
 name = Wouter Verhelst
-face = wouter2.png
-facewidth = 68
-faceheight = 85
+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]