[Blends-commit] [SCM] website branch, master, updated. 614dbfd115d78537704971fd047aa3f05ed2c8f0

[Andreas Tille]

The following commit has been merged in the master branch:
commit c9b52e33f55fd57d1507e0914b875b73a67e6286
Author: Andreas Tille <tille at debian.org>
Date:   Fri Aug 1 13:34:55 2014 +0200

    Drop Debian Lex since this project was never real alive; add Debian Games which intends to release with Jessie

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index c58ef80..0178af8 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -843,6 +843,7 @@ class DependantPackage:
                         else:
                             logger.debug("Author string changed in %s: '%s' -> '%s'", self.pkg, to_unicode(row[pub]), to_unicode(authors_string))
                             row[pub] = authors_string
+                        print "DEBUG1", row[pub]
                 if not self.properties.has_key('published'):
                     self.properties['published'] = {}
                 if self.properties['published'].has_key(pub):
@@ -855,6 +856,9 @@ class DependantPackage:
             	    else:
             	        logger.info("%s conflicting fields Publication-%s in tasks file with value '%s' and in UDD with value '%s'" % (self.pkg, pub, self.properties['published'][pub], to_unicode(row[pub])))
                 self.properties['published'][pub] = to_unicode(row[pub])
+	print "DEBUG2", row['authors']
+##	if self.properties.has_key['published']:
+##FIXME	    print "DEBUG2a", self.properties['published']['authors']
 
 class Tasks:
     # Provide a list of depencencies defined in metapackages
@@ -1655,6 +1659,11 @@ class TaskDependencies:
                 # package versions in all releases
                 dep.properties['pkg-url'] = PKGURLMASK % dep.pkg
                 dep.SetPublications(row)
+		if dep.properties.has_key('published'):
+                    try:
+                    	print "DEBUG3a", dep.properties['published']['authors']
+		    except UnicodeEncodeError, err:
+			print "DEBUG3aX", str(row['authors']), "\n", err
                 for l in languages:
                     if row['description_'+l]:
                         dep.desc[l] = {}
@@ -1716,6 +1725,7 @@ class TaskDependencies:
                 (_name, _url) = email.Utils.parseaddr(row['maintainer'])
                 dep.responsible = '<a href="mailto:%s">%s</a>' % (_url, to_unicode(_name))
                 dep.SetPublications(row)
+                print "DEBUG3b", dep.properties['published']['authors']
                 if row['changed_by']:
                     try:
                         changed = to_unicode(row['changed_by'])
@@ -1797,6 +1807,7 @@ class TaskDependencies:
                 if int(row['wnpp']) > 0:
                     dep.properties['wnpp'] = row['wnpp']
                 dep.SetPublications(row)
+                print "DEBUG3c", dep.properties['published']['authors']
                 dep.desc['en']['short'] = MarkupString(to_unicode(row['description_en']), dep.pkg, 'ShortDesc - New')
                 dep.desc['en']['long']  = Markup(render_longdesc(row['long_description_en'].splitlines()))
                 (_name, _url) = email.Utils.parseaddr(row['maintainer'])
diff --git a/webtools/tasks.py b/webtools/tasks.py
index adcd938..c654543 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -241,6 +241,17 @@ the right shows the tasks of %s.""" ) \
 		except UnicodeEncodeError, errtxt:
 			print "Some critical encoding problem occured when trying to render task %s for lang %s.\n%s" \
 			      % (task, lang, errtxt)
+			for dt in data['tasks'].keys():
+				dpl = data['tasks'][dt].dependencies['official_high']
+				for dp in dpl:
+					if dp.taskname == task:
+						print "%s / %s: %s" % (task, lang, dp.desc[lang])
+						if dp.properties.has_key('published'):
+							try:
+								print "\tpublished-authors: %s" % ( to_unicode(dp.properties['published']['authors']) )
+							except UnicodeEncodeError, err:
+								print err, " [starts with >>%s<<]" % to_unicode(dp.properties['published']['authors'][0:10])
+						print "\n"
 		except UnicodeDecodeError, errtxt:
 			print >> stderr, \
                              "Some critical encoding problem occured when trying to render task %s for lang %s.\n%s" \
diff --git a/www/index.html b/www/index.html
index 0872f90..e851e3e 100644
--- a/www/index.html
+++ b/www/index.html
@@ -40,12 +40,12 @@ href="http://alioth.debian.org/projects/blends/">project page on Alioth</a>.
    <dd class="arrow"><a href="edu/tasks">see what packages are successfully used in schools</a></dd>
   <dt><a href="ezgo">Debian EzGo</a></dt>
    <dd class="arrow"><a href="ezgo/tasks">see all packages focussed on Asian localised desktops</a></dd>
+  <dt><a href="games">Debian Games</a></dt>
+   <dd class="arrow"><a href="games/tasks">see all packaged games in Debian</a></dd>
   <dt><a href="gis">Debian GIS</a></dt>
    <dd class="arrow"><a href="gis/tasks">see all packages useful for Geographic Information Systems and OpenStreetMap</a></dd>
   <dt><a href="junior">Debian Junior</a></dt>
    <dd class="arrow"><a href="junior/tasks">see all packages for children from 1 to 99</a></dd>
-  <dt><a href="lex">Debian Lex</a></dt>
-   <dd class="arrow"><a href="lex/tasks">the effort to assemble packages for lawyers needs help - see what is currently available</a></dd>
   <dt><a href="med">Debian Med</a></dt>
    <dd class="arrow"><a href="med/tasks">see all packages for medical practice and bio-medical research</a></dd>
   <dt><a href="multimedia">Debian Multimedia</a></dt>

-- 
Static and dynamic websites for Debian Pure Blends