Merge commit 'godog/master' into merge

* commit 'godog/master':
  add guid element (same as link) to make feed validator happy
  html entity escape for Maintainer/Description/Changes

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --combined tools/queue_rss.py
index 4c1b45866cde3a5832a871c41bd734d81a85fbcf,7b33121761ad876204e8edf20ca4c7ad76cacdd5..9fc5f429115dd24f1d95886de8b92e82c57d2a8c
--- 1/tools/queue_rss.py
--- 2/tools/queue_rss.py
+++ b/tools/queue_rss.py
@@@ -5,6 -5,7 +5,7 @@@
  # Author: Filippo Giunchedi <filippo@debian.org>
  # Version: 0.4
  
+ import cgi
  import os
  import os.path
  import cPickle
@@@ -17,8 -18,8 +18,8 @@@ import PyRSS2Ge
  
  from debian_bundle.deb822 import Changes
  
 -inrss_filename = "changes_in.rss"
 -outrss_filename = "changes_out.rss"
 +inrss_filename = "NEW_in.rss"
 +outrss_filename = "NEW_out.rss"
  db_filename = "status.db"
  
  parser = OptionParser()
@@@ -110,16 -111,19 +111,19 @@@ def add_rss_item(status, msg, direction
          return False
  
      description = "<pre>Description: %s\nChanges: %s\n</pre>" % \
-             (utf2ascii(msg['Description']), utf2ascii(msg['Changes']))
+             (utf2ascii(cgi.escape(msg['Description'])), utf2ascii(cgi.escape(msg['Changes'])))
+ 
+     link = "http://ftp-master.debian.org/new/%s_%s.html" % \
+             (msg['Source'], msg['Version'])
  
      feed.items.insert(0,
          PyRSS2Gen.RSSItem(
              title,
              pubDate = pubdate,
              description = description,
-             author = utf2ascii(msg['Maintainer']),
-             link = "http://ftp-master.debian.org/new/%s_%s.html" % \
-                     (msg['Source'], msg['Version'])
+             author = utf2ascii(cgi.escape(msg['Maintainer'])),
+             link = link,
+             guid = link
          )
      )