Merge tag 'release_2013-11-25' into archweb-generic

Django 1.6 upgrade and other changes

Conflicts:
	templates/news/list.html
	templates/public/index.html

1 files changed, 14 insertions, 0 deletions

diff --git a/main/utils.py b/main/utils.py
index 9ee8db58..97cc540a 100644
--- a/main/utils.py
+++ b/main/utils.py
@@ -187,4 +187,18 @@ class PackageStandin(object):
         return '/packages/%s/%s/%s/' % (
                 self.repo.name.lower(), self.arch.name, self.pkgbase)
 
+
+class DependStandin(object):
+    '''Resembles a Depend object, and has a few of the same fields, but is
+    really a link to a base package rather than a single package.'''
+    def __init__(self, depends):
+        self._depends = depends
+        first = depends[0]
+        self.name = first.name
+        self.version = first.version
+        self.comparison = first.comparison
+        self.description = first.description
+        self.deptype = first.deptype
+        self.pkg = first.pkg.base_package() or PackageStandin(first.pkg)
+
 # vim: set ts=4 sw=4 et: