Merge branch 'archweb-generic2'

Conflicts:
	Makefile
	templates/public/index.html

1 files changed, 6 insertions, 2 deletions

diff --git a/feeds.py b/feeds.py
index e96c2ca4..8a9c59d1 100644
--- a/feeds.py
+++ b/feeds.py
@@ -50,7 +50,6 @@ class PackageFeed(Feed):
 
     link = '/packages/'
     title_template = 'feeds/packages_title.html'
-    description_template = 'feeds/packages_description.html'
 
     def __call__(self, request, *args, **kwargs):
         wrapper = condition(etag_func=package_etag, last_modified_func=package_last_modified)
@@ -113,6 +112,9 @@ class PackageFeed(Feed):
     def item_pubdate(self, item):
         return item.last_update
 
+    def item_description(self, item):
+        return item.pkgdesc
+
     def item_categories(self, item):
         return (item.repo.name, item.arch.name)
 
@@ -134,7 +136,6 @@ class NewsFeed(Feed):
     link = '/news/'
     description = 'The latest and greatest news from the '+settings.BRANDING_DISTRONAME+' distribution.'
     subtitle = description
-    title_template = 'feeds/news_title.html'
     description_template = 'feeds/news_description.html'
 
     def __call__(self, request, *args, **kwargs):
@@ -156,6 +157,9 @@ class NewsFeed(Feed):
     def item_author_name(self, item):
         return item.author.get_full_name()
 
+    def item_title(self, item):
+        return item.title
+
 
 class ReleaseFeed(Feed):
     feed_type = GuidNotPermalinkFeed