[Blends-commit] [SCM] website branch, master, updated. 4d84f1d00be757454d1b5c7a5cae3a43144dd289

[Andreas Tille]

The following commit has been merged in the master branch:
commit 51baa43d082c77b6b3ddc6847d4bf527e9d1a3af
Author: Andreas Tille <tille at debian.org>
Date:   Thu Nov 13 10:13:28 2014 +0100

    One less occurance of Ubuntu names to simplify upgrades to new versions

diff --git a/webtools/templates/uthermometer.xhtml b/webtools/templates/uthermometer.xhtml
index 31ced97..5d201ce 100644
--- a/webtools/templates/uthermometer.xhtml
+++ b/webtools/templates/uthermometer.xhtml
@@ -62,7 +62,7 @@
         <caption><h3>$projectname  packages in Ubuntu Thermometer</h3></caption>
           <tr class='title'>
             <th>Package</th>
-            <th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>raring</th><th>saucy</th><th>trusty</th><th>upstream</th><th>tasks</th>
+            <th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>$ubuntuprev2</th><th>$ubuntuprev1</th><th>$latestubuntu</th><th>upstream</th><th>tasks</th>
          </tr>
          <py:for each="pkg in blend_data">
          <tr class='${pkg.ubuntustatus}'>
diff --git a/webtools/thermometer.py b/webtools/thermometer.py
index 1322f1e..b0564e0 100755
--- a/webtools/thermometer.py
+++ b/webtools/thermometer.py
@@ -370,6 +370,10 @@ def main():
     ulegend = legend[:]
     ulegend.remove(['new', 'Waiting in NEW'])
 
+
+    data['ubuntuprev2']       = ubuntuprev2
+    data['ubuntuprev1']       = ubuntuprev1
+    data['latestubuntu']      = latestubuntu
     data['legend']            = legend
     data['ulegend']           = ulegend
     data['summary']           = to_unicode(_('Summary'))

-- 
Static and dynamic websites for Debian Pure Blends