From 6fa6a8db0787fa40fa1c88b725b0bce184903c4c Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 22 Apr 2013 10:50:03 -0500
Subject: Use required_signoffs value when creating signoff specs

And respect it elsewhere when we create a fake default specification
because a real one does not exist yet.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/signoffs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/packages')

diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index 6fbbd00e..807b613b 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -68,7 +68,7 @@ <h3>Filter Displayed Signoffs</h3>
                 {% endif %}
                 <td>{% include "packages/signoff_cell.html" %}</td>
                 <td class="wrap note">{% if not group.default_spec %}{% with group.specification as spec %}{% comment %}
-                    {% endcomment %}{% if spec.required != 2 %}Required signoffs: {{ spec.required }}<br/>{% endif %}{% comment %}
+                    {% endcomment %}{% if spec.required != spec.arch.required_signoffs %}Required signoffs: {{ spec.required }}<br/>{% endif %}{% comment %}
                     {% endcomment %}{% if not spec.enabled %}Signoffs are not currently enabled<br/>{% endif %}{% comment %}
                     {% endcomment %}{% if spec.known_bad %}Package is known to be bad<br/>{% endif %}{% comment %}
                     {% endcomment %}{{ spec.comments|default:""|linebreaksbr }}
-- 
cgit v1.2.3-54-g00ecf


From 4578eb77da75c24f9b366c2ade46f55b0702b340 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 23 Apr 2013 15:03:31 -0400
Subject: reduce differences

---
 settings.py                       | 1 +
 templates/packages/opensearch.xml | 2 +-
 templates/public/donate.html      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'templates/packages')

diff --git a/settings.py b/settings.py
index dda8f74a..02a4d497 100644
--- a/settings.py
+++ b/settings.py
@@ -174,6 +174,7 @@
 # URL for linking to the release engineering/iso project on the bugtracker
 BUGTRACKER_RELENG_URL = 'https://bugs.archlinux.org/index.php?project=6'
 
+# URL for linking to projects in git
 PROJECTS_URL = 'https://projects.archlinux.org'
 
 # Trackers used for ISO download magnet links
diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml
index 5aa4d5d7..0004b996 100644
--- a/templates/packages/opensearch.xml
+++ b/templates/packages/opensearch.xml
@@ -3,7 +3,7 @@
 	<ShortName>{{BRANDING_SHORTNAME}} Packages</ShortName>
 	<LongName>{{BRANDING_DISTRONAME}} Package Repository Search</LongName>
 	<Description>Search the {{BRANDING_DISTRONAME}} package repositories by keyword in package names and descriptions.</Description>
-	<Tags>linux archlinux package software</Tags>
+	<Tags>{{BRANDING_OSEARCH_TAGS}}</Tags>
 	<Image height="16" width="16" type="image/x-icon">{{ domain }}{% static "favicon.ico" %}</Image>
 	<Image height="64" width="64" type="image/png">{{ domain }}{% static "logos/icon-transparent-64x64.png" %}</Image>
 	<Language>en-us</Language>
diff --git a/templates/public/donate.html b/templates/public/donate.html
index 963a02ca..7b104e4e 100644
--- a/templates/public/donate.html
+++ b/templates/public/donate.html
@@ -8,7 +8,7 @@
 {% cache 600 donations secure %}
 <div id="donations" class="box">
 
-    <h2>Donate to Arch Linux</h2>
+    <h2>Donate to {{ BRANDING_SHORTNAME }}</h2>
 
     <p>Arch Linux survives because of the tireless efforts of many people in
     the community and the core development circle.  None of us are paid for
-- 
cgit v1.2.3-54-g00ecf