[Blends-commit] [SCM] website branch, master, updated. 4360c0c60f0cbebab008018804ced4723451c3ac
The following commit has been merged in the master branch:
commit 4360c0c60f0cbebab008018804ced4723451c3ac
Author: Ole Streicher
Date: Thu Mar 10 21:17:10 2016 +0100
Further reunifx old and udd versions
diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index a3afe48..4f37804 100644
--- a/webtools/blendstasktools_udd.py
+++ b/webtools/blendstasktools_udd.py
@@ -92,8 +92,6 @@ pkgstatus = {
'dependencies' : ('Depends', 'Recommends'),
'fields-set' : (),
'colorcode': 'Green: The project is available as an
official Debian package and has high relevance',
-'headline' : 'Official Debian packages with high relevance',
-'pdolinkname' : 'Official Debian package',
'order': 1
},
'official_low': { # official package with low priority dependency
@@ -102,8 +100,6 @@ pkgstatus = {
'dependencies' : ('Suggests', ),
'fields-set' : (),
'colorcode': 'Green: The project is available as an
official Debian package but has lower relevance',
-'headline' : 'Official Debian packages with lower relevance',
-'pdolinkname' : 'Official Debian package',
'order': 2
},
'non-free': { # package in contrib or non-free, priority decreased to
Suggests in any case
@@ -112,8 +108,6 @@ pkgstatus = {
'dependencies' : ('Depends', 'Recommends', 'Suggests'),
'fields-set' : (),
'colorcode': 'Green: The project is available in
Debian packaging pool but is not in Debian main',
-'headline' : 'Debian packages in contrib or non-free',
-'pdolinkname' : 'Debian package in contrib/non-free',
'order': 3
},
'experimental': { # package which exists only in experimental
@@ -122,8 +116,6 @@ pkgstatus = {
'dependencies' : ('Depends', 'Recommends', 'Suggests'),
'fields-set' : (),
'colorcode': 'Yellow: The project is available in
Debian packaging pool but is regarded as experimental',
-'headline' : 'Debian packages in experimental',
-'pdolinkname' : 'Debian package in experimental',
'order': 4
},
'new': { # package in new queue
@@ -132,8 +124,6 @@ pkgstatus = {
'dependencies' : ('Depends', 'Recommends', 'Suggests'),
'fields-set' : (),
'colorcode': 'Yellow: A package of project is is in
Debian New queue and hopefully available soon',
-'headline' : 'Debian packages in New queue (hopefully available
soon)',
-'pdolinkname' : 'New Debian package',
'order': 5
},
'pkgvcs': { # Not yet packaged but packaging code in Vcs
@@ -142,8 +132,6 @@ pkgstatus = {
'dependencies' : ('Depends', 'Recommends', 'Suggests'),
'fields-set' : ('vcs-svn', 'vcs-git', 'vcs-browser'),
'colorcode': 'Yellow: The packaging of project is has started and a developer might try the packaging code in VCS or
help packaging.',
-'headline' : 'Packaging has started and developers might try the
packaging code in VCS',
-'pdolinkname' : 'New Debian package',
'order': 6
},
'unofficial': { # unofficial packages outside Debian
@@ -152,8 +140,6 @@ pkgstatus = {
'dependencies' : ('Depends', 'Recommends', 'Suggests'),
'fields-set' : ('pkg-url', ),
'colorcode': 'Yellow: There exists an unofficial
package of the project',
-'headline' : 'Unofficial packages built by somebody else',
-'pdolinkname' : 'Unofficial Debian package',
'order': 7
},
'wnpp': { # project which has at least a WNPP bug filed
@@ -162,8 +148,6 @@ pkgstatus = {
'dependencies' : ('Depends', 'Recommends', 'Suggests'),
'fields-set' : ('wnpp', ),
'colorcode': 'Red: The project is not (yet)
available as a Debian package but there is some record of interest (WNPP
bug).',
-'headline' : 'No known packages available but some record of
interest (WNPP bug)',
-'pdolinkname' : 'Debian package not available',
'order': 8
},
'prospective': { # projects which might be interesting for a Blend but no
work is done yet
@@ -172,8 +156,6 @@ pkgstatus = {
'dependencies' : ('Depends', 'Recommends', 'Suggests'),
'fields-set' : ('homepage', ), # TODO: a description should be set
as well ...
'colorcode': 'Red: The project is not (yet)
available as a Debian package.',
-'headline' : 'Should not show up here',
-'pdolinkname' : '',
'order': 9
},
'ignore': { # Package inside Debian which is "under observation"
@@ -182,8 +164,6 @@ pkgstatus = {
'dependencies' : ('Ignore', ),
'fields-set' : (),
'colorcode': '%s',
-'headline' : 'Should not show up here',
-'pdolin
[Blends-commit] [SCM] med branch, master, updated. 9db8178ccc2148ec9d0fa2b4c6b0f277459b2812
The following commit has been merged in the master branch: commit 9db8178ccc2148ec9d0fa2b4c6b0f277459b2812 Author: Andreas Tille Date: Thu Mar 10 18:19:31 2016 +0100 Add spaced diff --git a/tasks/bio b/tasks/bio index 63797ee..b430915 100644 --- a/tasks/bio +++ b/tasks/bio @@ -802,6 +802,9 @@ Depends: sortmerna Depends: snap-aligner +Depends: spaced +WNPP: 815672 + Depends: spades Depends: srst2 -- Debian Med metapackages ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] website branch, master, updated. 463a251d23006f1d131b5c71f66639b6ddde1580
The following commit has been merged in the master branch:
commit 463a251d23006f1d131b5c71f66639b6ddde1580
Author: Ole Streicher
Date: Wed Mar 9 21:31:13 2016 +0100
Merge webtools and webtools_py3 templates
diff --git a/webtools/templates/bugs.xhtml b/webtools/templates/bugs.xhtml
index f68499e..a16b922 100644
--- a/webtools/templates/bugs.xhtml
+++ b/webtools/templates/bugs.xhtml
@@ -108,7 +108,7 @@
${vcslocation}
- mailto:${pkgbug['maintainer_email']}">${pkgbug['maintainer_name']}
+ mailto:${pkgbug['maintainer_email']}">${pkgbug['maintainer_name']}
unknown maintainer
@@ -149,7 +149,7 @@
- ${updatetimestamp}
+ Last update: ${timestamp}
diff --git a/webtools/templates/debian-astro_idx.xhtml
b/webtools/templates/debian-astro_idx.xhtml
index 4a36a65..5762b0f 100644
--- a/webtools/templates/debian-astro_idx.xhtml
+++ b/webtools/templates/debian-astro_idx.xhtml
@@ -48,31 +48,31 @@
Featured packages
-
-
-
-
-
-
-
-
-
-
${PackageByName[pkg_name].pkg.capitalize()}:
-
- ${PackageByName[pkg_name].desc[lang]['short']}
- ${PackageByName[pkg_name].desc['en']['short']}
-
-
-
-
- Home page
- - More...
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
${PackageByName[pkg_name].pkg.capitalize()}:
+
+ ${PackageByName[pkg_name].desc[lang].get('short',
'')}
+ ${PackageByName[pkg_name].desc['en'].get('short', '')}
+
+
+
+
+ Home page
+ - More...
+
+
+
+
+
+
@@ -109,12 +109,12 @@
${howtosetlang}
${updatetimestamp}
- The Debian Astro logo was created by
- http://www.mariahammerstrom.com";>Maria Hammerstrøm
- and is under the license
- http://www.gnu.org/copyleft/lgpl.html";>LGPL-3 or
- http://creativecommons.org/licenses/by-sa/3.0/";>CC BY-SA
3.0
- by your choice.
+ The Debian Astro logo was created by
+ http://www.mariahammerstrom.com";>Maria Hammerstrøm
+ and is under the license
+ http://www.gnu.org/copyleft/lgpl.html";>LGPL-3 or
+ http://creativecommons.org/licenses/by-sa/3.0/";>CC BY-SA
3.0
+ by your choice.
diff --git a/webtools/templates/packagelist.xhtml
b/webtools/templates/packagelist.xhtml
index 14a1830..c42f9f0 100644
--- a/webtools/templates/packagelist.xhtml
+++ b/webtools/templates/packagelist.xhtml
@@ -43,11 +43,11 @@
${tasks[task].metapkg.PrintedName.capitalize()} -
- ${tasks[task].metapkg.desc[lang]['short']}
+ ${tasks[task].metapkg.desc[lang]['short']}
${tasks[task].metapkg.desc['en']['short']}
- ${tasks[task].metapkg.desc[lang]['long']}
+ ${tasks[task].metapkg.desc[lang]['long']}
${tasks[task].metapkg.desc['en']['long']}
@@ -63,7 +63,7 @@
- ${project.desc[lang]['short']}
+ ${project.desc[lang]['short']}
${project.desc['en']['short']}
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index e84465f..fd2764d 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -496,7 +496,7 @@ function show_fulldesc(hash) {
Enhancements
-
+
${enh}
diff --git a/webtools/templates/tasks.xhtml b/webtools/templates
[Blends-commit] [SCM] website branch, master, updated. 109184b8f351bb7ecf031f5b5dab3ca3e4527336
The following commit has been merged in the master branch:
commit 109184b8f351bb7ecf031f5b5dab3ca3e4527336
Author: Ole Streicher
Date: Thu Mar 10 08:59:51 2016 +0100
Remove obsolete regexps for ampersand and javascript detection
diff --git a/webtools/tasks.py b/webtools/tasks.py
index 8b1e2bd..4ed6f56 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -84,9 +84,6 @@ htaccess = os.path.join(outputdir, '.htaccess')
htafp = open(htaccess, 'w')
htafp.write("DirectoryIndex index index.html\nOptions +MultiViews\n")
-detect_javascript_code_re = re.compile("onmouseover=\"Tip\(\\'")
-detect_ampersand_code_re =
re.compile("href=\"http://\w+\.debian\.org/.+\?\w+=";)
-
use_dependencystatus = GetDependencies2Use()
for lang in languages:
htafp.write("AddLanguage {0}
.{1}\n".format(language_dict[lang]['htaccess'], lang))
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index 2339cf0..5139939 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -87,9 +87,6 @@ htaccess = os.path.join(outputdir, 'htaccess')
htafp = open(htaccess, 'w')
htafp.write("DirectoryIndex index index.html\nOptions +MultiViews\n")
-detect_javascript_code_re = re.compile("onmouseover=\"Tip\(\\'")
-detect_ampersand_code_re =
re.compile("href=\"http://\w+\.debian\.org/.+\?\w+=";)
-
use_dependencystatus = GetDependencies2Use()
for lang in languages:
htafp.write("AddLanguage {0}
.{1}\n".format(language_dict[lang]['htaccess'], lang))
--
Static and dynamic websites for Debian Pure Blends
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
