[Blends-commit] [SCM] science branch, master, updated. 4aa27b48cda6a33209c2d155ab0ade54dab38b67
The following commit has been merged in the master branch: commit 4aa27b48cda6a33209c2d155ab0ade54dab38b67 Author: Ole Streicher deb...@liska.ath.cx Date: Fri Dec 13 09:30:41 2013 +0100 Added libfits-java and tcl-fitstcl diff --git a/tasks/astronomy-dev b/tasks/astronomy-dev index 05e167b..c5eb5f5 100644 --- a/tasks/astronomy-dev +++ b/tasks/astronomy-dev @@ -22,3 +22,7 @@ Depends: libgyoto0-dev Depends: casacore-dev Depends: liberfa-dev + +Depends: libfits-java + +Depends: tcl-fitstcl -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 609a78453755d6fa73cc1e02e15c1456073cff2b
The following commit has been merged in the master branch: commit 609a78453755d6fa73cc1e02e15c1456073cff2b Author: Ole Streicher deb...@liska.ath.cx Date: Wed Mar 12 15:25:59 2014 +0100 Replace midas by eso-midas Both were ITP, but the old midas one is closed since years diff --git a/tasks/astronomy b/tasks/astronomy index e1f0b8c..96ee710 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -126,22 +126,7 @@ Pkg-Description: predicts occultations of stars by minor planets Some initial packaging has been performed and will be submitted to pkg-scicomp.alioth.debian.org. -Depends: midas -Homepage: http://www.eso.org/sci/data-processing/software/esomidas/ -WNPP: 412488 -License: GPL -Responsible: Alastair McKinstry mckins...@debian.org -Pkg-Description: the European Southern Observatory Munich Image Data Analysis System - The ESO-MIDAS system provides general tools for image processing and - data reduction with emphasis on astronomical applications including - imaging and special reduction packages for ESO instrumentation at La - Silla and the VLT at Paranal. In addition it contains applications - packages for stellar and surface photometry, image sharpening and - decomposition, statistics and various others. - . - The official name, ESO-MIDAS, is a registered trademark. ESO-MIDAS is - available under the GNU General Public License (GPL), and can be - implemented on OpenVMS and UNIX (Linux) systems. +Depends: eso-midas Depends: ssystem Pkg-URL: http://snapshot.debian.org/package/ssystem/ -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 51c31bfb6d203ee62db7519e32665a5741dc3ee0
The following commit has been merged in the master branch: commit 51c31bfb6d203ee62db7519e32665a5741dc3ee0 Author: Ole Streicher deb...@liska.ath.cx Date: Thu Mar 13 09:40:13 2014 +0100 Added wxastrocapture diff --git a/tasks/astronomy b/tasks/astronomy index 96ee710..0aed087 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -128,6 +128,8 @@ Pkg-Description: predicts occultations of stars by minor planets Depends: eso-midas +Depends: wxastrocapture + Depends: ssystem Pkg-URL: http://snapshot.debian.org/package/ssystem/ Homepage: http://www1.las.es/~amil/ssystem -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 7520490455f6f83b81018fca17fac61bbdf90c4b
The following commit has been merged in the master branch: commit 7520490455f6f83b81018fca17fac61bbdf90c4b Author: Ole Streicher deb...@liska.ath.cx Date: Fri Apr 11 19:43:18 2014 +0200 Added audela diff --git a/tasks/astronomy b/tasks/astronomy index 0aed087..1c8d010 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -176,3 +176,5 @@ Remark: Removed from Debian from http://snapshot.debian.org/ . Reasons are given here: http://bugs.debian.org/460795 + +Depends: audela -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 9c44c5d5adb54f134638accdac4928b2d2da631c
The following commit has been merged in the master branch: commit 9c44c5d5adb54f134638accdac4928b2d2da631c Author: Ole Streicher deb...@liska.ath.cx Date: Fri Jun 13 15:44:53 2014 +0200 tasks/astronomy-dev: Remove non-free libsofa-c-dev. The replacement, liberfa-dev, is already in astronomy-dev. Closes: #751487 diff --git a/debian/changelog b/debian/changelog index 5d4bb02..14e4b52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,13 @@ debian-science (1.2) UNRELEASED; urgency=medium + [ Andreas Tille ] * d/copyright: DEP5 + [ Ole Streicher ] + * tasks/astronomy-dev: Remove non-free libsofa-c-dev. The +replacement, liberfa-dev, is already in astronomy-dev. +Closes: #751487 + -- Andreas Tille ti...@debian.org Fri, 24 Jan 2014 13:52:31 +0100 debian-science (1.1) unstable; urgency=low diff --git a/tasks/astronomy-dev b/tasks/astronomy-dev index b3f4dd1..bfe3ca2 100644 --- a/tasks/astronomy-dev +++ b/tasks/astronomy-dev @@ -11,7 +11,7 @@ Depends: libworldwind-java Depends: libccfits-dev, libcfitsio3-dev, python-pyfits, libqfits-dev, slang-cfitsio, libastro-fits-cfitsio-perl -Depends: libsofa-c-dev, libstarlink-pal-dev, libstarlink-ast-dev, libwcstools-dev, wcslib-dev, libcpl-dev +Depends: libstarlink-pal-dev, libstarlink-ast-dev, libwcstools-dev, wcslib-dev, libcpl-dev Depends: python-pywcs, python-cpl -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. e4da4a5537b2431ad7e72e1000d26522f3c4e6e9
The following commit has been merged in the master branch: commit e4da4a5537b2431ad7e72e1000d26522f3c4e6e9 Author: Ole Streicher deb...@liska.ath.cx Date: Mon Aug 4 12:23:37 2014 +0200 Start to add astropy affiliated packages to astronomy diff --git a/debian/changelog b/debian/changelog index 517ffd7..0927cff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ debian-science (1.3) UNRELEASED; urgency=medium + [ Andreas Tille ] * d/source/format: 3.0 (native) + [ Ole Streicher ] + * add astropy affiliated packages + -- Andreas Tille ti...@debian.org Thu, 19 Jun 2014 21:56:24 +0200 debian-science (1.2) unstable; urgency=medium diff --git a/tasks/astronomy b/tasks/astronomy index 51b1a80..23283d3 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -62,6 +62,9 @@ Depends: python-pywcs, python-astropy, python-pyfits, python3-pyfits, python-pyds9 Why: Generic Python packages for astronomy +Depends: astroml, astroquery +Why: Astropy affiliated packages + Depends: esorex, python-cpl Suggests: cpl-plugin-amber, cpl-plugin-fors, cpl-plugin-giraf, cpl-plugin-hawki, cpl-plugin-sinfo, cpl-plugin-kmos, -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. f576ef3776676a5ee3d4fccdfdf738b7986c5c13
The following commit has been merged in the master branch: commit f576ef3776676a5ee3d4fccdfdf738b7986c5c13 Author: Ole Streicher deb...@liska.ath.cx Date: Sat Feb 7 12:35:52 2015 +0100 removed orbfit and linoccult from astronomy diff --git a/debian/changelog b/debian/changelog index 7b95b58..95e4ff6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,8 @@ debian-science (1.4) UNRELEASED; urgency=medium * ... [ Ole Streicher ] - * add psfex, swarp, fitscut - * cleanup astronomy a bit + * add psfex, swarp, fitscut to astronomy + * removed orbfit and linoccult from astronomy -- Andreas Tille ti...@debian.org Fri, 24 Oct 2014 11:52:38 +0200 diff --git a/tasks/astronomy b/tasks/astronomy index 62ad8dc..0316d3f 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -100,26 +100,6 @@ Remark: Removed from Debian due to licensing issues. Suggests: pdl, pgplot5, python-scientific Why: Already in science-viewing -Depends: orbfit -Remark: Status of packaging - A rudimentary package was prepared, upstream was contacted with a very - positive reply. - -Depends: linoccult -Homepage: http://linoccult.sourceforge.net/ -WNPP: 459358 -License: GPL -Responsible: Steffen Moeller steffen_moel...@gmx.de -Pkg-Description: predicts occultations of stars by minor planets - LinOccult uses the DE405 precomputed major planets ephemeris (position - of astronomical object in the sky at a given time) that are provided by - the Jet Propulsion Laboratory (JPL) for a precise numerical integration - of asteroidal orbits. The user can select asteroids to process by - changing several parameters in a configuration file. - . - Some initial packaging has been performed and will be submitted to - pkg-scicomp.alioth.debian.org. - Depends: eso-midas Depends: wxastrocapture -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 8252e56e40f9558916fa6ffe73d24b8194f89357
The following commit has been merged in the master branch: commit 8252e56e40f9558916fa6ffe73d24b8194f89357 Author: Ole Streicher deb...@liska.ath.cx Date: Fri Jan 16 14:13:38 2015 +0100 Add psfex to astronomy diff --git a/debian/changelog b/debian/changelog index 1c60924..fde3ff6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ debian-science (1.4) UNRELEASED; urgency=medium + [ Andreas Tille ] * ... + [ Ole Streicher ] + * add psfex + -- Andreas Tille ti...@debian.org Fri, 24 Oct 2014 11:52:38 +0200 debian-science (1.3) unstable; urgency=medium diff --git a/tasks/astronomy b/tasks/astronomy index dd116e7..e919568 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -185,4 +185,6 @@ Depends: audela Suggests: python-healpy Depends: splash -WNPP: 649603 + +depends: psfex +WNPP: 775497 -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 1614eabe06c50c5cd894ec07d94bced888a4f40a
The following commit has been merged in the master branch: commit 1614eabe06c50c5cd894ec07d94bced888a4f40a Author: Ole Streicher deb...@liska.ath.cx Date: Thu Jan 22 16:37:30 2015 +0100 Add swarp to astronomy diff --git a/debian/changelog b/debian/changelog index fde3ff6..e6f2f7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ debian-science (1.4) UNRELEASED; urgency=medium * ... [ Ole Streicher ] - * add psfex + * add psfex, swarp -- Andreas Tille ti...@debian.org Fri, 24 Oct 2014 11:52:38 +0200 diff --git a/tasks/astronomy b/tasks/astronomy index e919568..4f34337 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -11,7 +11,7 @@ Why: Celestial Mechanics computations Depends: astronomical-almanac, lightspeed, openuniverse -Depends: sextractor +Depends: sextractor, swarp Depends: worldwind -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. b0114307d7c6cb6376fdad2ea1a44a37f9f1f779
The following commit has been merged in the master branch: commit b0114307d7c6cb6376fdad2ea1a44a37f9f1f779 Author: Ole Streicher deb...@liska.ath.cx Date: Wed Feb 11 10:29:45 2015 +0100 Add astlib, stiff to astronomy diff --git a/debian/changelog b/debian/changelog index 95e4ff6..bd50224 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ debian-science (1.4) UNRELEASED; urgency=medium * ... [ Ole Streicher ] - * add psfex, swarp, fitscut to astronomy + * add psfex, swarp, fitscut, stiff, astlib to astronomy * removed orbfit and linoccult from astronomy -- Andreas Tille ti...@debian.org Fri, 24 Oct 2014 11:52:38 +0200 diff --git a/tasks/astronomy b/tasks/astronomy index 0316d3f..709b67a 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -46,7 +46,7 @@ Depends: gyoto Depends: skycat -Depends: ftools-fv, fitsverify, fitscheck +Depends: ftools-fv, fitsverify, fitscheck, fitscut Depends: casacore-tools @@ -160,5 +160,8 @@ Depends: splash Depends: psfex WNPP: 775497 -Depends: fitscut -WNPP: 776944 +Depends: stiff +WNPP: 777599 + +Depends: astlib +WNPP: 777600 -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 3cd3958c161f239a2c13f57ed342a8f9b4699139
The following commit has been merged in the master branch: commit 3cd3958c161f239a2c13f57ed342a8f9b4699139 Author: Ole Streicher oleb...@debian.org Date: Mon Apr 20 15:26:24 2015 +0200 Corrected processing errors for astronomy and astronomy-dev diff --git a/tasks/astronomy b/tasks/astronomy index 4400cce..16a0d5f 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -74,10 +74,16 @@ Why: Generic Python packages for astronomy Depends: glueviz WNPP: 762265 -Depends: astroml, astroquery, sncosmo +Depends: astroml +WNPP: 756994 + +Depends: sncosmo +WNPP: 757096 + +Depends: python-astroquery, python3-astroquery Why: Astropy affiliated packages -Depends: pyavm +Depends: python-pyavm, python3-pyavm Depends: python-astlib, python3-astlib WNPP: 777600 @@ -170,6 +176,7 @@ Remark: Removed from Debian Reasons are given here: http://bugs.debian.org/460795 Depends: audela +WNPP: 744236 Suggests: python-healpy diff --git a/tasks/astronomy-dev b/tasks/astronomy-dev index bfe3ca2..228162f 100644 --- a/tasks/astronomy-dev +++ b/tasks/astronomy-dev @@ -15,9 +15,7 @@ Depends: libstarlink-pal-dev, libstarlink-ast-dev, libwcstools-dev, wcslib-dev, Depends: python-pywcs, python-cpl -Depends: python-astropy-legacy - -Depends: libgyoto1-dev +Depends: libgyoto2-dev Depends: casacore-dev @@ -29,4 +27,4 @@ Depends: libivoafits-java Depends: tcl-fitstcl -Depends: libchealpix-dev, libhealipx-cxx-dev, python-healpy +Depends: libchealpix-dev, libhealpix-cxx-dev, python-healpy -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. d98078e352e844d478ed588c1cc39655464e1cbd
The following commit has been merged in the master branch: commit d98078e352e844d478ed588c1cc39655464e1cbd Author: Ole Streicher deb...@liska.ath.cx Date: Mon Apr 27 10:22:47 2015 +0200 Replace libcfitsio3-dev with libcfitsio-dev diff --git a/tasks/astronomy-dev b/tasks/astronomy-dev index 228162f..1391432 100644 --- a/tasks/astronomy-dev +++ b/tasks/astronomy-dev @@ -9,7 +9,7 @@ Depends: libnova-dev Depends: libworldwind-java -Depends: libccfits-dev, libcfitsio3-dev, python-pyfits, libqfits-dev, slang-cfitsio, libastro-fits-cfitsio-perl +Depends: libccfits-dev, libcfitsio-dev, python-pyfits, libqfits-dev, slang-cfitsio, libastro-fits-cfitsio-perl Depends: libstarlink-pal-dev, libstarlink-ast-dev, libwcstools-dev, wcslib-dev, libcpl-dev -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 57c6aa9c76efc655e1940a0626292df445ebb5c9
The following commit has been merged in the master branch: commit 57c6aa9c76efc655e1940a0626292df445ebb5c9 Author: Ole Streicher deb...@liska.ath.cx Date: Sun Apr 12 14:17:33 2015 +0200 Add cpl-plugin, pyavm, siril to astronomy diff --git a/debian/changelog b/debian/changelog index 31afec3..7335873 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ debian-science (1.5) UNRELEASED; urgency=medium [ Ole Streicher ] * Add psfex, swarp, stiff, missfits, fitscut, astlib, glueviz, -cpl-plugin-naco, cpl-plugin-visir to astronomy +cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril +to astronomy * removed orbfit and linoccult from astronomy [ Andreas Tille ] diff --git a/tasks/astronomy b/tasks/astronomy index 0962556..08819de 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -77,6 +77,8 @@ WNPP: 762265 Depends: astroml, astroquery, sncosmo Why: Astropy affiliated packages +Depends: pyavm + Depends: python-astlib, python3-astlib WNPP: 777600 @@ -84,7 +86,7 @@ Depends: esorex, python-cpl Suggests: cpl-plugin-amber, cpl-plugin-fors, cpl-plugin-giraf, cpl-plugin-hawki, cpl-plugin-sinfo, cpl-plugin-kmos, cpl-plugin-vimos, cpl-plugin-uves, cpl-plugin-xsh, - cpl-plugin-naco, cpl-plugin-visir + cpl-plugin-naco, cpl-plugin-visir, cpl-plugin-muse Why: Data reduction suite for data taken with ESO instruments Depends: xephem @@ -172,3 +174,5 @@ Depends: audela Suggests: python-healpy Depends: splash + +Depends: siril -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. ebfb6ad98e9a668c143cadb985a8373b60dde852
The following commit has been merged in the master branch: commit ebfb6ad98e9a668c143cadb985a8373b60dde852 Author: Ole Streicher deb...@liska.ath.cx Date: Sun Apr 12 17:10:03 2015 +0200 Renames cpl-plugin-xsh to cpl-plugin-xshoo diff --git a/tasks/astronomy b/tasks/astronomy index 08819de..5944d99 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -85,7 +85,7 @@ WNPP: 777600 Depends: esorex, python-cpl Suggests: cpl-plugin-amber, cpl-plugin-fors, cpl-plugin-giraf, cpl-plugin-hawki, cpl-plugin-sinfo, cpl-plugin-kmos, - cpl-plugin-vimos, cpl-plugin-uves, cpl-plugin-xsh, + cpl-plugin-vimos, cpl-plugin-uves, cpl-plugin-xshoo, cpl-plugin-naco, cpl-plugin-visir, cpl-plugin-muse Why: Data reduction suite for data taken with ESO instruments -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 7f9a034308079f43bff017d5e18cc8e5dc432b9d
The following commit has been merged in the master branch: commit 7f9a034308079f43bff017d5e18cc8e5dc432b9d Author: Ole Streicher oleb...@debian.org Date: Sat Apr 18 10:40:49 2015 +0200 Replace fitscheck by pyfits-utils diff --git a/tasks/astronomy b/tasks/astronomy index 88f51c5..4400cce 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -55,7 +55,7 @@ Depends: gyoto Depends: skycat -Depends: ftools-fv, fitsverify, fitscheck, fitscut +Depends: ftools-fv, fitsverify, fitscut, pyfits-utils Depends: casacore-tools -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 479c5456078a525389070f85d1ee2f5c32882d1a
The following commit has been merged in the master branch: commit 479c5456078a525389070f85d1ee2f5c32882d1a Author: Ole Streicher oleb...@debian.org Date: Thu Jun 4 19:42:25 2015 +0200 Add montage to astronomy diff --git a/debian/changelog b/debian/changelog index 31820c4..17c8e95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,8 @@ debian-science (1.5) UNRELEASED; urgency=medium [ Ole Streicher ] * Add psfex, swarp, stiff, missfits, fitscut, astlib, glueviz, cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, -gnudatalanguage, scamp, astromatic, eso-pipelines, weightwatcher -to astronomy +gnudatalanguage, scamp, astromatic, eso-pipelines, weightwatcher, +montage to astronomy * Removed orbfit and linoccult from astronomy * Replaced libcfitsio3-dev with libcfitsio-dev in astronomy-dev diff --git a/tasks/astronomy b/tasks/astronomy index a7e1070..6c46f3a 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -14,22 +14,10 @@ Depends: astronomical-almanac, lightspeed, openuniverse Depends: astromatic WNPP: 786894 -Depends: sextractor, swarp +Depends: sextractor, swarp, psfex, stiff, missfits, scamp, weightwatcher -Depends: psfex -WNPP: 775497 - -Depends: stiff -WNPP: 777599 - -Depends: missfits -WNPP: 778236 - -Depends: scamp -WNPP: 786901 - -Depends: weightwatcher -WNPP: 787412 +Depends: montage +WNPP: 787706 Depends: worldwind -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. bc5b87de8fbd49a758c4677c997aa55049dd05d0
The following commit has been merged in the master branch: commit bc5b87de8fbd49a758c4677c997aa55049dd05d0 Author: Ole Streicher deb...@liska.ath.cx Date: Thu Jun 18 14:31:15 2015 +0200 Added wcsaxes to astronomy diff --git a/debian/changelog b/debian/changelog index 826a9d1..8d64a73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ debian-science (1.5) UNRELEASED; urgency=medium * Add psfex, swarp, stiff, missfits, fitscut, astlib, glueviz, cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, gnudatalanguage, scamp, astromatic, eso-pipelines, weightwatcher, -montage, idlastro to astronomy +montage, idlastro, wcsaxes to astronomy * Removed orbfit and linoccult from astronomy * Replaced libcfitsio3-dev with libcfitsio-dev in astronomy-dev diff --git a/tasks/astronomy b/tasks/astronomy index de967d2..a9564a8 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -77,6 +77,9 @@ WNPP: 756994 Depends: sncosmo WNPP: 757096 +Depends: wcsaxes +WNPP: 785015 + Depends: python-astroquery, python3-astroquery Why: Astropy affiliated packages -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. c5c1ea88dfb1384a247449a50af9139966779e28
The following commit has been merged in the master branch: commit c5c1ea88dfb1384a247449a50af9139966779e28 Author: Ole Streicher oleb...@debian.org Date: Tue Jun 23 22:13:51 2015 +0200 Add pyregion to astronomy diff --git a/debian/changelog b/debian/changelog index 8d64a73..eb124be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ debian-science (1.5) UNRELEASED; urgency=medium * Add psfex, swarp, stiff, missfits, fitscut, astlib, glueviz, cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, gnudatalanguage, scamp, astromatic, eso-pipelines, weightwatcher, -montage, idlastro, wcsaxes to astronomy +montage, idlastro, wcsaxes, pyregion to astronomy * Removed orbfit and linoccult from astronomy * Replaced libcfitsio3-dev with libcfitsio-dev in astronomy-dev diff --git a/tasks/astronomy b/tasks/astronomy index a9564a8..c86ab69 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -180,6 +180,9 @@ Remark: Removed from Debian Depends: audela WNPP: 744236 +Depends: pyregion +WNPP: 789717 + Suggests: python-healpy Depends: splash -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 59035b60075db3981c04a828532d836b8d724cfb
The following commit has been merged in the master branch: commit 59035b60075db3981c04a828532d836b8d724cfb Author: Ole Streicher deb...@liska.ath.cx Date: Thu Jun 25 15:50:22 2015 +0200 Replace pyfits-utils by astropy-utils diff --git a/debian/changelog b/debian/changelog index eb124be..7df8de7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,13 +4,14 @@ debian-science (1.5) UNRELEASED; urgency=medium * Add psfex, swarp, stiff, missfits, fitscut, astlib, glueviz, cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, gnudatalanguage, scamp, astromatic, eso-pipelines, weightwatcher, -montage, idlastro, wcsaxes, pyregion to astronomy +montage, idlastro, wcsaxes, pyregion, astropy-utils to astronomy * Removed orbfit and linoccult from astronomy * Replaced libcfitsio3-dev with libcfitsio-dev in astronomy-dev [ Andreas Tille ] * Add new task imageanalysis-dev + -- Andreas Tille ti...@debian.org Sun, 29 Mar 2015 21:41:40 +0200 debian-science (1.4) unstable; urgency=medium diff --git a/tasks/astronomy b/tasks/astronomy index c86ab69..016602f 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -52,7 +52,7 @@ Depends: gyoto Depends: skycat -Depends: ftools-fv, fitsverify, fitscut, pyfits-utils +Depends: ftools-fv, fitsverify, fitscut, astropy-utils Depends: casacore-tools -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 0fc5134eb9deb158ec0bcb1df9be8753eb296028
The following commit has been merged in the master branch: commit 0fc5134eb9deb158ec0bcb1df9be8753eb296028 Author: Ole Streicher deb...@liska.ath.cx Date: Mon Jun 15 14:30:53 2015 +0200 Add idlastro to astronomy diff --git a/debian/changelog b/debian/changelog index 17c8e95..826a9d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ debian-science (1.5) UNRELEASED; urgency=medium * Add psfex, swarp, stiff, missfits, fitscut, astlib, glueviz, cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, gnudatalanguage, scamp, astromatic, eso-pipelines, weightwatcher, -montage to astronomy +montage, idlastro to astronomy * Removed orbfit and linoccult from astronomy * Replaced libcfitsio3-dev with libcfitsio-dev in astronomy-dev diff --git a/tasks/astronomy b/tasks/astronomy index 6c46f3a..de967d2 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -184,3 +184,7 @@ Depends: splash Depends: siril Depends: gnudatalanguage + +Depends: idlastro +WNPP: 788826 + -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 5c6b313d8dba43fa0ce52fcf750026ca947f0865
The following commit has been merged in the master branch: commit 5c6b313d8dba43fa0ce52fcf750026ca947f0865 Author: Ole Streicher deb...@liska.ath.cx Date: Mon Jun 1 13:34:14 2015 +0200 Add weghtwatcher to astronomy diff --git a/debian/changelog b/debian/changelog index 5b55546..31820c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ debian-science (1.5) UNRELEASED; urgency=medium [ Ole Streicher ] * Add psfex, swarp, stiff, missfits, fitscut, astlib, glueviz, cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, -gnudatalanguage, scamp, astromatic, eso-pipelines to astronomy +gnudatalanguage, scamp, astromatic, eso-pipelines, weightwatcher +to astronomy * Removed orbfit and linoccult from astronomy * Replaced libcfitsio3-dev with libcfitsio-dev in astronomy-dev diff --git a/tasks/astronomy b/tasks/astronomy index fd1504e..a7e1070 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -28,6 +28,9 @@ WNPP: 778236 Depends: scamp WNPP: 786901 +Depends: weightwatcher +WNPP: 787412 + Depends: worldwind Depends: wcstools, wcslib-tools, funtools, qfits-tools -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 07c74f4b69ff3970259f05c34cc1aececace0adb
The following commit has been merged in the master branch: commit 07c74f4b69ff3970259f05c34cc1aececace0adb Author: Ole Streicher deb...@liska.ath.cx Date: Thu May 28 10:13:03 2015 +0200 Add astromatic, scamp to astronomy diff --git a/debian/changelog b/debian/changelog index 26ffe69..12c47ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ debian-science (1.5) UNRELEASED; urgency=medium [ Ole Streicher ] * Add psfex, swarp, stiff, missfits, fitscut, astlib, glueviz, cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, -gnudatalanguage to astronomy +gnudatalanguage, scamp, astromatic to astronomy * Removed orbfit and linoccult from astronomy * Replaced libcfitsio3-dev with libcfitsio-dev in astronomy-dev diff --git a/tasks/astronomy b/tasks/astronomy index 16a0d5f..52bf8e0 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -11,6 +11,9 @@ Why: Celestial Mechanics computations Depends: astronomical-almanac, lightspeed, openuniverse +Depends: astromatic +WNPP: 786894 + Depends: sextractor, swarp Depends: psfex @@ -22,6 +25,9 @@ WNPP: 777599 Depends: missfits WNPP: 778236 +Depends: scamp +WNPP: 786901 + Depends: worldwind Depends: wcstools, wcslib-tools, funtools, qfits-tools @@ -118,7 +124,6 @@ Pkg-Description: a gtk front-end for the starchart program Paeth, updated in 1990 by Craig Counterman) which generates high-quality postscript charts of any chosen region of the sky. It also prints the current Julian date and gives positions of the planets. - . Remark: Removed from Debian due to licensing issues. Suggests: pdl, pgplot5, python-scientific -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 6bd3336c404cec077c02a4295f6913096ba6d08a
The following commit has been merged in the master branch: commit 6bd3336c404cec077c02a4295f6913096ba6d08a Author: Ole Streicher deb...@liska.ath.cx Date: Thu May 28 10:36:40 2015 +0200 Add eso-pipelines to astronomy diff --git a/debian/changelog b/debian/changelog index 12c47ad..5b55546 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ debian-science (1.5) UNRELEASED; urgency=medium [ Ole Streicher ] * Add psfex, swarp, stiff, missfits, fitscut, astlib, glueviz, cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, -gnudatalanguage, scamp, astromatic to astronomy +gnudatalanguage, scamp, astromatic, eso-pipelines to astronomy * Removed orbfit and linoccult from astronomy * Replaced libcfitsio3-dev with libcfitsio-dev in astronomy-dev diff --git a/tasks/astronomy b/tasks/astronomy index 52bf8e0..fd1504e 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -94,6 +94,9 @@ Depends: python-pyavm, python3-pyavm Depends: python-astlib, python3-astlib WNPP: 777600 +Depends: eso-pipelines +WNPP: 787058 + Depends: esorex, python-cpl Suggests: cpl-plugin-amber, cpl-plugin-fors, cpl-plugin-giraf, cpl-plugin-hawki, cpl-plugin-sinfo, cpl-plugin-kmos, -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 0513097a98f11037cc2f6e0f41e60dc4f7bea41d
The following commit has been merged in the master branch: commit 0513097a98f11037cc2f6e0f41e60dc4f7bea41d Author: Ole Streicher deb...@liska.ath.cx Date: Wed Jul 29 09:47:58 2015 +0200 Correct package names after they were accepted in sid diff --git a/tasks/astronomy b/tasks/astronomy index 8e1b41f..4964d7e 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -68,18 +68,15 @@ Depends: python-pywcs, python-astropy, python3-astropy, python-pyfits, python3-pyfits, python-pyds9 Why: Generic Python packages for astronomy -Depends: glueviz -WNPP: 762265 - Depends: astroml WNPP: 756994 Depends: sncosmo WNPP: 757096 -Depends: wcsaxes -WNPP: 785015 - +Depends: python-pyregion, python3-pyregion +Depends: python-wcsaxes, python3-wcsaxes +Depends: glueviz, python-glue, python3-glue Depends: python-astroquery, python3-astroquery Why: Astropy affiliated packages @@ -180,9 +177,6 @@ Remark: Removed from Debian Depends: audela WNPP: 744236 -Depends: pyregion -WNPP: 789717 - Suggests: python-healpy Depends: indi-bin -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 6a9c8038d05d772ee59165094eca2058b03258c0
The following commit has been merged in the master branch: commit 6a9c8038d05d772ee59165094eca2058b03258c0 Author: Ole Streicher deb...@liska.ath.cx Date: Wed Jul 29 10:34:31 2015 +0200 Minor cleanup/corrections in astronomy diff --git a/tasks/astronomy b/tasks/astronomy index 4964d7e..ca8b034 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -11,13 +11,10 @@ Why: Celestial Mechanics computations Depends: astronomical-almanac, lightspeed, openuniverse -Depends: astromatic -WNPP: 786894 - -Depends: sextractor, swarp, psfex, stiff, missfits, scamp, weightwatcher +Depends: astromatic, sextractor, swarp, psfex, stiff, missfits, scamp, + weightwatcher Depends: montage -WNPP: 787706 Depends: worldwind @@ -81,13 +78,9 @@ Depends: python-astroquery, python3-astroquery Why: Astropy affiliated packages Depends: python-pyavm, python3-pyavm - Depends: python-astlib, python3-astlib -WNPP: 777600 Depends: eso-pipelines -WNPP: 787058 - Depends: esorex, python-cpl Suggests: cpl-plugin-amber, cpl-plugin-fors, cpl-plugin-giraf, cpl-plugin-hawki, cpl-plugin-sinfo, cpl-plugin-kmos, @@ -95,6 +88,8 @@ Suggests: cpl-plugin-amber, cpl-plugin-fors, cpl-plugin-giraf, cpl-plugin-naco, cpl-plugin-visir, cpl-plugin-muse Why: Data reduction suite for data taken with ESO instruments +Depends: eso-midas + Depends: xephem Homepage: http://www.clearskyinstitute.com/xephem/ License: Non-free @@ -123,8 +118,6 @@ Remark: Removed from Debian due to licensing issues. Suggests: pdl, pgplot5, python-scientific Why: Already in science-viewing -Depends: eso-midas - Depends: wxastrocapture Depends: ssystem @@ -185,12 +178,7 @@ Depends: splash Depends: siril -Depends: gnudatalanguage - -Depends: idlastro -WNPP: 788826 - -Depends: gdl-mpfit, gdl-coyote +Depends: gnudatalanguage, gdl-astrolib, gdl-mpfit, gdl-coyote Depends: yt WNPP: 789976 -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 808fd305c63b30aebe3796ddd1061f2a5a620fec
The following commit has been merged in the master branch: commit 808fd305c63b30aebe3796ddd1061f2a5a620fec Author: Ole Streicher deb...@liska.ath.cx Date: Wed Jul 29 15:53:13 2015 +0200 Add rawtran to astronomy diff --git a/debian/changelog b/debian/changelog index a579114..c708d48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ debian-science (1.5) UNRELEASED; urgency=medium cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, gnudatalanguage, scamp, astromatic, eso-pipelines, weightwatcher, montage, idlastro, wcsaxes, pyregion, astropy-utils, yt, indi-bin, -gdl-coyote, gdl-mpfit, astrometry.net to astronomy +gdl-coyote, gdl-mpfit, astrometry.net, rawtran to astronomy * Remove orbfit and linoccult from astronomy * Add libindi-bin to astronomy-dev * Replace libcfitsio3-dev with libcfitsio-dev in astronomy-dev diff --git a/tasks/astronomy b/tasks/astronomy index ca8b034..bfd4197 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -185,3 +185,6 @@ WNPP: 789976 Depends: astrometry.net WNPP: 793462 + +Depends: rawtran +WNPP: 793963 -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 15cfdb9c46cb6c4f176c3d7e2920b9e428b3edc3
The following commit has been merged in the master branch: commit 15cfdb9c46cb6c4f176c3d7e2920b9e428b3edc3 Author: Ole Streicher deb...@liska.ath.cx Date: Fri Jul 24 11:55:00 2015 +0200 Add astrometry.net, gdl-coyote, gdl-mpfit to astronomy diff --git a/debian/changelog b/debian/changelog index 8d01a43..a579114 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,8 @@ debian-science (1.5) UNRELEASED; urgency=medium * Add psfex, swarp, stiff, missfits, fitscut, astlib, glueviz, cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, gnudatalanguage, scamp, astromatic, eso-pipelines, weightwatcher, -montage, idlastro, wcsaxes, pyregion, astropy-utils, yt, indi-bin -to astronomy +montage, idlastro, wcsaxes, pyregion, astropy-utils, yt, indi-bin, +gdl-coyote, gdl-mpfit, astrometry.net to astronomy * Remove orbfit and linoccult from astronomy * Add libindi-bin to astronomy-dev * Replace libcfitsio3-dev with libcfitsio-dev in astronomy-dev diff --git a/tasks/astronomy b/tasks/astronomy index cd0697d..8e1b41f 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -196,5 +196,10 @@ Depends: gnudatalanguage Depends: idlastro WNPP: 788826 +Depends: gdl-mpfit, gdl-coyote + Depends: yt WNPP: 789976 + +Depends: astrometry.net +WNPP: 793462 -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 0cf96f0b4b5192470c09e654ab400a842a49aa0f
The following commit has been merged in the master branch: commit 0cf96f0b4b5192470c09e654ab400a842a49aa0f Author: Ole Streicher <deb...@liska.ath.cx> Date: Tue Oct 20 14:16:52 2015 +0200 Add spectral-cube and aplpy to astronomy diff --git a/debian/changelog b/debian/changelog index f698c0a..4a6badd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,8 @@ debian-science (1.5) UNRELEASED; urgency=medium cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, gnudatalanguage, scamp, astromatic, eso-pipelines, weightwatcher, montage, idlastro, wcsaxes, pyregion, astropy-utils, yt, indi-bin, -gdl-coyote, gdl-mpfit, astrometry.net, rawtran to astronomy +gdl-coyote, gdl-mpfit, astrometry.net, rawtran, spectral-cube, +aplpy to astronomy * Remove orbfit and linoccult from astronomy * Add libindi-bin to astronomy-dev * Replace libcfitsio3-dev with libcfitsio-dev in astronomy-dev diff --git a/tasks/astronomy b/tasks/astronomy index 45d108a..032e02c 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -69,6 +69,11 @@ WNPP: 756994 Depends: sncosmo WNPP: 757096 +Depends: aplpy, python-aplpy, python3-aplpy +WNPP: 802457 +Depends: spectral-cube, python-spectral-cube, python3-spectral-cube +WNPP: 802468 + Depends: python-pyregion, python3-pyregion Depends: python-wcsaxes, python3-wcsaxes Depends: glueviz, python-glue, python3-glue -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. 16b453c5b3dfe75b7dd0d1414feec56bee6480ef
The following commit has been merged in the master branch: commit 16b453c5b3dfe75b7dd0d1414feec56bee6480ef Author: Ole Streicher oleb...@debian.org Date: Fri Jul 10 08:53:10 2015 +0200 Add yt to astronomy diff --git a/debian/changelog b/debian/changelog index 79f7548..bdcd405 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ debian-science (1.5) UNRELEASED; urgency=medium * Add psfex, swarp, stiff, missfits, fitscut, astlib, glueviz, cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, gnudatalanguage, scamp, astromatic, eso-pipelines, weightwatcher, -montage, idlastro, wcsaxes, pyregion, astropy-utils to astronomy +montage, idlastro, wcsaxes, pyregion, astropy-utils, yt to astronomy * Removed orbfit and linoccult from astronomy * Replaced libcfitsio3-dev with libcfitsio-dev in astronomy-dev diff --git a/tasks/astronomy b/tasks/astronomy index 016602f..8f97e78 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -194,3 +194,5 @@ Depends: gnudatalanguage Depends: idlastro WNPP: 788826 +Depends: yt +WNPP: 789976 -- Debian Science Blend ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] science branch, master, updated. d3e112aad969e15615f2ba630e70e888ef7c9d21
The following commit has been merged in the master branch: commit d3e112aad969e15615f2ba630e70e888ef7c9d21 Author: Ole Streicher <oleb...@debian.org> Date: Mon Sep 28 11:07:50 2015 +0200 Remove worldwind from astronomy diff --git a/tasks/astronomy b/tasks/astronomy index bfd4197..45d108a 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -16,8 +16,6 @@ Depends: astromatic, sextractor, swarp, psfex, stiff, missfits, scamp, Depends: montage -Depends: worldwind - Depends: wcstools, wcslib-tools, funtools, qfits-tools Depends: gpredict, predict, seesat5 -- Debian Science Blend ___ 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. 51b0da2886df6019d5be3662e799e3ea9eb0add4
The following commit has been merged in the master branch:
commit 51b0da2886df6019d5be3662e799e3ea9eb0add4
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Mon Dec 7 14:55:29 2015 +0100
Add screenshot tooltip; use icon for debtags/translation editing links
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 097f160..2dd4d0a 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -13,6 +13,9 @@
http://blends.debian.org/css/blends.css; rel="stylesheet"
type="text/css" />
+.tooltip {
+ display:none;
+}
.pkgdesc-full {
background-image: none;
background:#f8f8ff;
@@ -63,6 +66,9 @@
width: 1px;
white-space: nowrap;
}
+.pkgdesc-short a:hover:not(:link):not(:visited) {
+color: grey;
+}
ul.desc-inline {
padding: 0;
margin: 0;
@@ -74,6 +80,12 @@ ul.desc-inline li {
ul.desc-inline li + li::before {
content: " \2022 ";
}
+a.editlink {
+float: left;
+position: relative;
+text-decoration-line: unset;
+padding-right: 0.5em;
+}
http://www.debian.org/favicon.ico; />
@@ -103,6 +115,7 @@ function show_fulldesc(hash) {
+http://blends.debian.org/js/wz_tooltip.js"</a>;>
@@ -236,7 +249,21 @@ function show_fulldesc(hash) {
-
+
+
+
+ Other
screenshots of package ${project.pkg}
+ VersionURL
+
+ ${screenshot['version']}${screenshot['url']}
+
+
+
+ http://screenshots.debian.net/package/${project.pkg};>
+
+
@@ -245,7 +272,12 @@ function show_fulldesc(hash) {
- ${project.desc[lang]['long']}
+
+ http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg};>
+
+
+ ${project.desc[lang]['long']}
+
${project.desc['en']['long']}
@@ -338,8 +370,11 @@ function show_fulldesc(hash) {
- Debtags
+ Tags
+ http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg};>
+
+
@@ -427,35 +462,32 @@ function show_fulldesc(hash) {
${project.remark['long']}
- Improve entry
-
-
-
- http://screenshots.debian.net/uploadfile?packagename=${project.pkg};>
- Screenshots
-
-
-
- http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg};>Debtags
-
-
-
-
-
- http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg};>
- ${fixtranslation}
-
-
-
- http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${project.pkg};>
- ${translatedesc}
-
-
-
+
+ Improve entry
+
+
+
+ http://screenshots.debian.net/uploadfile?packagename=${project.pkg};>
+ Upload Screenshot
+
-
-
-
+
+ http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg};>
+ Create tags
+
+
+
+ http://ddtp.debian.net/ddtss/index.cgi/${
[Blends-commit] [SCM] website branch, master, updated. 9d37e39709be7d604048ef6f3ff1a41cd0ae857c
The following commit has been merged in the master branch:
commit be905ee2b5790785c4eb3810c8e1cad1c8bff35b
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Mon Dec 7 16:44:45 2015 +0100
Use CSS (non-javascript) tooltips
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 2dd4d0a..95a84ce 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -13,9 +13,30 @@
http://blends.debian.org/css/blends.css; rel="stylesheet"
type="text/css" />
-.tooltip {
- display:none;
+// The tooltip is from <a rel="nofollow" href="http://www.menucool.com/tooltip/css-tooltip">http://www.menucool.com/tooltip/css-tooltip</a>
+a.tooltip { }
+
+a.tooltip:hover {
+cursor:pointer;
+}
+a.tooltip span {
+z-index:10;
+display:none;
+padding:14px 20px;
+margin-top:-30px;
+margin-left:28px;
+line-height:16px;
+border-radius:4px;
+box-shadow: 5px 5px 8px #CCC;
}
+a.tooltip:hover span{
+display:inline;
+position:absolute;
+color:#111;
+border:1px solid #DCA;
+background:#fffAF0;
+}
+
.pkgdesc-full {
background-image: none;
background:#f8f8ff;
@@ -83,7 +104,7 @@ ul.desc-inline li + li::before {
a.editlink {
float: left;
position: relative;
-text-decoration-line: unset;
+text-decoration: none;
padding-right: 0.5em;
}
@@ -115,7 +136,6 @@ function show_fulldesc(hash) {
-http://blends.debian.org/js/wz_tooltip.js"</a>;>
@@ -249,20 +269,19 @@ function show_fulldesc(hash) {
-
-
-
- Other
screenshots of package ${project.pkg}
- VersionURL
-
- ${screenshot['version']}${screenshot['url']}
-
-
-
- http://screenshots.debian.net/package/${project.pkg};>
-
+ http://screenshots.debian.net/package/${project.pkg};>
+
+
+
+
+ Other
screenshots of package ${project.pkg}
+ VersionURL
+
+ ${screenshot['version']}${screenshot['url']}
+
+
+
--
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
[Blends-commit] [SCM] website branch, master, updated. 9d37e39709be7d604048ef6f3ff1a41cd0ae857c
The following commit has been merged in the master branch:
commit 9d37e39709be7d604048ef6f3ff1a41cd0ae857c
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Mon Dec 7 16:59:18 2015 +0100
Use edit symbol in metapackage description as well.
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 50a3197..4d6e5c6 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -170,28 +170,32 @@ function show_fulldesc(hash) {
$projectname ${tasks[task].metapkg.PrintedName.capitalize()} packages
-
+
+
+
+ ${tasks[task].metapkg.desc[lang]['short']}
+
+
+ ${tasks[task].metapkg.desc['en']['short']}
+
+
+
+
- ${tasks[task].metapkg.desc[lang]['short']}
+ http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${tasks[task].metapkg.pkg};
py:if="lang != 'en'">
+
+ ${fixtranslation}
+
+ ${tasks[task].metapkg.desc[lang]['long']}
- ${tasks[task].metapkg.desc['en']['short']}
-
-
-
-
- ${tasks[task].metapkg.desc[lang]['long']}
-
- http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${tasks[task].metapkg.pkg};>${fixtranslation}
-
-
-
+ http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${tasks[task].metapkg.pkg};
py:if="lang != 'en'">
+
+ ${translatedesc}
+
${tasks[task].metapkg.desc['en']['long']}
-
- http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${tasks[task].metapkg.pkg};>${translatedesc}
-
-
-
+
+
@@ -407,7 +411,7 @@ function show_fulldesc(hash) {
http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg};>
- Edittags
+ Edittags
--
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
[Blends-commit] [SCM] website branch, master, updated. 9d37e39709be7d604048ef6f3ff1a41cd0ae857c
The following commit has been merged in the master branch:
commit a61254d6173ff794186dada4c4adb89c5fc3a0b3
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Mon Dec 7 16:46:25 2015 +0100
Dont show maintainer page for NEW and started packages; show QUeue for NEW
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index e923dd9..50a3197 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -442,16 +442,27 @@ function show_fulldesc(hash) {
-
- https://tracker.debian.org/pkg/${project.pkg};>
- Maintainer page
-
-
-
- https://bugs.debian.org/cgi-bin/pkgreport.cgi?repeatmerged=nosrc=${project.pkg};>
- Bugs
-
-
+
+
+
+ Queue entry
+
+
+
+
+
+ https://tracker.debian.org/pkg/${project.pkg};>
+ Maintainer page
+
+
+
+
+
+ https://bugs.debian.org/cgi-bin/pkgreport.cgi?repeatmerged=nosrc=${project.pkg};>
+ Bugs
+
+
+
--
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
[Blends-commit] [SCM] website branch, master, updated. 9d37e39709be7d604048ef6f3ff1a41cd0ae857c
The following commit has been merged in the master branch:
commit 65596433373923c1d05fc4ebc3cabd970f82d135
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Mon Dec 7 16:45:34 2015 +0100
Add tooltip explanation for symbols
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 95a84ce..e923dd9 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -238,13 +238,26 @@ function show_fulldesc(hash) {
-
+
+
+
+ New upstream version
+ ${project.outdated['version']}
+ available
+
+
-
-
+
+
+
+ XXX release critical bugs
+
-
+
+
+ CI test failure
+
@@ -292,8 +305,9 @@ function show_fulldesc(hash) {
- http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg};>
+ http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg};>
+ Improvetranslation
${project.desc[lang]['long']}
@@ -391,8 +405,9 @@ function show_fulldesc(hash) {
Tags
- http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg};>
+ http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg};>
+ Edittags
--
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
[Blends-commit] [SCM] website branch, master, updated. 371e51c7ea81704f0a5dc9af44b84693e8b193f3
The following commit has been merged in the master branch:
commit 371e51c7ea81704f0a5dc9af44b84693e8b193f3
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Tue Dec 8 14:48:43 2015 +0100
Further importvements: centered screenshots, alternating table row
background
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index cd0baf3..f5abe3f 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -36,13 +36,23 @@ a.tooltip:hover span{
border:1px solid #DCA;
background:#fffAF0;
}
+.centered {
+ position: fixed !important;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+}
+
+table {
+padding-bottom: 1.5em;
+}
-#splash { // overwrite "splash" id setting for "splash" package in debian-astro
-background-image: none;
+tr:first-child td.fullwidth {
+ border-top-style: none;
}
.pkgdesc-full {
-background:#f8f8ff;
+background-image: none !important;// overwrite "splash" id setting for
"splash" package in debian-astro
}
.pkgdesc-full td {
border-top-style: none;
@@ -93,6 +103,9 @@ a.tooltip:hover span{
.pkgdesc-short a:hover:not(:link):not(:visited) {
color: grey;
}
+tr.alternate-color {
+background-color: #eee;
+}
ul.desc-inline {
padding: 0;
margin: 0;
@@ -202,7 +215,7 @@ function show_fulldesc(hash) {
-
+
${headline[pstatus]}
@@ -224,8 +237,9 @@ function show_fulldesc(hash) {
Version
Description
-
-
+
+
${project.pkg.capitalize()}
@@ -276,7 +290,8 @@ function show_fulldesc(hash) {
-
+
${project.pkg.capitalize()}:
@@ -291,7 +306,7 @@ function show_fulldesc(hash) {
http://screenshots.debian.net/package/${project.pkg};>
-
+
-
+
http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg};>
- Improvetranslation
+ ${fixtranslation}
${project.desc[lang]['long']}
@@ -426,7 +441,7 @@ function show_fulldesc(hash) {
- Enhanced by
+ Enhancements
@@ -452,7 +467,7 @@ function show_fulldesc(hash) {
- Queue entry
+ NEW entry
@@ -545,6 +560,7 @@ function show_fulldesc(hash) {
+
--
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
[Blends-commit] [SCM] website branch, master, updated. c3d8ecec3bcc8084ba09eb9aa2b6104e2a0c92c8
The following commit has been merged in the master branch:
commit c3d8ecec3bcc8084ba09eb9aa2b6104e2a0c92c8
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Fri Dec 4 15:02:48 2015 +0100
Experimental package details list for Debian-Astro
diff --git a/webtools/tasks.py b/webtools/tasks.py
index 4f95798..6513fbc 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -262,7 +262,11 @@ for lang in languages:
except: # simply continue if file does not exist
pass
- template = loader.load('tasks.xhtml')
+if data['projectname'] == 'Debian Astro':
+ template = loader.load('packages.xhtml')
+else:
+template = loader.load('tasks.xhtml')
+
f = open(outputfile+'_tmp', "w")
try:
print >> f, template.generate(**data).render('xhtml')
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
new file mode 100644
index 000..177be75
--- /dev/null
+++ b/webtools/templates/packages.xhtml
@@ -0,0 +1,384 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;>
+http://www.w3.org/1999/xhtml; xml:lang="${lang}" lang="${lang}"
+ xmlns:py="http://genshi.edgewall.org/;>
+
+ $projectname ${tasks[task].metapkg.PrintedName.capitalize()}
packages
+
+http://www.debian.org/debhandheld.css; media="screen"
+ rel="stylesheet" type="text/css" />
+http://www.debian.org/debian.css; rel="stylesheet"
+ type="text/css" />
+http://blends.debian.org/css/blends.css; rel="stylesheet"
+ type="text/css" />
+
+.pkgdesc-full {
+background:#f8f8ff;
+}
+.pkgdesc-full td {
+border-top-style: none;
+}
+.pkgdesc-full p,ol,ul,pre {
+margin-top:0;
+margin-bottom: 0;
+padding-bottom: 0.5em;
+}
+.pkgdesc-full h3 {
+margin: 1em;
+}
+.pkgdesc-full dt {
+float: left;
+font-weight: bold;
+margin-top: 0;
+margin-bottom: 0;
+margin-left: 1em;
+margin-right: 0;
+padding-top: 0.5em;
+width: 150px;
+}
+.pkgdesc-full dt:after {
+content: ':';
+}
+.pkgdesc-full dt.screenshot:after {
+content: '';
+}
+.pkgdesc-full dt.screenshot img {
+width: 100%;
+}
+
+.pkgdesc-full dd {
+margin-left: 2em;
+padding-left: 150px;
+padding-bottom: 0.5em;
+padding-top: 0.5em;
+}
+.pkgdesc-full dd::after {
+clear: left;
+content: "";
+display: block;
+}
+.pkgdesc-short td:not(:last-child) {
+width: 1px;
+white-space: nowrap;
+}
+
+http://www.debian.org/favicon.ico; />
+
+// <![CDATA[
+function toggle_visibility(id) {
+var element = document.getElementById(id);
+if (element) {
+if (element.style.display == "none") {
+element.style.display = "";
+} else {
+element.style.display = "none";
+}
+}
+}
+function show_fulldesc(hash) {
+var full = document.getElementsByClassName("pkgdesc-full");
+var l = full.length;
+for (var i = 0; i < l; i++) {
+ if ((hash == "#all") | (hash == "#" + full[i].id)) {
+ full[i].style.display = "";
+ } else {
+full[i].style.display = "none";
+ }
+}
+}
+// ]]>
+
+
+
+
+
+
+ http://www.debian.org/; title="Debian Home">
+ http://www.debian.org/Pics/openlogo-50.png;
+alt="Debian" width="50" height= "61" />
+
+ Pure Blend
+
+
+
+ $projectname
+ $packages
+ $contact
+ $contribute
+
+
+
+ http://blends.debian.org;>Debian Pure Blends
+ / $projectname
+ / $packages
+ / ${tasks[task].metapkg.PrintedName.capitalize()}
+
+
+
+
+
+ Show all details
+ - Hide all details
+
+
+
+ $projectname ${tasks[task].metapkg.PrintedName.capitalize()} packages
+
+
+
+ ${tasks[task].metapkg.desc[lang]['short']}
+
+
+ ${tasks[task].metapkg.desc['en']['short']}
+
+
+
+
+ ${tasks[task].metapkg.desc[lang]['long']}
+
+ http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${tasks[task].metapkg.pkg};>${fixtranslation}
+
+
+
+ ${tasks[task].metapkg.desc['en']['long']}
+
+ http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${tasks[task].metapkg.pkg};>${translatedes
[Blends-commit] [SCM] website branch, master, updated. 33c0c442354531f56e4668c8d89f47a04bc295f9
The following commit has been merged in the master branch:
commit 33c0c442354531f56e4668c8d89f47a04bc295f9
Author: Ole Streicher <oleb...@debian.org>
Date: Sun Dec 6 15:14:04 2015 +0100
Add newversion notification and debtags
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 157f11f..097f160 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -204,6 +204,15 @@ function show_fulldesc(hash) {
+
+
+
+
+
+
+
+
+
@@ -319,9 +328,27 @@ function show_fulldesc(hash) {
+
+
+ ${project.outdated['version']}
+ (${project.outdated['release']})
+
+
+
+ Debtags
+
+
+
+
+ ${debtag['tag']}: ${debtag['value']}
+
+
+
+
+
Enhanced by
--
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
[Blends-commit] [SCM] website branch, master, updated. 084c6762d6747b948e716ff9e84066d2d41debca
The following commit has been merged in the master branch:
commit 084c6762d6747b948e716ff9e84066d2d41debca
Author: Ole Streicher <oleb...@debian.org>
Date: Wed Dec 9 08:57:54 2015 +0100
Add popcon values
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index f5abe3f..6cf09c8 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -424,22 +424,36 @@ function show_fulldesc(hash) {
-
- Tags
-
- http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg};>
-
- Edittags
-
-
-
+
+ Tags
+
+ http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg};>
+
+ Edittags
+
+
+
+
+ ${debtag['tag']}: ${debtag['value']}
+
+
+
+
+
+
+ Popularity
+
+
- ${debtag['tag']}: ${debtag['value']}
+ ${project.popcon['vote']} regular users
-
-
-
-
+
+ ${project.popcon['recent']} recent,
+ ${project.popcon['inst']} total installations (of
${popconsubmit} submissions)
+
+
+
+
Enhancements
--
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
[Blends-commit] [SCM] website branch, master, updated. db3508edc929087b4baeaf78b2d923315c59fd7c
The following commit has been merged in the master branch:
commit 1b3557cb97267081f2effce6c074ba6e7ee0f1bb
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Wed Dec 9 10:46:35 2015 +0100
make package description css more selective
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 08085e1..d63da93 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -13,7 +13,7 @@
http://blends.debian.org/css/blends.css; rel="stylesheet"
type="text/css" />
-// The tooltip is from <a rel="nofollow" href="http://www.menucool.com/tooltip/css-tooltip">http://www.menucool.com/tooltip/css-tooltip</a>
+// <!--
a.tooltip { }
a.tooltip:hover {
@@ -57,15 +57,15 @@ tr:first-child td.fullwidth {
.pkgdesc-full td {
border-top-style: none;
}
-.pkgdesc-full p,ol,ul,pre {
+.pkgdesc-full h3 {
+margin: 1em;
+}
+dl.pkgdesc > dd p,ol,ul,pre {
margin-top:0;
margin-bottom: 0;
padding-bottom: 0.5em;
}
-.pkgdesc-full h3 {
-margin: 1em;
-}
-.pkgdesc-full dt {
+dl.pkgdesc > dt {
float: left;
font-weight: bold;
margin-top: 0;
@@ -75,25 +75,25 @@ tr:first-child td.fullwidth {
padding-top: 0.5em;
width: 150px;
}
-.pkgdesc-full dt:after {
+dl.pkgdesc > dt:after {
content: ':';
}
-.pkgdesc-full dt.screenshot:after {
+dl.pkgdesc > dt.screenshot:after {
content: '';
}
-.pkgdesc-full dt.screenshot img {
+dl.pkgdesc > dt.screenshot img {
width: 100%;
}
-.pkgdesc-full dd {
+dl.pkgdesc > dd {
margin-left: 2em;
padding-left: 150px;
padding-bottom: 0.5em;
padding-top: 0.5em;
}
-.pkgdesc-full dd::after {
+dl.pkgdesc > dd::after {
clear: left;
-content: "";
+content: '';
display: block;
}
.pkgdesc-short td:not(:last-child) {
@@ -123,10 +123,11 @@ a.editlink {
text-decoration: none;
padding-right: 0.5em;
}
+// -->
http://www.debian.org/favicon.ico; />
-// <![CDATA[
+// <!--
function toggle_visibility(id) {
var element = document.getElementById(id);
if (element) {
@@ -148,7 +149,7 @@ function show_fulldesc(hash) {
}
}
}
-// ]]>
+// -->
@@ -300,7 +301,7 @@ function show_fulldesc(hash) {
${project.desc['en']['short']}
-
+
--
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
[Blends-commit] [SCM] website branch, master, updated. db3508edc929087b4baeaf78b2d923315c59fd7c
The following commit has been merged in the master branch:
commit db3508edc929087b4baeaf78b2d923315c59fd7c
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Wed Dec 9 12:00:44 2015 +0100
Small formatting corrections
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index b561bb1..3e7b5d3 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -404,13 +404,9 @@ function show_fulldesc(hash) {
${maintainer[pstatus]}
-
- ${project.responsible}
-
+ ${project.responsible}
-
- ${project.properties['changed_by']}
-
+ ${project.properties['changed_by']}
@@ -448,31 +444,28 @@ function show_fulldesc(hash) {
Edittags
-
+
-
- ${debtag['tag']}: ${debtag['value']}
-
+ ${debtag['tag'].capitalize()}
+ ${debtag['value']}
-
+
-
+
Popularity
-
-
- ${project.popcon['vote']} regular users
-
+
+ ${project.popcon['vote']} regular users
${project.popcon['recent']} recent installations
- (of ${popconsubmit} submissions)
+ (of ${popconsubmit} submissions)
@@ -482,9 +475,7 @@ function show_fulldesc(hash) {
-
- ${enh}
-
+ ${enh}
@@ -502,9 +493,7 @@ function show_fulldesc(hash) {
-
- NEW entry
-
+ NEW
entry
@@ -544,9 +533,7 @@ function show_fulldesc(hash) {
-
- Home page
-
+ Home
page
--
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
[Blends-commit] [SCM] website branch, master, updated. 2ceb7bfa6a1783ba36a6caabb4694ac04c6b3768
The following commit has been merged in the master branch:
commit 2ceb7bfa6a1783ba36a6caabb4694ac04c6b3768
Author: Ole Streicher <oleb...@debian.org>
Date: Sat Dec 5 17:46:38 2015 +0100
Dont use inline lists in package description
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 151a79b..0e736f2 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -63,15 +63,15 @@
width: 1px;
white-space: nowrap;
}
-.pkgdesc-full ul {
+ul.desc-inline {
padding: 0;
margin: 0;
}
-.pkgdesc-full ul li {
+ul.desc-inline li {
display: inline;
}
-.pkgdesc-full ul li + li::before {
+.ul.desc-inline li + li::before {
content: " \2022 ";
}
@@ -290,7 +290,7 @@ function show_fulldesc(hash) {
${maintainer[pstatus]}
-
+
${project.responsible}
@@ -305,7 +305,7 @@ function show_fulldesc(hash) {
Versions
-
+
@@ -325,7 +325,7 @@ function show_fulldesc(hash) {
Enhanced by
-
+
@@ -338,7 +338,7 @@ function show_fulldesc(hash) {
Debian
-
+
http://bugs.debian.org/${project.properties['wnpp']}">
@@ -377,7 +377,7 @@ function show_fulldesc(hash) {
Upstream
-
+
Home page
@@ -402,7 +402,7 @@ function show_fulldesc(hash) {
Improve entry
-
+
http://screenshots.debian.net/uploadfile?packagename=${project.pkg};>
Screenshots
--
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
[Blends-commit] [SCM] website branch, master, updated. b08c3af4ab5c0c2b0ceac3acddcd2f8d45f43472
The following commit has been merged in the master branch:
commit b08c3af4ab5c0c2b0ceac3acddcd2f8d45f43472
Author: Ole Streicher <oleb...@debian.org>
Date: Sat Dec 5 18:26:42 2015 +0100
typofix
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 0e736f2..157f11f 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -71,7 +71,7 @@ ul.desc-inline li {
display: inline;
}
-.ul.desc-inline li + li::before {
+ul.desc-inline li + li::before {
content: " \2022 ";
}
@@ -227,7 +227,7 @@ function show_fulldesc(hash) {
-
+
--
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
[Blends-commit] [SCM] website branch, master, updated. 53b418b9c58431bfc1cd36085da2b4eff76061fe
The following commit has been merged in the master branch:
commit 53b418b9c58431bfc1cd36085da2b4eff76061fe
Author: Ole Streicher <oleb...@debian.org>
Date: Sat Dec 5 16:54:05 2015 +0100
Create lists for Maintainer/Versions/Debian/Upstream/Improvement tags
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 9eae4ab..151a79b 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -63,6 +63,17 @@
width: 1px;
white-space: nowrap;
}
+.pkgdesc-full ul {
+padding: 0;
+margin: 0;
+}
+.pkgdesc-full ul li {
+display: inline;
+}
+
+.pkgdesc-full ul li + li::before {
+content: " \2022 ";
+}
http://www.debian.org/favicon.ico; />
[Blends-commit] [SCM] website branch, master, updated. 087329c69c07a15be22cd3c572aba5b1349c69c7
The following commit has been merged in the master branch:
commit 087329c69c07a15be22cd3c572aba5b1349c69c7
Author: Ole Streicher <oleb...@debian.org>
Date: Thu Dec 10 08:46:40 2015 +0100
Fix empty in popcon entry; use text-transform:capitalize for pkg names
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 3e7b5d3..c83093e 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -127,6 +127,9 @@ dl.debtags dt, dl.debtags dd {
font-weight: normal;
margin: 0;
}
+dl.debtags dt {
+text-transform: capitalize;
+}
dl.debtags dd + dt::before {
content: ' \2022\20';
}
@@ -257,9 +260,9 @@ function show_fulldesc(hash) {
-
+
- ${project.pkg.capitalize()}
+ ${project.pkg}
@@ -446,7 +449,7 @@ function show_fulldesc(hash) {
- ${debtag['tag'].capitalize()}
+ ${debtag['tag']}
${debtag['value']}
@@ -460,11 +463,11 @@ function show_fulldesc(hash) {
${project.popcon['vote']} regular users
-
-
+
+
${project.popcon['recent']} recent installations
-
-
+
+
(of ${popconsubmit} submissions)
--
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
[Blends-commit] [SCM] website branch, master, updated. fd383f9dd869af2cea6fed95bff38ec4abb666a0
The following commit has been merged in the master branch:
commit fd383f9dd869af2cea6fed95bff38ec4abb666a0
Author: Ole Streicher <oleb...@debian.org>
Date: Thu Dec 10 08:59:14 2015 +0100
Remove python capitalization of task name
diff --git a/webtools/templates/tasks_idx.xhtml
b/webtools/templates/tasks_idx.xhtml
index c3ac0ea..b93355e 100644
--- a/webtools/templates/tasks_idx.xhtml
+++ b/webtools/templates/tasks_idx.xhtml
@@ -75,7 +75,7 @@ table {
- ${tasks[task].metapkg.PrintedName.capitalize()}
+ ${tasks[task].metapkg.PrintedName}
--
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
[Blends-commit] [SCM] website branch, master, updated. 31d42a7abf9a171bca5ea42f2fdca1515834eb81
The following commit has been merged in the master branch: commit 31d42a7abf9a171bca5ea42f2fdca1515834eb81 Author: Ole Streicher <oleb...@debian.org> Date: Thu Dec 10 08:57:07 2015 +0100 Small improvements: use transform:capitalize, space after table, alternating table row colors diff --git a/webtools/templates/tasks_idx.xhtml b/webtools/templates/tasks_idx.xhtml index 89fba67..c3ac0ea 100644 --- a/webtools/templates/tasks_idx.xhtml +++ b/webtools/templates/tasks_idx.xhtml @@ -12,6 +12,16 @@ type="text/css" /> http://blends.debian.org/css/blends.css; rel="stylesheet" type="text/css" /> +
[Blends-commit] [SCM] website branch, master, updated. 2b8283fbcdc53a2992d0ac2f4db0ca726875521d
The following commit has been merged in the master branch:
commit 2b8283fbcdc53a2992d0ac2f4db0ca726875521d
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Fri Dec 11 09:34:18 2015 +0100
Show bugs, maintainer page and improvements only for Debian packages
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index c6d3898..df33567 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -498,14 +498,14 @@ function show_fulldesc(hash) {
NEW
entry
-
+
https://tracker.debian.org/pkg/${project.pkg};>
Maintainer page
-
+
https://bugs.debian.org/cgi-bin/pkgreport.cgi?repeatmerged=nosrc=${project.pkg};>
Bugs
@@ -555,10 +555,9 @@ function show_fulldesc(hash) {
+ or (lang != 'en' and lang not in
project.desc))">
Improve entry
--
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
[Blends-commit] [SCM] website branch, master, updated. 63503dff822b6b58037950bba7cd473bf70643e4
The following commit has been merged in the master branch:
commit 63503dff822b6b58037950bba7cd473bf70643e4
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Thu Dec 10 11:35:10 2015 +0100
Use correct comment start sequence '/*' instead of '//' for CSS
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index c83093e..c6d3898 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -13,8 +13,7 @@
http://blends.debian.org/css/blends.css; rel="stylesheet"
type="text/css" />
-// <!--
-a.tooltip { }
+/* <!-- */
a.tooltip:hover {
cursor:pointer;
@@ -142,11 +141,11 @@ a.editlink {
text-decoration: none;
padding-right: 0.5em;
}
-// -->
+/* --> */
http://www.debian.org/favicon.ico; />
-// <!--
+/* <!-- */
function toggle_visibility(id) {
var element = document.getElementById(id);
if (element) {
@@ -168,7 +167,7 @@ function show_fulldesc(hash) {
}
}
}
-// -->
+/* --> */
diff --git a/webtools/templates/tasks_idx.xhtml
b/webtools/templates/tasks_idx.xhtml
index 8578a3e..5f85b54 100644
--- a/webtools/templates/tasks_idx.xhtml
+++ b/webtools/templates/tasks_idx.xhtml
@@ -13,7 +13,7 @@
http://blends.debian.org/css/blends.css; rel="stylesheet"
type="text/css" />
-// <!--
+/* <!-- */
tr:nth-child(even) {
background-color: #eee;
}
@@ -21,7 +21,7 @@ table {
padding-bottom: 1.5em;
}
-// -->
+/* --> */
http://www.debian.org/favicon.ico; />
--
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
[Blends-commit] [SCM] website branch, master, updated. 583252334a31233451bdc092b557f16a68d8f85d
The following commit has been merged in the master branch:
commit 583252334a31233451bdc092b557f16a68d8f85d
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Wed Dec 16 09:32:26 2015 +0100
Add hint to click on package name to view details
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 528dae8..36f205a 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -196,12 +196,6 @@ function show_fulldesc(hash) {
-
-
- Show all details
- - Hide all details
-
-
$projectname ${tasks[task].metapkg.PrintedName.capitalize()} packages
@@ -231,6 +225,11 @@ function show_fulldesc(hash) {
${tasks[task].metapkg.desc['en']['long']}
+
+ For details of one package, click on package name or
description
+ Show all
details
+ Hide all
details
+
--
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
[Blends-commit] [SCM] website branch, master, updated. 064a0fa8f527e3bd7ae9a80958640b3f6b8abba8
The following commit has been merged in the master branch:
commit 064a0fa8f527e3bd7ae9a80958640b3f6b8abba8
Author: Ole Streicher <oleb...@debian.org>
Date: Sun Dec 27 11:05:44 2015 +0100
Display inst values of popcon in package list
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 7d07af7..660d337 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -465,8 +465,7 @@ function show_fulldesc(hash) {
-
+
Popularity
@@ -475,10 +474,13 @@ function show_fulldesc(hash) {
- ${project.popcon['recent']} recent installations
+ ${project.popcon['recent']} recent
- (of ${popconsubmit} submissions)
+
+ ${project.popcon['insts']} total installations
+ (of ${popconsubmit} submissions)
+
--
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
[Blends-commit] [SCM] website branch, master, updated. 363a89cb8c1121c8f737dfb96526466df2ad3817
The following commit has been merged in the master branch:
commit 54e009d31680ecb5fc904048f699eacb07b1008d
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Thu Dec 17 11:15:07 2015 +0100
Use symbol and title to hint details toggle
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 54240e4..816c4fc 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -99,7 +99,11 @@ dl.pkgdesc > dd::after {
width: 1px;
white-space: nowrap;
}
-.pkgdesc-short a:hover:not(:link):not(:visited) {
+.pkgdesc-short td:first-child {
+padding-left: 0.4em;
+padding-right: 0;
+}
+a:hover:not(:link):not(:visited) {
color: grey;
}
tr.alternate-color {
@@ -196,6 +200,12 @@ function show_fulldesc(hash) {
+
+
+ Show all
details
+ Hide all
details
+
+
$projectname ${tasks[task].metapkg.PrintedName.capitalize()} packages
@@ -223,15 +233,10 @@ function show_fulldesc(hash) {
${tasks[task].metapkg.desc['en']['long']}
-
- For details of one package, click on package name or
description
- Show all
details
- Hide all
details
-
-
+
${headline[pstatus]}
@@ -249,15 +254,24 @@ function show_fulldesc(hash) {
+
Package
Version
Description
+ class="pkgdesc-short ${'alternate-color' if line % 2 == 1
+else ''}">
+
+
+
+
+
-
+
${project.pkg}
@@ -309,7 +323,7 @@ function show_fulldesc(hash) {
-
+
${project.pkg.capitalize()}:
@@ -580,7 +594,7 @@ function show_fulldesc(hash) {
-
+
--
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
[Blends-commit] [SCM] website branch, master, updated. 363a89cb8c1121c8f737dfb96526466df2ad3817
The following commit has been merged in the master branch:
commit 363a89cb8c1121c8f737dfb96526466df2ad3817
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Thu Dec 17 11:46:36 2015 +0100
Add title to link to latest package
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index a8f3c78..7d07af7 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -282,7 +282,8 @@ function show_fulldesc(hash) {
${project.version[-1]}
- http://packages.debian.org/${project.version[-1]['release']}/${project.pkg}">
+ http://packages.debian.org/${project.version[-1]['release']}/${project.pkg}"
+ title="Version ${project.version[-1]['version']} in
${project.version[-1]['release']}">
${project.version[-1]['version']}
--
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
[Blends-commit] [SCM] website branch, master, updated. 363a89cb8c1121c8f737dfb96526466df2ad3817
The following commit has been merged in the master branch:
commit 4647ef2f736dfdf2070c341a5403d1ca36127b4f
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Thu Dec 17 11:13:11 2015 +0100
Replace tooltips by 'title' attribute in links
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 36f205a..54240e4 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -211,16 +211,14 @@ function show_fulldesc(hash) {
- http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${tasks[task].metapkg.pkg};
py:if="lang != 'en'">
+ http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${tasks[task].metapkg.pkg};
py:if="lang != 'en'">
- ${fixtranslation}
${tasks[task].metapkg.desc[lang]['long']}
- http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${tasks[task].metapkg.pkg};
py:if="lang != 'en'">
+ http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${tasks[task].metapkg.pkg};
py:if="lang != 'en'">
- ${translatedesc}
${tasks[task].metapkg.desc['en']['long']}
@@ -300,7 +298,8 @@ function show_fulldesc(hash) {
-
+
${project.desc[lang]['short']}
${project.desc['en']['short']}
@@ -345,9 +344,8 @@ function show_fulldesc(hash) {
- http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg};>
+ http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.pkg};>
- ${fixtranslation}
${project.desc[lang]['long']}
@@ -441,9 +439,8 @@ function show_fulldesc(hash) {
Tags
- http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg};>
+ http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg};>
- Edittags
--
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
[Blends-commit] [SCM] website branch, master, updated. 363a89cb8c1121c8f737dfb96526466df2ad3817
The following commit has been merged in the master branch:
commit bee20125ef7f09c2aa1fb580bc2e4f37a34f290b
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Thu Dec 17 11:15:56 2015 +0100
Provide additional 'close' link at the bottom of the detailed desc
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 816c4fc..a8f3c78 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -201,7 +201,7 @@ function show_fulldesc(hash) {
-
+
Show all
details
Hide all
details
@@ -590,6 +590,9 @@ function show_fulldesc(hash) {
+
+ Close
--
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
[Blends-commit] [SCM] website branch, master, updated. 58b347eab8ae054cc759eade81274a4d67d3e444
The following commit has been merged in the master branch:
commit 58b347eab8ae054cc759eade81274a4d67d3e444
Author: Ole Streicher <oleb...@debian.org>
Date: Sat Nov 28 12:47:42 2015 +0100
I18n for new task index
diff --git a/webtools/tasks.py b/webtools/tasks.py
index adcd938..fde73c5 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -90,16 +90,23 @@ for lang in languages:
data['lang'] = lang
data['license'] = to_unicode(_('License'))
data['version'] = to_unicode(_('Version'))
-data['summary'] = to_unicode(_('Summary'))
+ data['summary'] = to_unicode(_('Summary'))
data['updatetimestamp'] = to_unicode(_('Last update:')) + ' ' +
formatdate(time.mktime(t.timetuple()))
-data['nopkgavail']= to_unicode(_('Debian package not
available'))
+ data['nopkgavail']= to_unicode(_('Debian package not
available'))
# Description of package in specific packges (same for Depends,
Recommends, Suggests)
-data['legend']= to_unicode(_("For a better overview of the
project's availability as a Debian package, each head row has a color code
according to this scheme:"))
-data['discovery'] = Markup(to_unicode(_("""If you discover a
project which looks like a good candidate for %s
- to you, or if you have prepared an unofficial
Debian package, please do not hesitate to
- send a description of that project to the mailto:%s;>%s mailing list""") % \
- (data['projectname'], data['projectlist'],
data['projectname'])))
-data['description'] = to_unicode(_("The list to the right
includes various software projects which are of some interest to the %s
Project. Currently, only a few of them are available as Debian packages. It is
our goal, however, to include all software in %s which can sensibly add to a
high quality Debian Pure Blend.") % (data['projectname'], data['projectname']))
+ data['legend']= to_unicode(_("For a better overview of the
project's availability as a Debian package, each head row has a color code
according to this scheme:"))
+ data['discovery'] = Markup(to_unicode(_("""If you discover a
project which looks like a good candidate for %s
+ to you, or if you have prepared an unofficial
Debian package, please do not hesitate to
+ send a description of that project to the mailto:%s;>%s mailing list""") % \
+ (data['projectname'],
data['projectlist'], data['projectname'])))
+ data['bugs'] = to_unicode(_('Bugs'))
+ data['thermometer']= to_unicode(_('Thermometer'))
+ data['maintstats'] = to_unicode(_('Maintainer Stats'))
+ data['contact']= to_unicode(_('Contact'))
+ data['contribute'] = to_unicode(_('Contribute'))
+ data['description']= to_unicode(_('Description'))
+ data['metapackage']= to_unicode(_('Metapackage'))
+ data['packages'] = to_unicode(_('Packages'))
data['gtstrTasksPage'] = to_unicode(_('Tasks page'))
data['gtstrProject'] = to_unicode(_('Project'))
data['gtstrThisIsAList'] = to_unicode(_('This is a list of the Tasks
%s is made of:') % data['projectname'])
@@ -112,6 +119,10 @@ for lang in languages:
data['popconexplanation'] = to_unicode(_('Popularitycontest results:
number of people who use this package regularly (number of people who upgraded
this package recently) out of'))
data['tableofcontents']= to_unicode(_('Table of contents'))
data['packagelist']= to_unicode(_('complete packagelist'))
+ data['tasksintro'] = to_unicode(_('''The packages of the {0}
+ Pure Blend are grouped by metapackages. Each metapackage will cause
the
+ installation of packages for a specific topic. The following table
lists
+ the metapackages of {0}''').format((data['projectname'])))
if data['advertising'] != None:
# If data['advertising'] is enclosed in _() gettext tries to
ask for translations of 'advertising'
# which makes no sense. That's why this is masked by an extra
string variable
@@ -123,11 +134,11 @@ for lang in languages:
else:
data['projectadvertising'] = None
-data['packages'] = to_unicode(_('Packages'))
+ data['packages'] = to_unicode(_('Packages'))
data['idxsummary']= to_unicode(_("""A %sDebian Pure Blend%s is
a Debian internal project which assembles
a set of packages that might help users to solve certain tasks
[Blends-commit] [SCM] website branch, master, updated. 92405e0e16f4b3821ce8bd270885d1d3420d3ac6
The following commit has been merged in the master branch:
commit 92405e0e16f4b3821ce8bd270885d1d3420d3ac6
Author: Ole Streicher <oleb...@debian.org>
Date: Sat Nov 28 13:37:43 2015 +0100
Include debian-astro main page to templates for teaser package handling
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index fce0515..0d692fd 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1106,6 +1106,18 @@ class Tasks:
break
logger.debug(" %s -> %s" % (enh,
dep.properties['Enhances'][enh]))
+@property
+def PackageByName(self):
+try:
+return self._packageByName
+except AttributeError:
+deps = []
+for task in self.tasks.values():
+for d in task.dependencies.values():
+deps += d
+self._packageByName = dict((dep.pkg, dep) for dep in deps)
+return self._packageByName
+
def __str__(self):
ret = "Blendname: " + self.blendname + ", " \
"Metapackagekeys: " + str(self.metapackagekeys) + ", "
diff --git a/webtools/tasks.py b/webtools/tasks.py
index fde73c5..80e6f1f 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -36,6 +36,7 @@ tasks.MarkupPreformatedStringsBlend()
data = tasks.data
data['tasks']= tasks.GetTaskDescDict()
data['taskskeys']= tasks.metapackagekeys
+data['PackageByName']= tasks.PackageByName
try:
data['popconsubmit'] = tasks.popconsubmit
except:
@@ -198,6 +199,28 @@ the right shows the tasks of %s.""" ) \
f.close()
SetFilePermissions(outputfile)
+ try:
+ template = loader.load('%s_idx.xhtml' % tasks.blendname)
+ outputfile = tasks.data['outputdir'] + '/index'
+ if lang != 'xyz': # let 'en' be a language as any other and add
suffix to file name
+ outputfile += '.' + language_dict[lang]['short'] +
'.html'
+ try:
+ os.unlink(outputfile)
+ except: # simply continue if file does not exist
+ pass
+ f = open(outputfile, 'w')
+ try:
+ print >> f, template.generate(**data).render('xhtml')
+ except UnicodeDecodeError, errtxt:
+ print >> stderr, \
+ "Some critical encoding problem occured when
trying to render index for lang %s.\n%s" \
+ % (lang, errtxt)
+
+ f.close()
+ SetFilePermissions(outputfile)
+ except:
+ pass
+
data['dependencies'] = {}
data['projects'] = {}
diff --git a/webtools/templates/debian-astro_idx.xhtml
b/webtools/templates/debian-astro_idx.xhtml
new file mode 100644
index 000..ff0586d
--- /dev/null
+++ b/webtools/templates/debian-astro_idx.xhtml
@@ -0,0 +1,113 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;>
+http://www.w3.org/1999/xhtml; xml:lang="${lang}" lang="${lang}"
+ xmlns:py="http://genshi.edgewall.org/;>
+
+$projectname Pure Blend
+
+
+http://blends.debian.org/css/debhandheld.css; media="screen"
rel="stylesheet" type="text/css" />
+http://blends.debian.org//css/debian.css; rel="stylesheet"
type="text/css" />
+http://blends.debian.org//css/blends.css; rel="stylesheet"
type="text/css" />
+http://www.debian.org/favicon.ico; />
+
+
+
+
+
+ http://www.debian.org/; title="Debian Home">
+ http://www.debian.org/Pics/openlogo-50.png;
+alt="Debian" width="50" height= "61" />
+
+ Pure Blend
+
+
+
+ $projectname
+ $packages
+ $contact
+ $contribute
+
+
+
+ http://blends.debian.org;>Debian Pure Blends
+ / $projectname
+
+
+
+
+ $projectname
+
+
+ $projectname is a "Debian Pure Blend" with the aim to develop a
+ Debian based operating system that fits the requirements of both
+ professional and hobby astronomers. It integrates a large number of
+ software packages covering telescope control, data reduction,
+ presentation and other fields.
+
+
+ Featured packages
+
+
+
+
+
+
+
+
+
+
[Blends-commit] [SCM] website branch, master, updated. 002461d6ba7fa39df956c8e60b57d7fe48cc9944
The following commit has been merged in the master branch: commit 002461d6ba7fa39df956c8e60b57d7fe48cc9944 Author: Ole Streicher <oleb...@debian.org> Date: Sun Nov 29 15:23:07 2015 +0100 Remove welcome page w/o teasers diff --git a/www/astro/index.html b/www/astro/index.html deleted file mode 100644 index 0a0010d..000 --- a/www/astro/index.html +++ /dev/null @@ -1,80 +0,0 @@ -http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> -http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - -Debian Astro Pure Blend - - - - - -http://www.debian.org/favicon.ico; /> - - - - - - http://www.debian.org/; title="Debian Home"> - http://www.debian.org/Pics/openlogo-50.png; -alt="Debian" width="50" height= "61"> - - Pure Blend - - - - Debian Astro - Packages - Contact - Contribute - - - - http://blends.debian.org;>Debian Pure Blends - / Debian Astro - - - - - Debian Astro - - - Debian Astro is a "Debian Pure Blend" with the aim to develop a - Debian based operating system that fits the requirements of both - professional and hobby astronomers. It integrates a large number of - software packages covering telescope control, data reduction, - presentation and other fields. - - Installation - - On an existing Debian Stretch installation, you can get the - Debian Astro Pure Blend just by installing - its metapackages. During - the installation on a new system, this will be possible - during the installation process. - - - If you're new to Debian and you'd like to try the Debian - Astro Pure Blend without installing it on your computer, or - if you'd like to perform a fresh installation of Debian with - all the astronomy software ready-to-go, you might find the - live images useful. Images will be produced that can be run - from DVDs or USB sticks on both 32-bit and 64-bit Intel - architectures. - - - Note: Debian Astro is not available under Debian - Jessie. Our plan is to deliver the first version together with - Debian Stretch. - - - - - The source code powering these pages is available - http://anonscm.debian.org/cgit/blends/website.git;>here. - - Debian is a registered trademark - of http://www.spi-inc.org/;>Software in the Public - Interest. - - - - -- 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
[Blends-commit] [SCM] website branch, master, updated. afeba84d936a5e80903aa6a0016a8cb845fb7355
The following commit has been merged in the master branch: commit afeba84d936a5e80903aa6a0016a8cb845fb7355 Author: Ole Streicher <oleb...@debian.org> Date: Sun Nov 29 15:40:15 2015 +0100 Q workaround for astro/index.html: symlink to index.en.html diff --git a/www/astro/index.html b/www/astro/index.html new file mode 12 index 000..0e85422 --- /dev/null +++ b/www/astro/index.html @@ -0,0 +1 @@ +index.en.html \ No newline at end of file -- 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
[Blends-commit] [SCM] website branch, master, updated. 768833253dc4ed49283e7bb02c1a059f404350ed
The following commit has been merged in the master branch: commit 768833253dc4ed49283e7bb02c1a059f404350ed Author: Ole Streicher <oleb...@debian.org> Date: Wed Nov 25 12:31:01 2015 +0100 Remove mentioning an overall tasks package diff --git a/www/astro/index.html b/www/astro/index.html index 3eacdad..b36d35f 100644 --- a/www/astro/index.html +++ b/www/astro/index.html @@ -47,8 +47,7 @@ On an existing Debian Stretch installation, you can get the Debian Astro Pure Blend just by installing - the debian-astro package, or the - individual metapackages. During + its metapackages. During the installation on a new system, this will be possible during the installation process. -- 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
[Blends-commit] [SCM] website branch, master, updated. 328a13f86dd922f1cbb5c2e6eb50020de2d1daf8
The following commit has been merged in the master branch: commit 328a13f86dd922f1cbb5c2e6eb50020de2d1daf8 Author: Ole Streicher <oleb...@debian.org> Date: Wed Nov 25 12:24:24 2015 +0100 Put some content into debian/astro main page (to be overwritten with a generated page) diff --git a/www/astro/index.html b/www/astro/index.html index 89890ad..3eacdad 100644 --- a/www/astro/index.html +++ b/www/astro/index.html @@ -1,67 +1,81 @@ - - - - Debian Astro Pure Blend - - - - - - - - - - - - Astro Pure Blend - - - - - http://www.debian.org; title="Debian Home"> - - - - - - - Skip Quicknav - - Home -Tasks -Bugs -Thermometer -Maintainer Stats - - - - - Debian Astro Pure Blend +http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;> +http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> + +Debian Astro Pure Blend + + + + + +http://www.debian.org/favicon.ico; /> + + + + + + http://www.debian.org/; title="Debian Home"> + http://www.debian.org/Pics/openlogo-50.png; +alt="Debian" width="50" height= "61"> + + Pure Blend - - - - - - Debian Astro Pure Blend - - - - - - - - -The source code powering these pages is available http://anonscm.debian.org/cgit/blends/website.git;>here. - -Contact: mailto:debian-as...@lists.debian.org;>Debian Astro Pure Blend (https://lists.debian.org/debian-astro/;>archives) - or #debian-astro on irc.debian.org. - -Debian is a registered trademark of http://www.spi-inc.org/;>Software in the Public Interest. - - - - - - + + + Debian Astro + Packages + Contact + Contribute + + + + http://blends.debian.org;>Debian Pure Blends + / Debian Astro + + + + + Debian Astro + + + Debian Astro is a "Debian Pure Blend" with the aim to develop a + Debian based operating system that fits the requirements of both + professional and hobby astronomers. It integrates a large number of + software packages covering telescope control, data reduction, + presentation and other fields. + + Installation + + On an existing Debian Stretch installation, you can get the + Debian Astro Pure Blend just by installing + the debian-astro package, or the + individual metapackages. During + the installation on a new system, this will be possible + during the installation process. + + + If you're new to Debian and you'd like to try the Debian + Astro Pure Blend without installing it on your computer, or + if you'd like to perform a fresh installation of Debian with + all the astronomy software ready-to-go, you might find the + live images useful. Images will be produced that can be run + from DVDs or USB sticks on both 32-bit and 64-bit Intel + architectures. + + + Note: Debian Astro is not available under Debian + Jessie. Our plan is to deliver the first version together with + Debian Stretch. + + + + + The source code powering these pages is available + http://anonscm.debian.org/cgit/blends/website.git;>here. + + Debian is a registered trademark + of http://www.spi-inc.org/;>Software in the Public + Interest. + + + -- 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
[Blends-commit] [SCM] website branch, master, updated. be709b8ba5a61ac9057c51382c76b80da7589d29
The following commit has been merged in the master branch: commit be709b8ba5a61ac9057c51382c76b80da7589d29 Author: Ole Streicher <oleb...@debian.org> Date: Wed Nov 25 12:48:48 2015 +0100 Create specific header for Debian Astro diff --git a/webtools/templates/tasks_idx.xhtml b/webtools/templates/tasks_idx.xhtml index 9be4f8d..541db4d 100644 --- a/webtools/templates/tasks_idx.xhtml +++ b/webtools/templates/tasks_idx.xhtml @@ -25,18 +25,25 @@ Pure Blend - - $projectname - - Tasks - Bugs - Thermometer - Maintainer Stats - + Contribute + + + + + $projectname + Tasks + Bugs + Thermometer + Maintainer Stats + + + http://blends.debian.org;>Debian Pure Blends -- 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
[Blends-commit] [SCM] website branch, master, updated. a52165467280cccd2ab364217b14050b5c55ba58
The following commit has been merged in the master branch: commit a52165467280cccd2ab364217b14050b5c55ba58 Author: Ole Streicher <oleb...@debian.org> Date: Wed Nov 25 14:57:57 2015 +0100 Fix Debian Astro menu diff --git a/www/astro/contact.html b/www/astro/contact.html index fbdd232..fc25c52 100644 --- a/www/astro/contact.html +++ b/www/astro/contact.html @@ -24,7 +24,7 @@ Debian Astro - Tasks + Packages Contact Contribute diff --git a/www/astro/contribute.html b/www/astro/contribute.html index 1c7c0a2..a98e838 100644 --- a/www/astro/contribute.html +++ b/www/astro/contribute.html @@ -24,7 +24,7 @@ Debian Astro - Tasks + Packages Contact Contribute -- 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
[Blends-commit] [SCM] website branch, master, updated. b5aa60dd0377048b60d1bc9a4ce33113142fc2a5
The following commit has been merged in the master branch: commit b5aa60dd0377048b60d1bc9a4ce33113142fc2a5 Author: Ole Streicher <oleb...@debian.org> Date: Wed Nov 25 14:59:36 2015 +0100 Fix link to tasks page diff --git a/www/astro/index.html b/www/astro/index.html index b36d35f..0a0010d 100644 --- a/www/astro/index.html +++ b/www/astro/index.html @@ -47,7 +47,7 @@ On an existing Debian Stretch installation, you can get the Debian Astro Pure Blend just by installing - its metapackages. During + its metapackages. During the installation on a new system, this will be possible during the installation process. -- 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
[Blends-commit] [SCM] website branch, master, updated. f76427197b7d4c97443ba92579c2adb51e743234
The following commit has been merged in the master branch: commit f76427197b7d4c97443ba92579c2adb51e743234 Author: Ole Streicher <deb...@liska.ath.cx> Date: Tue Dec 1 13:19:09 2015 +0100 Replace astropy by glueviz as featured pkg until astropy has a screenshot or logo diff --git a/webtools/templates/debian-astro_idx.xhtml b/webtools/templates/debian-astro_idx.xhtml index ff0586d..c18a43b 100644 --- a/webtools/templates/debian-astro_idx.xhtml +++ b/webtools/templates/debian-astro_idx.xhtml @@ -46,7 +46,7 @@ Featured packages - + -- 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
[Blends-commit] [SCM] website branch, master, updated. 54c1b987f9c6cf8d8dee21e4f9cac1503d691ef5
The following commit has been merged in the master branch:
commit 54c1b987f9c6cf8d8dee21e4f9cac1503d691ef5
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Tue Dec 1 15:36:15 2015 +0100
Add total package count to Tasks index page
diff --git a/webtools/tasks.py b/webtools/tasks.py
index 80e6f1f..4f95798 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -120,10 +120,6 @@ for lang in languages:
data['popconexplanation'] = to_unicode(_('Popularitycontest results:
number of people who use this package regularly (number of people who upgraded
this package recently) out of'))
data['tableofcontents']= to_unicode(_('Table of contents'))
data['packagelist']= to_unicode(_('complete packagelist'))
- data['tasksintro'] = to_unicode(_('''The packages of the {0}
- Pure Blend are grouped by metapackages. Each metapackage will cause
the
- installation of packages for a specific topic. The following table
lists
- the metapackages of {0}''').format((data['projectname'])))
if data['advertising'] != None:
# If data['advertising'] is enclosed in _() gettext tries to
ask for translations of 'advertising'
# which makes no sense. That's why this is masked by an extra
string variable
@@ -136,12 +132,10 @@ for lang in languages:
data['projectadvertising'] = None
data['packages'] = to_unicode(_('Packages'))
- data['idxsummary']= to_unicode(_("""A %sDebian Pure Blend%s is
a Debian internal project which assembles
-a set of packages that might help users to solve certain tasks of their work.
The list on
-the right shows the tasks of %s.""" ) \
- % ('http://blends.alioth.debian.org/blends/;>', '', data['projectname']))
- data['idxsummary']= Markup(to_unicode(data['idxsummary']))
-
+ data['idxsummary']= to_unicode(_('''The {0} Pure Blend contains
{1} packages which
+are grouped by metapackages. Each metapackage will cause the
+ installation of packages for a specific topic. The following table
lists
+ the metapackages of {0}''').format(data['projectname'],
len(data['PackageByName'])))
pkgstatus['official_high']['headline']= to_unicode(_('Official
Debian packages with high relevance'))
# before fiddling around with unicode() read
diff --git a/webtools/templates/tasks_idx.xhtml
b/webtools/templates/tasks_idx.xhtml
index b36693f..89fba67 100644
--- a/webtools/templates/tasks_idx.xhtml
+++ b/webtools/templates/tasks_idx.xhtml
@@ -54,7 +54,7 @@
$projectname $packages
- $tasksintro:
+ $idxsummary:
--
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
[Blends-commit] [SCM] website branch, master, updated. e8d5fb50cb899f0fe3e941b49c66bbe2c4fc0374
The following commit has been merged in the master branch:
commit e8d5fb50cb899f0fe3e941b49c66bbe2c4fc0374
Author: Ole Streicher <deb...@liska.ath.cx>
Date: Mon Nov 23 16:47:16 2015 +0100
Migrate blends tasks list to Debian css
diff --git a/webtools/templates/tasks_idx.xhtml
b/webtools/templates/tasks_idx.xhtml
index 6cf144f..9be4f8d 100644
--- a/webtools/templates/tasks_idx.xhtml
+++ b/webtools/templates/tasks_idx.xhtml
@@ -3,61 +3,91 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;>
http://www.w3.org/1999/xhtml; xml:lang="${lang}" lang="${lang}"
xmlns:py="http://genshi.edgewall.org/;>
-
-$projectname
-
-
-
-
-
-
- ${projectname} Project
-
-
-
-
-
- $projectadvertising
-
-
-
-
- $summary
-
-
- ${idxsummary}
-
-
-
-
- $gtstrTasksPage
- $gtstrThisIsAList
-
-
-${tasks[task].metapkg.PrintedName.capitalize()} -
- ${tasks[task].metapkg.desc[lang]['short']}
- ${tasks[task].metapkg.desc['en']['short']}
-
-
- ${tasks[task].metapkg.desc[lang]['long']}
- ${tasks[task].metapkg.desc['en']['long']}
-
-
-
-
-
-
-
-
-
-${langavail}
-
-
-${language_dict[l]['printed']}
-
-
-${howtosetlang}
- ${updatetimestamp}
-
-
+
+$projectname
+
+http://www.debian.org/debhandheld.css; media="screen"
+ rel="stylesheet" type="text/css" />
+http://www.debian.org/debian.css; rel="stylesheet"
+ type="text/css" />
+http://blends.debian.org/css/blends.css; rel="stylesheet"
+ type="text/css" />
+http://www.debian.org/favicon.ico; />
+
+
+
+
+
+ http://www.debian.org/; title="Debian Home">
+ http://www.debian.org/Pics/openlogo-50.png;
+alt="Debian" width="50" height= "61" />
+
+ Pure Blend
+
+
+
+ $projectname
+
+ Tasks
+ Bugs
+ Thermometer
+ Maintainer Stats
+
+
+
+ http://blends.debian.org;>Debian Pure Blends
+ / $projectname
+ / Packages
+
+
+
+ $projectname Packages
+ The packages of the $projectname Pure Blend are grouped by
+ metapackages. Each metapackage will cause the installation of
+ packages for a specific topic. The following table lists the
+ metapackages of $projectname:
+
+
+
+ MetapackageDescription
+
+
+
+
+
+
+ ${tasks[task].metapkg.PrintedName.capitalize()}
+
+
+
+
+
+ ${tasks[task].metapkg.desc[lang]['short']}
+
+
+ ${tasks[task].metapkg.desc['en']['short']}
+
+
+
+
+
+
+
+
+
+
+ ${langavail}
+
+
+ ${language_dict[l]['printed']}
+
+
+ ${howtosetlang}
+ ${updatetimestamp}
+
+
--
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
[Blends-commit] [SCM] website branch, master, updated. cc029707a2bfe0a69c89fb770d3ef90e250704f9
The following commit has been merged in the master branch:
commit 1b6ccec7d2747f021d40cac2a64b375a909fed17
Author: Ole Streicher <oleb...@debian.org>
Date: Mon Jan 11 17:29:07 2016 +0100
Remove i18n from .py source since genshi may handle this by itself
diff --git a/webtools_py3/bugs.py b/webtools_py3/bugs.py
index 254f499..892640d 100755
--- a/webtools_py3/bugs.py
+++ b/webtools_py3/bugs.py
@@ -325,7 +325,7 @@ the right shows the tasks of %s.""" ) \
data['bugssummary']= Markup(data['bugssummary'])
data['gtstrBugsPage'] = _("Bugs page")
data['gtstrListOfBugspages'] = _("This is a list of metapackages. The
links are leading to the respective bugs page.")
-data['updatetimestamp'] = _('Last update:') + ' ' +
formatdate(time.mktime(t.timetuple()))
+data['timestamp'] = formatdate(time.mktime(t.timetuple()))
data['weightexplanation'] = _("""To estimate the overall status of the
packages in the dependencies of
a metapackage a weighted severity is calculated. Done bugs are ignored
and bugs in dependent and
recommended packages are weighted by factor three compared to suggested
packages. Release critical
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index 3b65707..0cf2553 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -37,9 +37,11 @@ tasks.MarkupPreformatedStringsBlend()
data = tasks.data
# print("data : \n",data)
+data['timestamp']= formatdate(time.mktime(datetime.now().timetuple()))
data['tasks']= tasks.GetTaskDescDict()
data['taskskeys']= tasks.metapackagekeys
data['PackageByName']= tasks.PackageByName
+data['pkgcount'] = len(data['PackageByName'])
try:
data['popconsubmit'] = tasks.popconsubmit
except:
@@ -59,22 +61,20 @@ domain = 'blends-webtools'
gettext.install(domain)
l10nstring = {}
for lang in languages:
- l10nstring[lang] = gettext.translation(domain, locale_dir,
languages=[lang], fallback = True)
+l10nstring[lang] = gettext.translation(domain, locale_dir,
languages=[lang], fallback = True)
# Translated strings regarding the categorising of dependencies need to
# be translated and because I did not found a working solution to get
# gettext working with genshi all are collected here even if the additional
# attributes to blendstasktools.pkgstatus rather should go blendstasktools.py
-
# initialize gensi
loader = TemplateLoader([template_dir], auto_reload=True)
outputdir = CheckOrCreateOutputDir(tasks.data['outputdir'],'tasks_udd')
if outputdir == None:
- exit(-1)
+exit(-1)
-t = datetime.now()
htaccess = os.path.join(outputdir, 'htaccess')
htafp = open(htaccess, 'w')
htafp.write("DirectoryIndex index index.html\nOptions +MultiViews\n")
@@ -88,59 +88,24 @@ for lang in languages:
l10nstring[lang].install()
# _ = l10nstring[lang].ugettext
data['lang'] = lang
-data['license'] = 'License'
-data['version'] = 'Version'
-data['summary'] = 'Summary'
-data['updatetimestamp'] = 'Last update:' + ' ' +
formatdate(time.mktime(t.timetuple()))
-data['nopkgavail']= 'Debian package not available'
# Description of package in specific packges (same for Depends,
Recommends, Suggests)
-data['legend']= "For a better overview of the project's
availability as a Debian package, each head row has a color code according to
this scheme:"
-data['discovery'] = Markup(("""If you discover a project which
looks like a good candidate for {projectname}
- to you, or if you have prepared an unofficial
Debian package, please do not hesitate to
- send a description of that project to the mailto:{projectlist};>{projectname} mailing list""".format(**data)))
-data['bugs'] = 'Bugs'
-data['thermometer']= 'Thermometer'
-data['maintstats'] = 'Maintainer Stats'
-data['contact']= 'Contact'
-data['contribute'] = 'Contribute'
-data['description']= 'Description'
-data['metapackage']= 'Metapackage'
-data['packages'] = 'Packages'
-data['gtstrTasksPage'] = 'Tasks page'
-data['gtstrProject'] = 'Project'
-data['gtstrThisIsAList'] = 'This is a list of the Tasks {projectname} is
made of:'.format(**data)
-data['langavail'] = 'This page is also available in the following
languages:'
-data['howtosetlang'] = 'How to set the default document
language'
-data['howtosetlang'] = Markup((data['howtosetlang'] %
('http://www.debian.org/intro/cn.%s.html' % lang)))
-data['nohomepage'] = 'Homepage not available'
-data['translatedesc'] = 'Translate description'
-data['f
[Blends-commit] [SCM] website branch, master, updated. cc029707a2bfe0a69c89fb770d3ef90e250704f9
The following commit has been merged in the master branch:
commit cc029707a2bfe0a69c89fb770d3ef90e250704f9
Author: Ole Streicher <oleb...@debian.org>
Date: Tue Jan 12 12:22:09 2016 +0100
Remove ramaining I18N variables
diff --git a/webtools_py3/templates/tasks.xhtml
b/webtools_py3/templates/tasks.xhtml
index 3f0e83c..864ee0c 100644
--- a/webtools_py3/templates/tasks.xhtml
+++ b/webtools_py3/templates/tasks.xhtml
@@ -35,10 +35,10 @@
${tasks[task].metapkg.desc[lang]['long']}
- http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${tasks[task].metapkg.pkg};>${fixtranslation}
+ http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${tasks[task].metapkg.pkg};>Fix
translated description
${tasks[task].metapkg.desc['en']['long']}
- http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${tasks[task].metapkg.pkg};>${translatedesc}
+ http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${tasks[task].metapkg.pkg};>Translate
description
--
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
[Blends-commit] [SCM] website branch, master, updated. cc029707a2bfe0a69c89fb770d3ef90e250704f9
The following commit has been merged in the master branch:
commit c6b776c934c5befb2de17d3233959da9272f1954
Author: Ole Streicher <oleb...@debian.org>
Date: Tue Jan 12 08:48:50 2016 +0100
Move hedaline and pdolinkname of tasks sections to blendstasktools
diff --git a/webtools_py3/blendstasktools_udd.py
b/webtools_py3/blendstasktools_udd.py
index e942688..be94d7f 100644
--- a/webtools_py3/blendstasktools_udd.py
+++ b/webtools_py3/blendstasktools_udd.py
@@ -77,6 +77,8 @@ pkgstatus = {'official_high' : # official package with high
priority dependency
'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
@@ -85,6 +87,8 @@ pkgstatus = {'official_high' : # official package with high
priority dependency
'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
@@ -93,6 +97,8 @@ pkgstatus = {'official_high' : # official package with high
priority dependency
'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
@@ -101,6 +107,8 @@ pkgstatus = {'official_high' : # official package with high
priority dependency
'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
@@ -109,6 +117,8 @@ pkgstatus = {'official_high' : # official package with high
priority dependency
'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
@@ -117,6 +127,8 @@ pkgstatus = {'official_high' : # official package with high
priority dependency
'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
@@ -125,6 +137,8 @@ pkgstatus = {'official_high' : # official package with high
pr
[Blends-commit] [SCM] website branch, master, updated. cc029707a2bfe0a69c89fb770d3ef90e250704f9
The following commit has been merged in the master branch:
commit da796ebbe94a252c75e66dc500aa9c59a090d131
Author: Ole Streicher <oleb...@debian.org>
Date: Tue Jan 12 08:47:13 2016 +0100
found another hsa_key()
diff --git a/webtools_py3/templates/debian-astro_idx.xhtml
b/webtools_py3/templates/debian-astro_idx.xhtml
index 948933b..dcac997 100644
--- a/webtools_py3/templates/debian-astro_idx.xhtml
+++ b/webtools_py3/templates/debian-astro_idx.xhtml
@@ -59,7 +59,7 @@
${PackageByName[pkg_name].pkg.capitalize()}:
- ${PackageByName[pkg_name].desc[lang]['short']}
+ ${PackageByName[pkg_name].desc[lang]['short']}
${PackageByName[pkg_name].desc['en']['short']}
--
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
[Blends-commit] [SCM] website branch, master, updated. 0159025a14235ccba78b1d2adea5c75c4ab1d85e
The following commit has been merged in the master branch:
commit 0159025a14235ccba78b1d2adea5c75c4ab1d85e
Author: Ole Streicher <oleb...@debian.org>
Date: Mon Jun 20 17:26:28 2016 +0200
Fix forgotten http --> https
diff --git a/webtools/check-all-tasks b/webtools/check-all-tasks
index 1778008..97bdf3d 100755
--- a/webtools/check-all-tasks
+++ b/webtools/check-all-tasks
@@ -35,7 +35,7 @@ for bc in `ls webconf/*.conf | grep -v -e "webconf/fun\." -e
rest-test` ; do
vcsurl=`grep "^VcsDir:" ${bc} | sed 's/^VcsDir:\s*//'`
vcstype=`echo ${vcsurl} | sed 's/^\([a-z]\{3\}\):.*/\1/'`
if [ "$vcstype" != "git" -a "$vcstype" != "svn" ] ; then
-if echo ${vcsurl} | grep -q '^http://github' ; then
+if echo ${vcsurl} | grep -q '^https://github' ; then
vcstype=git
else
vcstype=unknown
--
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
[Blends-commit] [SCM] website branch, master, updated. 0373c238987b76c1b7a6dc591cf250d7cfed5f88
The following commit has been merged in the master branch:
commit 0373c238987b76c1b7a6dc591cf250d7cfed5f88
Author: Ole Streicher <o...@aip.de>
Date: Mon Jun 20 10:14:34 2016 +0200
Consequently use https:// urls in webtools
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index a77ad88..37a292a 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -47,8 +47,8 @@ PORT = UDDPORT
DEFAULTPORT = 5432
# Seems to have problems on 17.04.2009
-# BASEURL = 'http://ftp.debian.org/debian'
-BASEURL = 'http://ftp.de.debian.org/debian'
+# BASEURL = 'https://ftp.debian.org/debian'
+BASEURL = 'https://ftp.de.debian.org/debian'
KEYSTOIGNORE = ('Architecture', 'Comment', 'Leaf', 'NeedConfig', 'Note',
'Section',
'Needconfig', 'DontAvoid',
'Enhances', 'Test-always-lang', 'Metapackage')
@@ -65,7 +65,7 @@ HOMEPAGENONEFIELDS = (
# package matches or URL to inofficial package
)
-PKGURLMASK =
'http://packages.debian.org/search?keywords=%s=names=1=all=all'
+PKGURLMASK =
'https://packages.debian.org/search?keywords=%s=names=1=all=all'
DEPENDENT = 0
SUGGESTED = 1
@@ -670,11 +670,11 @@ def BrowserFromVcsURL(vcs_type, vcs_url):
if not vcs_type:
return HOMEPAGENONE
if vcs_type.lower().startswith('svn'):
-ret_url = re.sub('^svn:', 'http:', vcs_url)
+ret_url = re.sub('^svn:', 'https:', vcs_url)
ret_url = re.sub('/svn/', '/wsvn/', ret_url)
ret_url = re.sub('$', '?rev=0=0', ret_url)
elif vcs_type.lower().startswith('git'):
-ret_url = re.sub('^git:', 'http:', vcs_url)
+ret_url = re.sub('^git:', 'https:', vcs_url)
ret_url = re.sub('/git/', '/?p=', ret_url)
elif vcs_type.lower().startswith('hg'):
# Seems that vcs_browser = vcs_url in Mercurial
@@ -1517,7 +1517,7 @@ class TaskDependencies:
dep.properties['component'] = row['component']
dep.properties['version'].append({'archs':'all',
'release':'NEW',
'version':row['version']})
-dep.properties['pkg-url'] =
'http://ftp-master.debian.org/new/%s_%s.html' % (row['source'], row['version'])
+dep.properties['pkg-url'] =
'https://ftp-master.debian.org/new/%s_%s.html' % (row['source'], row['version'])
# Warn about remaining information of prospective package
if (dep.properties['desc']['en'] and
dep.properties['desc']['en']['short']) or dep.properties['homepage'] !=
HOMEPAGENONE:
logger.info("The package %s is not yet in Debian but it is
just in the new queue. (Task %s)" % (dep.properties['name'], self.task))
diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index 8016076..392332d 100644
--- a/webtools/blendstasktools_udd.py
+++ b/webtools/blendstasktools_udd.py
@@ -43,8 +43,8 @@ PORT = UDDPORT
DEFAULTPORT = 5432
# Seems to have problems on 17.04.2009
-# BASEURL = 'http://ftp.debian.org/debian'
-BASEURL = 'http://ftp.de.debian.org/debian'
+# BASEURL = 'https://ftp.debian.org/debian'
+BASEURL = 'https://ftp.de.debian.org/debian'
KEYSTOIGNORE = ('Architecture', 'Comment', 'Leaf', 'NeedConfig', 'Note',
'Section',
'Needconfig', 'DontAvoid',
'Enhances', 'Test-always-lang', 'Metapackage')
@@ -61,7 +61,7 @@ HOMEPAGENONEFIELDS = (
# package matches or URL to inofficial package
)
-PKGURLMASK =
'http://packages.debian.org/search?keywords=%s=names=1=all=all'
+PKGURLMASK =
'https://packages.debian.org/search?keywords=%s=names=1=all=all'
DEPENDENT = 0
SUGGESTED = 1
@@ -611,11 +611,11 @@ def BrowserFromVcsURL(vcs_type, vcs_url):
if not vcs_type:
return HOMEPAGENONE
if vcs_type.lower().startswith('svn'):
-ret_url = re.sub('^svn:', 'http:', vcs_url)
+ret_url = re.sub('^svn:', 'https:', vcs_url)
ret_url = re.sub('/svn/', '/wsvn/', ret_url)
ret_url = re.sub('$', '?rev=0=0', ret_url)
elif vcs_type.lower().startswith('git'):
-ret_url = re.sub('^git:', 'http:', vcs_url)
+ret_url = re.sub('^git:', 'https:', vcs_url)
ret_url = re.sub('/git/', '/?p=', ret_url)
elif vcs_type.lower().startswith('hg'):
# Seems that vcs_browser = vcs_url in Mercurial
diff --git a/webtools/bugs.py b/webtools/bugs.py
index 4f885c2..c2d6874 100755
--- a/webtools/bugs.py
+++ b/webtools/bugs.py
@@ -304,7 +304,7 @@ def main():
data['idxsummary']= _("""A %sDebian Pure Blend%s is a Debian
internal project which assembles
a set of packages that might help users to solve certain tasks of their work.
The list on
the right shows the tasks of %s.""") \
-% ('http://blends.alioth.debian.org/blends/;>', '',
data['projectname'])
+% ('https://blends.alioth.debian.org/blends/;&g
[Blends-commit] [SCM] website branch, master, updated. 62b4b5d8b2d72459d39faf2a7c535e06ba4b8f6f
The following commit has been merged in the master branch:
commit 22ce84b2dafa4fd1165dfc1daf3b2f36a0ec3d0f
Author: Ole Streicher <oleb...@debian.org>
Date: Mon Jan 11 09:32:43 2016 +0100
Dont create temporary output file; do the %26->& replacement in-memory
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index 772347d..8b36e09 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -245,27 +245,20 @@ for lang in languages:
template = loader.load('packages.xhtml')
else:
template = loader.load('tasks.xhtml')
-with open(outputfile+'_tmp', "w") as f:
+with open(outputfile, "w") as f:
try:
-f.write(template.generate(**data).render('xhtml'))
+# We had to mask ampersand ('&') from Genshi but even if the browser shows
+# the correct character packages.debian.org gets confused - so turn it back
here
+for line in
template.generate(**data).render('xhtml').splitlines():
+if detect_ampersand_code_re.search(line):
+line = re.sub('%26', '&', line)
+f.write(line + '\n')
except UnicodeDecodeError as errtxt:
print("Some critical encoding problem occured when trying to
render task %s for lang %s.\n%s" \
% (task, lang, errtxt), file=stderr)
except UndefinedError as errtxt:
print("UndefinedError while rendering task %s for lang
%s.\n%s" \
% (task, lang, errtxt), file=stderr)
-SetFilePermissions(outputfile+'_tmp')
-# Really rude hack to get back '<' / '>' signs which actually shoul be
-# in the output
-with open(outputfile+'_tmp', "r") as tmp:
-with open(outputfile, "w") as f:
-for line in tmp.readlines():
-# We had to mask ampersand ('&') from Genshi but even if the browser shows
-# the correct character packages.debian.org gets confused - so turn it back
here
-if detect_ampersand_code_re.search(line):
-line = re.sub('%26', '&', line)
-f.write(line)
-os.unlink(outputfile+'_tmp')
SetFilePermissions(outputfile)
template = loader.load('packagelist.xhtml')
--
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
[Blends-commit] [SCM] website branch, master, updated. 62b4b5d8b2d72459d39faf2a7c535e06ba4b8f6f
The following commit has been merged in the master branch:
commit 5fa8bf13933a7f57dc39757f52ae9a38ff78d075
Author: Ole Streicher <oleb...@debian.org>
Date: Mon Jan 11 09:04:38 2016 +0100
Replace print(.., file=f) with f.write() and most open/close sequences with
'with'
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index 8181029..a0305e2 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -80,14 +80,14 @@ try:
except: # simply continue if file does not exist
pass
htafp = open(htaccess, 'w')
-print("DirectoryIndex index index.html\nOptions +MultiViews", file=htafp)
+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:
-print("AddLanguage %s .%s" % (language_dict[lang]['htaccess'], lang),
file=htafp)
+htafp.write("AddLanguage %s .%s\n" % (language_dict[lang]['htaccess'],
lang))
l10nstring[lang].install()
# _ = l10nstring[lang].ugettext
data['lang'] = lang
@@ -183,14 +183,12 @@ for lang in languages:
os.unlink(outputfile)
except: # simply continue if file does not exist
pass
-f = open(outputfile, 'w')
-try:
- print(template.generate(**data).render('xhtml'), file=f)
-except UnicodeDecodeError as errtxt:
+with open(outputfile, 'w') as f:
+try:
+ f.write(template.generate(**data).render('xhtml'))
+except UnicodeDecodeError as errtxt:
print("Some critical encoding problem occured when trying to render
index for lang %s.\n%s" \
- % (lang, errtxt), file=stderr)
-
-f.close()
+ % (lang, errtxt), file=stderr)
SetFilePermissions(outputfile)
try:
template = loader.load('%s_idx.xhtml' % tasks.blendname)
@@ -201,14 +199,13 @@ for lang in languages:
os.unlink(outputfile)
except: # simply continue if file does not exist
pass
-f = open(outputfile, 'w')
-try:
-print(template.generate(**data).render('xhtml'), file=f)
-except UnicodeDecodeError as errtxt:
-print("Some critical encoding problem occured when trying to
render index for lang %s.\n%s"
- % (lang, errtxt), file = stderr)
+with open(outputfile, 'w') as f:
+try:
+f.write(template.generate(**data).render('xhtml'))
+except UnicodeDecodeError as errtxt:
+print("Some critical encoding problem occured when trying to
render index for lang %s.\n%s"
+ % (lang, errtxt), file = stderr)
-f.close()
SetFilePermissions(outputfile)
except:
pass
@@ -264,37 +261,35 @@ for lang in languages:
template = loader.load('packages.xhtml')
else:
template = loader.load('tasks.xhtml')
-f = open(outputfile+'_tmp', "w")
-try:
-print(template.generate(**data).render('xhtml'), file=f)
-except UnicodeEncodeError as errtxt:
-print("Some critical encoding problem occured when trying to
render task %s for lang %s.\n%s" \
- % (task, lang, errtxt))
-except UnicodeDecodeError as errtxt:
-print("Some critical encoding problem occured when trying to
render task %s for lang %s.\n%s" \
-% (task, lang, errtxt), file=stderr)
-except UndefinedError as errtxt:
-print("UndefinedError while rendering task %s for lang %s.\n%s" \
-% (task, lang, errtxt), file=stderr)
-f.close()
+with open(outputfile+'_tmp', "w") as f:
+try:
+f.write(template.generate(**data).render('xhtml'))
+except UnicodeDecodeError as errtxt:
+print("Some critical encoding problem occured when trying to
render task %s for lang %s.\n%s" \
+ % (task, lang, errtxt), file=stderr)
+except UndefinedError as errtxt:
+print("UndefinedError while rendering task %s for lang
%s.\n%s" \
+ % (task, lang, errtxt), file=stderr)
SetFilePermissions(outputfile+'_tmp')
# Really rude hack to get back '<' / '>' signs which actually shoul be
# in the output
-tmp = open(outputfile+'_tmp', "r")
-f = open(outputfile, "w")
-for line in tmp.readlines():
-# We had to mask ampersand ('&') from Genshi but even if the
browser shows
-# the correct
[Blends-commit] [SCM] website branch, master, updated. 62b4b5d8b2d72459d39faf2a7c535e06ba4b8f6f
The following commit has been merged in the master branch:
commit 3f361d50736068d83d091bd785bac5b74e75517b
Author: Ole Streicher <oleb...@debian.org>
Date: Mon Jan 11 09:06:19 2016 +0100
Remove unlink() calls: existing files are automatically truncated when
open('w')ed
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index a0305e2..772347d 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -75,10 +75,6 @@ if outputdir == None:
t = datetime.now()
htaccess = outputdir + '/.htaccess'
-try:
- os.unlink(htaccess)
-except: # simply continue if file does not exist
- pass
htafp = open(htaccess, 'w')
htafp.write("DirectoryIndex index index.html\nOptions +MultiViews\n")
@@ -179,10 +175,6 @@ for lang in languages:
outputfile = outputdir + '/index'
if lang != 'xyz': # let 'en' be a language as any other and add suffix to
file name
outputfile += '.' + language_dict[lang]['short'] + '.html'
-try:
-os.unlink(outputfile)
-except: # simply continue if file does not exist
- pass
with open(outputfile, 'w') as f:
try:
f.write(template.generate(**data).render('xhtml'))
@@ -195,10 +187,6 @@ for lang in languages:
outputfile = tasks.data['outputdir'] + '/index'
if lang != 'xyz': # let 'en' be a language as any other and add suffix
to file name
outputfile += '.' + language_dict[lang]['short'] + '.html'
-try:
-os.unlink(outputfile)
-except: # simply continue if file does not exist
-pass
with open(outputfile, 'w') as f:
try:
f.write(template.generate(**data).render('xhtml'))
@@ -252,10 +240,6 @@ for lang in languages:
outputfile = outputdir + '/' + task
if lang != 'xyz': # let 'en' be a language as any other and add suffix
to file name
outputfile += '.' + language_dict[lang]['short'] + '.html'
-try:
-os.unlink(outputfile)
-except: # simply continue if file does not exist
-pass
if data['projectname'] == 'Debian Astro':
template = loader.load('packages.xhtml')
@@ -293,10 +277,6 @@ for lang in languages:
outputfile = outputdir + '/packagelist'
if lang != 'xyz': # let 'en' be a language as any other and add suffix to
file name
outputfile += '.' + lang + '.html'
-try:
-os.unlink(outputfile)
-except: # simply continue if file does not exist
-pass
with open(outputfile, 'w') as f:
try:
f.write(template.generate(**data).render('xhtml'))
--
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
[Blends-commit] [SCM] website branch, master, updated. 62b4b5d8b2d72459d39faf2a7c535e06ba4b8f6f
The following commit has been merged in the master branch: commit ee4f5e45ca5f13f4518ab5ad02e08bd387756b34 Author: Ole Streicher <oleb...@debian.org> Date: Mon Jan 11 09:49:57 2016 +0100 use /usr/bin/env in bangpath to follow standard conventions diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py index 8b36e09..052a441 100755 --- a/webtools_py3/tasks_udd.py +++ b/webtools_py3/tasks_udd.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import apt import apt_pkg -- 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
[Blends-commit] [SCM] website branch, master, updated. 62b4b5d8b2d72459d39faf2a7c535e06ba4b8f6f
The following commit has been merged in the master branch:
commit 2c2deb801ed584d0ebeaa449854eeb11c324fbe5
Author: Ole Streicher <oleb...@debian.org>
Date: Mon Jan 11 09:50:30 2016 +0100
Use os.path.join() instead of concatenating strings
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index 052a441..8362aad 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -74,7 +74,7 @@ if outputdir == None:
exit(-1)
t = datetime.now()
-htaccess = outputdir + '/.htaccess'
+htaccess = os.path.join(outputdir, 'htaccess')
htafp = open(htaccess, 'w')
htafp.write("DirectoryIndex index index.html\nOptions +MultiViews\n")
@@ -172,9 +172,7 @@ for lang in languages:
template = loader.load('tasks_idx.xhtml')
-outputfile = outputdir + '/index'
-if lang != 'xyz': # let 'en' be a language as any other and add suffix to
file name
-outputfile += '.' + language_dict[lang]['short'] + '.html'
+outputfile = os.path.join(outputdir, 'index.{0}.html'.format(lang))
with open(outputfile, 'w') as f:
try:
f.write(template.generate(**data).render('xhtml'))
@@ -184,9 +182,8 @@ for lang in languages:
SetFilePermissions(outputfile)
try:
template = loader.load('%s_idx.xhtml' % tasks.blendname)
-outputfile = tasks.data['outputdir'] + '/index'
-if lang != 'xyz': # let 'en' be a language as any other and add suffix
to file name
-outputfile += '.' + language_dict[lang]['short'] + '.html'
+outputfile = os.path.join(tasks.data['outputdir'],
+ 'index.{0}.html'.format(lang))
with open(outputfile, 'w') as f:
try:
f.write(template.generate(**data).render('xhtml'))
@@ -237,9 +234,8 @@ for lang in languages:
data['othertasks'] = ("Links to other tasks")
data['indexlink'] = ("Index of all tasks")
-outputfile = outputdir + '/' + task
-if lang != 'xyz': # let 'en' be a language as any other and add suffix
to file name
-outputfile += '.' + language_dict[lang]['short'] + '.html'
+outputfile = os.path.join(outputdir,
+ '{0}.{1}.html'.format(task, lang))
if data['projectname'] == 'Debian Astro':
template = loader.load('packages.xhtml')
@@ -267,9 +263,8 @@ for lang in languages:
for task in data['taskskeys']:
data['projectsintasks'] = tasks.tasks[task].dependencies
-outputfile = outputdir + '/packagelist'
-if lang != 'xyz': # let 'en' be a language as any other and add suffix to
file name
-outputfile += '.' + lang + '.html'
+outputfile = os.path.join(outputdir,
+ 'packagelist.{0}.html'.format(lang))
with open(outputfile, 'w') as f:
try:
f.write(template.generate(**data).render('xhtml'))
--
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
[Blends-commit] [SCM] website branch, master, updated. 62b4b5d8b2d72459d39faf2a7c535e06ba4b8f6f
The following commit has been merged in the master branch:
commit 62b4b5d8b2d72459d39faf2a7c535e06ba4b8f6f
Author: Ole Streicher <oleb...@debian.org>
Date: Mon Jan 11 13:19:23 2016 +0100
Fix some formatting errors
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index 85f3f90..3b65707 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -176,9 +176,9 @@ for lang in languages:
outputfile = os.path.join(outputdir, 'index.{0}.html'.format(lang))
with open(outputfile, 'w') as f:
try:
- f.write(template.generate(**data).render('xhtml'))
+f.write(template.generate(**data).render('xhtml'))
except UnicodeDecodeError as err:
- stderr.write("Some critical encoding problem occured when trying"
+stderr.write("Some critical encoding problem occured when trying"
+ " to render index for lang {0}.\n{1}\n"
.format(lang, str(err)))
SetFilePermissions(outputfile)
@@ -235,12 +235,12 @@ for lang in languages:
data['othertasks'] = ("Links to other tasks")
data['indexlink'] = ("Index of all tasks")
-outputfile = os.path.join(outputdir, '{0}.{1}.html'.format(task, lang))
-
if data['projectname'] == 'Debian Astro':
template = loader.load('packages.xhtml')
else:
template = loader.load('tasks.xhtml')
+
+outputfile = os.path.join(outputdir, '{0}.{1}.html'.format(task, lang))
with open(outputfile, "w") as f:
try:
# We had to mask ampersand ('&') from Genshi but even if the browser shows
@@ -252,7 +252,7 @@ for lang in languages:
except UnicodeDecodeError as err:
stderr.write("Some critical encoding problem occured when
trying"
+ " to render task {0} for lang {1}.\n{2}\n"
-.format(task, lang, str(err))
+.format(task, lang, str(err)))
except UndefinedError as err:
stderr.write("UndefinedError while rendering"
+ " task {0} for lang {1}.\n{2}\n"
@@ -265,15 +265,14 @@ for lang in languages:
for task in data['taskskeys']:
data['projectsintasks'] = tasks.tasks[task].dependencies
-outputfile = os.path.join(outputdir,
- 'packagelist.{0}.html'.format(lang))
+outputfile = os.path.join(outputdir, 'packagelist.{0}.html'.format(lang))
with open(outputfile, 'w') as f:
try:
f.write(template.generate(**data).render('xhtml'))
except UnicodeDecodeError as err:
stderr.write("Some critical encoding problem occured when trying"
+ " to render long package list for lang {0}.\n{1}\n"
-.format((lang, str(err)))
+.format((lang, str(err
except UndefinedError as err:
stderr.write("UndefinedError while trying to render"
+ " long package list for lang {0}.\n{1}\n"
--
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
[Blends-commit] [SCM] website branch, master, updated. 62b4b5d8b2d72459d39faf2a7c535e06ba4b8f6f
The following commit has been merged in the master branch:
commit 24046d2dcb41f85f7e61a68c9f6aee830a4fafff
Author: Ole Streicher <oleb...@debian.org>
Date: Mon Jan 11 10:07:41 2016 +0100
Remove unused local variable found_status
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index 8362aad..da188ba 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -213,22 +213,20 @@ for lang in languages:
for task in data['taskskeys']:
data['task'] = task
-# Keep the Dependency lists per task to be able to loop over all tasks
in plain package list
+# Keep the Dependency lists per task to be able to loop over
+# all tasks in plain package list
data['dependencies'][task] = []
-found_status = {}
for status in use_dependencystatus:
if len(tasks.tasks[task].dependencies[status]) > 0:
-if status == 'unknown':
-# Just print an error message if there are packages with
unknown status
-if lang == 'en':
-# ... but only once and not per language
-for dep in tasks.tasks[task].dependencies[status]:
-print("Warning: Dependency with unknown status:",
dep.pkg, file=stderr)
-else:
+if status != 'unknown':
data['dependencies'][task].append(status)
-if status in data['dependencies'][task]:
-if status not in found_status:
-found_status[status] = 1
+elif lang == 'en':
+# Just print an error message if there are packages with
+# unknown status but only once and not per language
+for dep in tasks.tasks[task].dependencies[status]:
+print("Warning: Dependency with unknown status:",
+ dep.pkg, file=stderr)
+
# Keep the Project lists per task to be able to loop over all tasks in
plain package list
data['projects'][task] = tasks.tasks[task].dependencies
data['othertasks'] = ("Links to other tasks")
--
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
[Blends-commit] [SCM] website branch, master, updated. 62b4b5d8b2d72459d39faf2a7c535e06ba4b8f6f
The following commit has been merged in the master branch:
commit c9145c4c444f6adec6a06192513e4c8b72f41cf9
Author: Ole Streicher <oleb...@debian.org>
Date: Mon Jan 11 10:34:58 2016 +0100
print(...,file=stderr) --> stderr.write()
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index da188ba..85f3f90 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -22,8 +22,9 @@ from blendsunicode import to_unicode
from blendslanguages import languages, language_dict
if len(argv) <= 1:
-print("Usage: %s \n The needs a matching
config file webconf/.conf"\
-% argv[0], file=stderr)
+stderr.write('Usage: {0} \n'.format(argv[0])
+ + 'The needs a matching config file '
+ + 'webconf/.conf')
exit(-1)
# LockBlendsTools() # logger handler not defined at this moment, needs
rethinking ... FIXME
@@ -83,7 +84,7 @@ detect_ampersand_code_re =
re.compile("href=\"http://\w+\.debian\.org/.+\?\w+=;
use_dependencystatus = GetDependencies2Use()
for lang in languages:
-htafp.write("AddLanguage %s .%s\n" % (language_dict[lang]['htaccess'],
lang))
+htafp.write("AddLanguage {0}
.{1}\n".format(language_dict[lang]['htaccess'], lang))
l10nstring[lang].install()
# _ = l10nstring[lang].ugettext
data['lang'] = lang
@@ -176,9 +177,10 @@ for lang in languages:
with open(outputfile, 'w') as f:
try:
f.write(template.generate(**data).render('xhtml'))
-except UnicodeDecodeError as errtxt:
- print("Some critical encoding problem occured when trying to render
index for lang %s.\n%s" \
- % (lang, errtxt), file=stderr)
+except UnicodeDecodeError as err:
+ stderr.write("Some critical encoding problem occured when trying"
+ + " to render index for lang {0}.\n{1}\n"
+ .format(lang, str(err)))
SetFilePermissions(outputfile)
try:
template = loader.load('%s_idx.xhtml' % tasks.blendname)
@@ -187,9 +189,10 @@ for lang in languages:
with open(outputfile, 'w') as f:
try:
f.write(template.generate(**data).render('xhtml'))
-except UnicodeDecodeError as errtxt:
-print("Some critical encoding problem occured when trying to
render index for lang %s.\n%s"
- % (lang, errtxt), file = stderr)
+except UnicodeDecodeError as err:
+stderr.write("Some critical encoding problem occured when
trying"
+ + " to render index for lang {0}.\n{1}\n"
+ .format(lang, str(err)))
SetFilePermissions(outputfile)
except:
@@ -224,16 +227,15 @@ for lang in languages:
# Just print an error message if there are packages with
# unknown status but only once and not per language
for dep in tasks.tasks[task].dependencies[status]:
-print("Warning: Dependency with unknown status:",
- dep.pkg, file=stderr)
+stderr.write("Warning: Dependency with unknown status:
"
+ + dep.pkg)
# Keep the Project lists per task to be able to loop over all tasks in
plain package list
data['projects'][task] = tasks.tasks[task].dependencies
data['othertasks'] = ("Links to other tasks")
data['indexlink'] = ("Index of all tasks")
-outputfile = os.path.join(outputdir,
- '{0}.{1}.html'.format(task, lang))
+outputfile = os.path.join(outputdir, '{0}.{1}.html'.format(task, lang))
if data['projectname'] == 'Debian Astro':
template = loader.load('packages.xhtml')
@@ -247,12 +249,14 @@ for lang in languages:
if detect_ampersand_code_re.search(line):
line = re.sub('%26', '&', line)
f.write(line + '\n')
-except UnicodeDecodeError as errtxt:
-print("Some critical encoding problem occured when trying to
render task %s for lang %s.\n%s" \
- % (task, lang, errtxt), file=stderr)
-except UndefinedError as errtxt:
-print("UndefinedError while rendering task %s for lang
%s.\n%s" \
- % (task, lang, errtxt), file=stderr)
+except UnicodeDecodeError as err:
+stderr.write("Some critical encoding problem occured when
trying"
+ + " to render task {0} for lang {1}.\n{2}\n"
+.format(task, lang, str(err))
+exc
[Blends-commit] [SCM] website branch, master, updated. 2f4067e3c0364ef7ec4a3bae5848e1ac3d260951
The following commit has been merged in the master branch:
commit 2f4067e3c0364ef7ec4a3bae5848e1ac3d260951
Author: Ole Streicher <oleb...@debian.org>
Date: Sun Jan 10 10:42:18 2016 +0100
Integrate Py2 changes inspired by debian-astro branch
* new index tasks_idx.xhtml
* new tasks.xhtml replacement packages.xhtml (used by debian-astro only so
far)
* Debian-Astro homepage debian-astro_idx.xhtml with teaser packages
This all is still untested.
diff --git a/webtools_py3/blendstasktools_udd.py
b/webtools_py3/blendstasktools_udd.py
index cadccd2..e942688 100644
--- a/webtools_py3/blendstasktools_udd.py
+++ b/webtools_py3/blendstasktools_udd.py
@@ -997,6 +997,17 @@ class Tasks:
break
logger.debug(" %s -> %s" % (enh,
dep.properties['Enhances'][enh]))
+@property
+def PackageByName(self):
+try:
+return self._packageByName
+except AttributeError:
+deps = []
+for task in self.tasks.values():
+for d in task.dependencies.values():
+deps += d
+self._packageByName = dict((dep.pkg, dep) for dep in deps)
+return self._packageByName
class TaskDependencies:
# List of depencencies defined in one metapackage
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index e376c7f..0f180a0 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -38,6 +38,7 @@ data = tasks.data
# print("data : \n",data)
data['tasks']= tasks.GetTaskDescDict()
data['taskskeys']= tasks.metapackagekeys
+data['PackageByName']= tasks.PackageByName
try:
data['popconsubmit'] = tasks.popconsubmit
except:
@@ -101,7 +102,14 @@ for lang in languages:
to you, or if you have prepared an unofficial
Debian package, please do not hesitate to
send a description of that project to the mailto:%s;>%s mailing list""") % \
(data['projectname'], data['projectlist'],
data['projectname']))
-data['description'] = ("The list to the right includes various
software projects which are of some interest to the %s Project. Currently, only
a few of them are available as Debian packages. It is our goal, however, to
include all software in %s which can sensibly add to a high quality Debian Pure
Blend.") % (data['projectname'], data['projectname'])
+data['bugs'] = 'Bugs'
+data['thermometer']= 'Thermometer'
+data['maintstats'] = 'Maintainer Stats'
+data['contact']= 'Contact'
+data['contribute'] = 'Contribute'
+data['description']= 'Description'
+data['metapackage']= 'Metapackage'
+data['packages'] = 'Packages'
data['gtstrTasksPage'] = 'Tasks page'
data['gtstrProject'] = 'Project'
data['gtstrThisIsAList'] = 'This is a list of the Tasks %s is made of:'
% data['projectname']
@@ -130,7 +138,10 @@ for lang in languages:
a set of packages that might help users to solve certain tasks of their work.
The list on
the right shows the tasks of %s.""" ) \
% ('http://blends.alioth.debian.org/blends/;>', '', data['projectname'])
-data['idxsummary']= Markup((data['idxsummary']))
+data['idxsummary']= '''The {0} Pure Blend contains {1} packages
which
+are grouped by metapackages. Each metapackage will cause the
+installation of packages for a specific topic. The following table lists
+the metapackages of {0}'''.format(data['projectname'],
len(data['PackageByName']))
pkgstatus['official_high']['headline']= 'Official Debian packages with
high relevance'
# before fiddling around with unicode() read
@@ -186,6 +197,26 @@ the right shows the tasks of %s.""" ) \
f.close()
SetFilePermissions(outputfile)
+try:
+template = loader.load('%s_idx.xhtml' % tasks.blendname)
+outputfile = tasks.data['outputdir'] + '/index'
+if lang != 'xyz': # let 'en' be a language as any other and add suffix
to file name
+outputfile += '.' + language_dict[lang]['short'] + '.html'
+try:
+os.unlink(outputfile)
+except: # simply continue if file does not exist
+pass
+f = open(outputfile, 'w')
+try:
+print(template.generate(**data).render('xhtml'), file=f)
+except UnicodeDecodeError as errtxt:
+print("Some critical encoding problem occured when trying to
render index for lang %s.\n%s"
+ % (lang, errtxt), file = stderr)
+
+f.close()
+SetFilePermissions(outputfile)
+except:
+pass
data['dep
[Blends-commit] [SCM] website branch, master, updated. 5ad10b956b2239cbf6f7375a49c90ac8dd3108c4
The following commit has been merged in the master branch:
commit 5ad10b956b2239cbf6f7375a49c90ac8dd3108c4
Author: Ole Streicher <oleb...@debian.org>
Date: Sun Jan 10 20:46:52 2016 +0100
Leftover dict.has_key(x) --> x in dict
diff --git a/webtools_py3/templates/tasks_idx.xhtml
b/webtools_py3/templates/tasks_idx.xhtml
index 5f85b54..5c63e98 100644
--- a/webtools_py3/templates/tasks_idx.xhtml
+++ b/webtools_py3/templates/tasks_idx.xhtml
@@ -81,7 +81,7 @@ table {
-
+
${tasks[task].metapkg.desc[lang]['short']}
--
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
[Blends-commit] [SCM] website branch, master, updated. 5ad10b956b2239cbf6f7375a49c90ac8dd3108c4
The following commit has been merged in the master branch:
commit 87bf4911fa5e883842d394dce8a5a19af69d761c
Author: Ole Streicher <oleb...@debian.org>
Date: Sun Jan 10 20:46:12 2016 +0100
Correct argument(s) of str.format()
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index 0f180a0..8181029 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -98,10 +98,9 @@ for lang in languages:
data['nopkgavail']= 'Debian package not available'
# Description of package in specific packges (same for Depends,
Recommends, Suggests)
data['legend']= "For a better overview of the project's
availability as a Debian package, each head row has a color code according to
this scheme:"
-data['discovery'] = Markup(("""If you discover a project which
looks like a good candidate for %s
+data['discovery'] = Markup(("""If you discover a project which
looks like a good candidate for {projectname}
to you, or if you have prepared an unofficial
Debian package, please do not hesitate to
- send a description of that project to the mailto:%s;>%s mailing list""") % \
- (data['projectname'], data['projectlist'],
data['projectname']))
+ send a description of that project to the mailto:{projectlist};>{projectname} mailing list""".format(**data)))
data['bugs'] = 'Bugs'
data['thermometer']= 'Thermometer'
data['maintstats'] = 'Maintainer Stats'
@@ -112,7 +111,7 @@ for lang in languages:
data['packages'] = 'Packages'
data['gtstrTasksPage'] = 'Tasks page'
data['gtstrProject'] = 'Project'
-data['gtstrThisIsAList'] = 'This is a list of the Tasks %s is made of:'
% data['projectname']
+data['gtstrThisIsAList'] = 'This is a list of the Tasks {projectname} is
made of:'.format(**data)
data['langavail'] = 'This page is also available in the following
languages:'
data['howtosetlang'] = 'How to set the default document
language'
data['howtosetlang'] = Markup((data['howtosetlang'] %
('http://www.debian.org/intro/cn.%s.html' % lang)))
@@ -134,14 +133,10 @@ for lang in languages:
data['projectadvertising'] = None
data['packages'] = 'Packages'
-data['idxsummary']= ("""A %sDebian Pure Blend%s is a Debian
internal project which assembles
-a set of packages that might help users to solve certain tasks of their work.
The list on
-the right shows the tasks of %s.""" ) \
- % ('http://blends.alioth.debian.org/blends/;>', '', data['projectname'])
-data['idxsummary']= '''The {0} Pure Blend contains {1} packages
which
+data['idxsummary']= '''The {projectname} Pure Blend contains
{count} packages which
are grouped by metapackages. Each metapackage will cause the
installation of packages for a specific topic. The following table lists
-the metapackages of {0}'''.format(data['projectname'],
len(data['PackageByName']))
+the metapackages of
{projectname}'''.format(count=len(data['PackageByName']), **data)
pkgstatus['official_high']['headline']= 'Official Debian packages with
high relevance'
# before fiddling around with unicode() read
--
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
[Blends-commit] [SCM] website branch, master, updated. 38c118dd7d0c6796e66f3503486c6236a338b396
The following commit has been merged in the master branch: commit 38c118dd7d0c6796e66f3503486c6236a338b396 Author: Ole Streicher <o...@aip.de> Date: Thu Jan 14 09:30:27 2016 +0100 Include debian-astro in Blends index diff --git a/www-src/index.html b/www-src/index.html index 335fdb0..115f0c8 100644 --- a/www-src/index.html +++ b/www-src/index.html @@ -33,6 +33,11 @@ href="http://alioth.debian.org/projects/blends/;>project page on Alioth. Index + Debian Astro + packages for Astronomy and Astrophysics + Index + + DebiChem packages to support chemists in their daily work Index diff --git a/www/index.html b/www/index.html index 9589d15..ccb48d7 100644 --- a/www/index.html +++ b/www/index.html @@ -68,6 +68,11 @@ href="http://alioth.debian.org/projects/blends/;>project page on Alioth. Index + Debian Astro + packages for Astronomy and Astrophysics + Index + + DebiChem packages to support chemists in their daily work Index -- 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
[Blends-commit] [SCM] website branch, master, updated. 0d0f9620da72d166b877ab9b3e2832c79b6f3b19
The following commit has been merged in the master branch: commit 0d0f9620da72d166b877ab9b3e2832c79b6f3b19 Author: Ole Streicher <o...@aip.de> Date: Thu Jan 14 09:58:45 2016 +0100 write lowercase substantives in english texts :-) diff --git a/www-src/index.html b/www-src/index.html index 115f0c8..f16e4c1 100644 --- a/www-src/index.html +++ b/www-src/index.html @@ -34,7 +34,7 @@ href="http://alioth.debian.org/projects/blends/;>project page on Alioth. Debian Astro - packages for Astronomy and Astrophysics + packages for astronomy and astrophysics Index diff --git a/www/index.html b/www/index.html index ccb48d7..aa708b5 100644 --- a/www/index.html +++ b/www/index.html @@ -69,7 +69,7 @@ href="http://alioth.debian.org/projects/blends/;>project page on Alioth. Debian Astro - packages for Astronomy and Astrophysics + packages for astronomy and astrophysics Index -- 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
[Blends-commit] [SCM] website branch, master, updated. 10b9293b2a8206634ac0cb10589096cf209608ce
The following commit has been merged in the master branch: commit 10b9293b2a8206634ac0cb10589096cf209608ce Author: Ole Streicher <o...@aip.de> Date: Thu Jan 14 10:02:05 2016 +0100 Add in-text link to tasks in Debian-Astro homepage diff --git a/webtools/templates/debian-astro_idx.xhtml b/webtools/templates/debian-astro_idx.xhtml index 54c5bce..02adee1 100644 --- a/webtools/templates/debian-astro_idx.xhtml +++ b/webtools/templates/debian-astro_idx.xhtml @@ -41,8 +41,8 @@ $projectname is a "Debian Pure Blend" with the aim to develop a Debian based operating system that fits the requirements of both professional and hobby astronomers. It integrates a large number of - software packages covering telescope control, data reduction, - presentation and other fields. + software packages covering telescope control, + data reduction, presentation and other fields. Featured packages diff --git a/webtools_py3/templates/debian-astro_idx.xhtml b/webtools_py3/templates/debian-astro_idx.xhtml index dcac997..cefd69b 100644 --- a/webtools_py3/templates/debian-astro_idx.xhtml +++ b/webtools_py3/templates/debian-astro_idx.xhtml @@ -41,8 +41,8 @@ $projectname is a "Debian Pure Blend" with the aim to develop a Debian based operating system that fits the requirements of both professional and hobby astronomers. It integrates a large number of - software packages covering telescope control, data reduction, - presentation and other fields. + software packages covering telescope control, + data reduction, presentation and other fields. Featured packages -- 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
[Blends-commit] [SCM] science branch, master, updated. 044535af5602e847b83e3ad66e1655eb3a4027b5
The following commit has been merged in the master branch: commit 044535af5602e847b83e3ad66e1655eb3a4027b5 Author: Ole Streicher <o...@aip.de> Date: Tue Jan 26 10:15:30 2016 +0100 Replace astronomy related packages by the debian-astro tasks diff --git a/tasks/astronomy b/tasks/astronomy index 032e02c..fb32e1a 100644 --- a/tasks/astronomy +++ b/tasks/astronomy @@ -1,193 +1,18 @@ Task: Astronomy -Description: Debian Science Astronomy packages - This metapackage will install Debian Science packages related to - Astronomy. You might also be interested in field::astronomy debtag - and, depending on your focus, in the education-astronomy metapackage. - -Depends: gcx - -Depends: xorsa -Why: Celestial Mechanics computations - -Depends: astronomical-almanac, lightspeed, openuniverse - -Depends: astromatic, sextractor, swarp, psfex, stiff, missfits, scamp, - weightwatcher - -Depends: montage - -Depends: wcstools, wcslib-tools, funtools, qfits-tools - -Depends: gpredict, predict, seesat5 - -Depends: yorick-full - -Suggests: yorick-cubeview, yorick-mira, yorick-spydr, yorick-yao, - yorick-svipc, yorick-gyoto - -Depends: savi - -Depends: stellarium, xplanet, - xplanet-images, celestia, kstars, starplot - -Depends: lynkeos.app - -Suggests: sunclock, xtide, xtide-data -Why: Took this over from education-astronomy - -Depends: stardata-common, gliese, yale - -Depends: boinc-app-milkyway, boinc-app-seti - -Suggests: scilab-celestlab, scilab-overload, scilab-scimysql -X-Comment: It is not really astronomy, do we need another category or - should we put space flight related packages into this task? - -Depends: gyoto - -Depends: skycat - -Depends: ftools-fv, fitsverify, fitscut, astropy-utils - -Depends: casacore-tools - -Depends: iraf - -Depends: x11iraf - -Depends: python-pyraf - -Depends: saods9, xpa-tools - -Depends: python-pywcs, python-astropy, python3-astropy, python-pyfits, - python3-pyfits, python-pyds9 -Why: Generic Python packages for astronomy - -Depends: astroml -WNPP: 756994 - -Depends: sncosmo -WNPP: 757096 - -Depends: aplpy, python-aplpy, python3-aplpy -WNPP: 802457 -Depends: spectral-cube, python-spectral-cube, python3-spectral-cube -WNPP: 802468 - -Depends: python-pyregion, python3-pyregion -Depends: python-wcsaxes, python3-wcsaxes -Depends: glueviz, python-glue, python3-glue -Depends: python-astroquery, python3-astroquery -Why: Astropy affiliated packages - -Depends: python-pyavm, python3-pyavm -Depends: python-astlib, python3-astlib - -Depends: eso-pipelines -Depends: esorex, python-cpl -Suggests: cpl-plugin-amber, cpl-plugin-fors, cpl-plugin-giraf, - cpl-plugin-hawki, cpl-plugin-sinfo, cpl-plugin-kmos, - cpl-plugin-vimos, cpl-plugin-uves, cpl-plugin-xshoo, - cpl-plugin-naco, cpl-plugin-visir, cpl-plugin-muse -Why: Data reduction suite for data taken with ESO instruments - -Depends: eso-midas - -Depends: xephem -Homepage: http://www.clearskyinstitute.com/xephem/ -License: Non-free -Responsible: Javier Fernandez-Sanguino Pena <j...@computer.org> -Pkg-URL: http://snapshot.debian.net/archive/2005/03/13/debian/pool/non-free/x/xephem/ -Pkg-Description: An interactive astronomical ephemeris for X. - Xephem is an interactive astronomical ephemeris program for X Windows - systems with Motif. It provides many graphical views as well as - quantitative heliocentric, geocentric and topocentric information for - Earth satellites, solar system and celestial objects. - . -Remark: Removed from Debian due to licensing issues. - -Ignore: gstar -Homepage: http://www.ecn.wfu.edu/~cottrell/gstar/ -License: GPL -Responsible: Maintainer: Muhammad Hussain Yusuf <muhammad_yu...@lineone.net> -Pkg-URL: http://snapshot.debian.net/archive/2005/03/13/debian/pool/main/g/gstar/ -Pkg-Description: a gtk front-end for the starchart program - gstar is a gtk front-end for the "starchart" program (originally by Alan - Paeth, updated in 1990 by Craig Counterman) which generates high-quality - postscript charts of any chosen region of the sky. It also prints the current - Julian date and gives positions of the planets. -Remark: Removed from Debian due to licensing issues. - -Suggests: pdl, pgplot5, python-scientific -Why: Already in science-viewing - -Depends: wxastrocapture - -Depends: ssystem -Pkg-URL: http://snapshot.debian.org/package/ssystem/ -Homepage: http://www1.las.es/~amil/ssystem -Pkg-Description: 3D solar system simulator - An OpenGL Solar System simulator which includes the sun, the nine - planets, a few major satellites, and background stars. - . - This package has since been rewritten and repackaged as Celestia, - but since that package has significantly higher hardware requirements - than ssystem does, this package is being kept around. Celestia - has a better looking solar system, more options, and unlike ssystem, - is actually still being worked on, so you probably only want to use - this if you have older hardware that cannot ru
[Blends-commit] [SCM] science branch, master, updated. 71cee8caf33d79cc0940e4259a2c1326599940bb
The following commit has been merged in the master branch: commit 71cee8caf33d79cc0940e4259a2c1326599940bb Author: Ole Streicher <o...@aip.de> Date: Tue Jan 26 10:41:07 2016 +0100 Fix task name of astronomy-dev diff --git a/tasks/astronomy-dev b/tasks/astronomy-dev index a53db88..54b3919 100644 --- a/tasks/astronomy-dev +++ b/tasks/astronomy-dev @@ -1,4 +1,4 @@ -Task: Astronomy +Task: Astronomy-dev Description: Debian Science Astronomy-dev transitional package Debian-Astro is now a separate Debian Pure Blend and allows a fine-grained control on the topics to install. To ease the transition, this package will -- Debian Science Blend ___ 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. b1b057c0dc071eb39bc68c8c56dc681fb39b5d78
The following commit has been merged in the master branch:
commit b1b057c0dc071eb39bc68c8c56dc681fb39b5d78
Author: Ole Streicher <o...@aip.de>
Date: Mon Jan 25 11:17:09 2016 +0100
Use alternative tasks pages for hamradio as discussed with irl
diff --git a/webtools/tasks.py b/webtools/tasks.py
index f71216e..58e479f 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -263,7 +263,7 @@ for lang in languages:
except: # simply continue if file does not exist
pass
-if data['projectname'] == 'Debian Astro':
+if data['projectname'] in ('Debian Astro', 'Debian Hamradio'):
template = loader.load('packages.xhtml')
else:
template = loader.load('tasks.xhtml')
diff --git a/webtools_py3/tasks_udd.py b/webtools_py3/tasks_udd.py
index b64a7dd..f49791b 100755
--- a/webtools_py3/tasks_udd.py
+++ b/webtools_py3/tasks_udd.py
@@ -172,7 +172,7 @@ for lang in languages:
# Keep the Project lists per task to be able to loop over all tasks in
plain package list
data['projects'][task] = tasks.tasks[task].dependencies
-if data['projectname'] == 'Debian Astro':
+if data['projectname'] in ('Debian Astro', 'Debian Hamradio'):
template = loader.load('packages.xhtml')
else:
template = loader.load('tasks.xhtml')
--
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
[Blends-commit] [SCM] science branch, master, updated. 96dbe0fbc52e320aadb07d4c5dbdf836b8e61eed
The following commit has been merged in the master branch: commit 96dbe0fbc52e320aadb07d4c5dbdf836b8e61eed Author: Ole Streicher <o...@aip.de> Date: Tue Jan 26 10:29:49 2016 +0100 Update d/changelog with last changes of astronomy and astronomy-dev diff --git a/debian/changelog b/debian/changelog index 272a033..4743854 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,8 @@ debian-science (1.5) UNRELEASED; urgency=medium [ Ole Streicher ] - * Add psfex, swarp, stiff, missfits, fitscut, astlib, glueviz, -cpl-plugin-muse, cpl-plugin-naco, cpl-plugin-visir, pyavm, siril, -gnudatalanguage, scamp, astromatic, eso-pipelines, weightwatcher, -montage, idlastro, wcsaxes, pyregion, astropy-utils, yt, indi-bin, -gdl-coyote, gdl-mpfit, astrometry.net, rawtran, spectral-cube, -aplpy to astronomy - * Remove orbfit and linoccult from astronomy - * Add libindi-bin to astronomy-dev - * Replace libcfitsio3-dev with libcfitsio-dev in astronomy-dev + * Replace astronomy and astronomy-dev packages with the metapackages +from debian-astro [ Andreas Tille ] * Add new task imageanalysis-dev -- Debian Science Blend ___ 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. ccb5c6a787486e4984222a674d76f76ba33c986f
The following commit has been merged in the master branch:
commit ccb5c6a787486e4984222a674d76f76ba33c986f
Author: Ole Streicher <o...@aip.de>
Date: Wed Jan 27 12:01:35 2016 +0100
Also sorting enhancing packages in old code for the alternative package list
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 660d337..a8d9626 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -488,7 +488,7 @@ function show_fulldesc(hash) {
Enhancements
-
+
${enh}
--
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
[Blends-commit] [SCM] website branch, master, updated. 70331813060f0e77ec242d7f3a1ff983897a800c
The following commit has been merged in the master branch:
commit 70331813060f0e77ec242d7f3a1ff983897a800c
Author: Ole Streicher <o...@aip.de>
Date: Fri Feb 19 13:44:21 2016 +0100
Add new Debian Astro logo
diff --git a/webtools/templates/debian-astro_idx.xhtml
b/webtools/templates/debian-astro_idx.xhtml
index 02adee1..953052c 100644
--- a/webtools/templates/debian-astro_idx.xhtml
+++ b/webtools/templates/debian-astro_idx.xhtml
@@ -108,6 +108,14 @@
${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.
+
diff --git a/www/css/blends.css b/www/css/blends.css
index 3f43c67..ee02dd8 100644
--- a/www/css/blends.css
+++ b/www/css/blends.css
@@ -108,3 +108,6 @@ h1#med {
background-image: url('/img/splash_med.png');
}
+h1#astro {
+ background-image: url('/img/splash_astro.png');
+}
diff --git a/www/img/splash_astro.png b/www/img/splash_astro.png
new file mode 100644
index 000..4d2f5e6
Binary files /dev/null and b/www/img/splash_astro.png differ
--
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
[Blends-commit] [SCM] website branch, master, updated. f35736ec0a22fd69a34f829ea012883d92fb7aee
The following commit has been merged in the master branch:
commit f35736ec0a22fd69a34f829ea012883d92fb7aee
Author: Ole Streicher <o...@aip.de>
Date: Fri Feb 19 13:46:07 2016 +0100
Add the Debian-Astro logo to www-src as well
diff --git a/www-src/css/blends.css b/www-src/css/blends.css
index 3f43c67..ee02dd8 100644
--- a/www-src/css/blends.css
+++ b/www-src/css/blends.css
@@ -108,3 +108,6 @@ h1#med {
background-image: url('/img/splash_med.png');
}
+h1#astro {
+ background-image: url('/img/splash_astro.png');
+}
diff --git a/www/img/splash_astro.png b/www-src/img/splash_astro.png
similarity index 100%
copy from www/img/splash_astro.png
copy to www-src/img/splash_astro.png
--
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
[Blends-commit] [SCM] website branch, master, updated. d05b01a9a85858d9c86b9f5df1f3eda94e5eb1a7
The following commit has been merged in the master branch:
commit d05b01a9a85858d9c86b9f5df1f3eda94e5eb1a7
Author: Ole Streicher <oleb...@debian.org>
Date: Fri Feb 19 17:26:42 2016 +0100
Replace norway letter with html entity
diff --git a/webtools/templates/debian-astro_idx.xhtml
b/webtools/templates/debian-astro_idx.xhtml
index bcc53d4..4a36a65 100644
--- a/webtools/templates/debian-astro_idx.xhtml
+++ b/webtools/templates/debian-astro_idx.xhtml
@@ -110,7 +110,7 @@
${updatetimestamp}
The Debian Astro logo was created by
- http://www.mariahammerstrom.com;>Maria Hammerstrøm
+ http://www.mariahammerstrom.com;>Maria Hammerstrm
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
--
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
[Blends-commit] [SCM] website branch, master, updated. f7fff0848b10bb1d9fa14c2b79de590f9c8be91f
The following commit has been merged in the master branch:
commit f7fff0848b10bb1d9fa14c2b79de590f9c8be91f
Author: Ole Streicher <oleb...@debian.org>
Date: Fri Feb 19 17:40:35 2016 +0100
suffix of bd_astro image corrected
diff --git a/www/css/blends.css b/www/css/blends.css
index 6112603..357d487 100644
--- a/www/css/blends.css
+++ b/www/css/blends.css
@@ -113,5 +113,5 @@ h1#astro {
}
.astro-splash {
- background-image: url('/img/bg_astro.png') !important;
+ background-image: url('/img/bg_astro.jpg') !important;
}
--
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
[Blends-commit] [SCM] website branch, master, updated. c437840db552644ae90cbfe15e9e7ee987b9803e
The following commit has been merged in the master branch:
commit c437840db552644ae90cbfe15e9e7ee987b9803e
Author: Ole Streicher <oleb...@debian.org>
Date: Fri Feb 19 19:59:30 2016 +0100
Enable unicode for debian-astro_idx
diff --git a/webtools/tasks.py b/webtools/tasks.py
index 58e479f..d312366 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -203,7 +203,7 @@ for lang in languages:
os.unlink(outputfile)
except: # simply continue if file does not exist
pass
- f = open(outputfile, 'w')
+ f = codecs.open(outputfile, "w", "utf-8")
try:
print >> f, template.generate(**data).render('xhtml')
except UnicodeDecodeError, errtxt:
--
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
[Blends-commit] [SCM] website branch, master, updated. 463a251d23006f1d131b5c71f66639b6ddde1580
The following commit has been merged in the master branch:
commit 463a251d23006f1d131b5c71f66639b6ddde1580
Author: Ole Streicher <oleb...@debian.org>
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 Hammerstrm
- 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 Hammerstrm
+ 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
[Blends-commit] [SCM] website branch, master, updated. 4360c0c60f0cbebab008018804ced4723451c3ac
The following commit has been merged in the master branch:
commit 4360c0c60f0cbebab008018804ced4723451c3ac
Author: Ole Streicher <oleb...@debian.org>
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' : 'Sh
[Blends-commit] [SCM] website branch, master, updated. e5b2feb75d166c255761bd1701341bb651b92731
The following commit has been merged in the master branch:
commit e5b2feb75d166c255761bd1701341bb651b92731
Author: Ole Streicher <oleb...@debian.org>
Date: Fri Mar 11 21:31:04 2016 +0100
Minor cleanup: unused imports and comments etc.
diff --git a/webtools/blendslanguages.py b/webtools/blendslanguages.py
index 6d33728..914812c 100644
--- a/webtools/blendslanguages.py
+++ b/webtools/blendslanguages.py
@@ -1,6 +1,7 @@
-'''Define languages which are supported in web sentinel pages'''
-# Copyright 2010: Andreas Tille <ti...@debian.org>
-# License: GPL
+'''Define languages which are supported in web sentinel pages
+Copyright 2010: Andreas Tille <ti...@debian.org>
+License: GPL
+'''
from genshi import Markup
diff --git a/webtools/blendsmarkdown.py b/webtools/blendsmarkdown.py
index d3c5b7c..7d0cc3a 100644
--- a/webtools/blendsmarkdown.py
+++ b/webtools/blendsmarkdown.py
@@ -1,7 +1,8 @@
'''To enable better formatting of long descriptions we use Markdown
-and some preprocessing of the RFC822 formatted descriptions'''
-# Copyright 2008: Andreas Tille <ti...@debian.org>
-# License: GPL
+and some preprocessing of the RFC822 formatted descriptions
+Copyright 2008: Andreas Tille <ti...@debian.org>
+License: GPL
+'''
import re
from sys import stderr
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 00d06dd..0a098bf 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -27,9 +27,6 @@ import psycopg2
import gettext
from genshi import Markup
-# According to
http://genshi.edgewall.org/wiki/GenshiFaq#HowcanIincludeliteralXMLintemplateoutput
-# there are different options to prevent escaping '<' / '>' but HTML does not
work ...
-# from genshi.input import HTML
from blendsmarkdown import SplitDescription, MarkupString, render_longdesc
try:
diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index 4f37804..25dd678 100644
--- a/webtools/blendstasktools_udd.py
+++ b/webtools/blendstasktools_udd.py
@@ -13,23 +13,16 @@ License: GPL
'''
from sys import stderr, exit
-from subprocess import Popen, PIPE
import codecs
import os
import grp
import stat
-import gzip
-import bz2
import re
import email.utils
import psycopg2
-import gettext
from genshi import Markup
-# According to
http://genshi.edgewall.org/wiki/GenshiFaq#HowcanIincludeliteralXMLintemplateoutput
-# there are different options to prevent escaping '<' / '>' but HTML does not
work ...
-# from genshi.input import HTML
from blendsmarkdown import SplitDescription, MarkupString, render_longdesc
try:
diff --git a/webtools/bugs.py b/webtools/bugs.py
index 6d6cc10..c4413e5 100755
--- a/webtools/bugs.py
+++ b/webtools/bugs.py
@@ -10,13 +10,12 @@ import json
import re
import time
from datetime import datetime
-from email.Utils import formatdate
-import email.Utils
+from email.utils import formatdate
+import email.utils
import gettext
from genshi.template import TemplateLoader
from genshi import Markup
-from genshi.template.eval import UndefinedError
from blendstasktools import ReadConfig, RowDictionaries,
CheckOrCreateOutputDir, SetFilePermissions
from blendsmarkdown import MarkupString
@@ -235,7 +234,7 @@ def main():
sources['source'] = pkg['source']
sources['homepage']= pkg['homepage']
sources['vcs_browser'] = pkg['vcs_browser']
-(_name, _url) = email.Utils.parseaddr(pkg['maintainer'])
+(_name, _url) = email.utils.parseaddr(pkg['maintainer'])
sources['maintainer_email'] = _url
sources['maintainer_name'] = _name
sources['maintainer'] = MarkupString('mailto:%s;>%s'
% (_url, _name), pkg['source'], 'maintainer')
@@ -263,7 +262,7 @@ def main():
sources['source'] = pkg['source']
sources['homepage']= pkg['homepage']
sources['vcs_browser'] = pkg['vcs_browser']
-(_name, _url) = email.Utils.parseaddr(pkg['maintainer'])
+(_name, _url) = email.utils.parseaddr(pkg['maintainer'])
sources['maintainer_email'] = _url
sources['maintainer_name'] = _name
sources['maintainer'] = MarkupString('mailto:%s;>%s' % (_url, _name), pkg['source'], 'maintainer')
diff --git a/webtools/tasks.py b/webtools/tasks.py
index 61abbe5..3ae86f4 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -13,7 +13,6 @@ from email.utils import formatdate
from genshi.template import TemplateLoader
from genshi import Markup
-from genshi.template.eval import UndefinedError
from blendstasktools import Tasks, GetDependencies2Use, pkgstatus,
pkgstatus_sortedkeys, UnlockBlendsTools, CheckOrCreateOutputDir,
SetFilePermissions
from blendslanguages import languages, language_dict
diff --git a/webtools/tasks_udd.py b/webtools/tasks_udd.py
index d10881d..4fef57e 100755
--- a/webtools/t
