[Blends-commit] [Git][blends-team/blends][experimental] Improve program output
Ole Streicher pushed to branch experimental at Debian Blends Team / blends
Commits:
dc702a0a by Ole Streicher at 2018-04-13T17:35:21+02:00
Improve program output
- - - - -
1 changed file:
- devtools/blend-gen-control
Changes:
=
devtools/blend-gen-control
=
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -92,23 +92,26 @@ if args.udd:
else:
blend += aptcache(args.release, [args.dir, '/etc/blends'])
-missing = blend.fix_dependencies()
+missing = sorted(set(d.name for d in blend.fix_dependencies()))
+wanted = sorted(set(d.name for d in itertools.chain(*(
+itertools.chain(*(t.recommends + t.dependencies))
+for t in blend.tasks
if args.suppressempty:
for task in blend.tasks[:]:
if len(task.recommends) == 0 and len(task.dependencies) == 0:
blend.tasks.remove(task)
-if missing and args.missing:
-missing = sorted(set(d.name for d in missing))
-print('Missing {} packages downgraded to `suggests`:\n '
- .format(len(missing))
- + '\n '.join(missing))
+if missing:
+if args.missing:
+print('Downgraded {} missing packages to Suggests:\n '
+ .format(len(missing))
+ + '\n '.join(missing))
+else:
+print('Downgraded {} missing packages to Suggests'
+ .format(len(missing)))
if args.wanted:
-wanted = sorted(set(d.name for d in itertools.chain(*(
-itertools.chain(*(t.recommends + t.dependencies))
-for t in blend.tasks
print("Total {} packages in Depends or Recommend:\n "
.format(len(wanted))
+ '\n '.join(wanted))
@@ -117,10 +120,20 @@ if args.gencontrol:
with open(os.path.join(args.dir, 'debian', 'control'), 'w') as fp:
fp.write('# This file is autogenerated. Do not edit!\n')
blend.gen_control().dump(fp, text_mode=True)
+print("Generated {} for {} with {} using {} Depends+Recommends"
+ .format('debian/control',
+ args.release,
+ 'udd' if args.udd else 'apt',
+ len(wanted)))
if args.taskdesc:
with open(os.path.join(args.dir, '{}-tasks.desc'.format(blend.name)), 'w')
as fp:
blend.gen_task_desc(udeb=args.udebs).dump(fp, text_mode=True)
+print("Generated {} for {} with {} using {} Depends+Recommends"
+ .format('debian/control',
+ args.release,
+ 'udd' if args.udd else 'apt',
+ len(wanted)))
upgraded_tasks = list(filter(lambda task: task.format_upgraded, blend.tasks))
if upgraded_tasks:
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/dc702a0a14a9dc16eb0a341d1c5019664c2c6a5b
---
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/dc702a0a14a9dc16eb0a341d1c5019664c2c6a5b
You're receiving this email because of your account on salsa.debian.org.
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] Restrict UDD query to "main" component
Ole Streicher pushed to branch experimental at Debian Blends Team / blends
Commits:
b2bd2dff by Ole Streicher at 2018-04-10T21:33:51+02:00
Restrict UDD query to "main" component
- - - - -
2 changed files:
- blends.py
- devtools/blend-gen-control
Changes:
=
blends.py
=
--- a/blends.py
+++ b/blends.py
@@ -747,7 +747,7 @@ def aptcache(release=None, srcdirs=['/etc/blends']):
return cache
-def uddcache(release, packages, **db_args):
+def uddcache(packages, release, components=['main'], **db_args):
'''Create a ``dict`` from UDD that is roughly modelled after ``apt.Cache``.
The ``dict`` just resolves the version number and archs for the packages.
@@ -764,6 +764,8 @@ def uddcache(release, packages, **db_args):
pkgtuple = tuple(set(p.name for p in packages))
+componenttuple = tuple(components)
+
Package = collections.namedtuple('Package',
('name', 'versions',))
Version = collections.namedtuple('Version',
@@ -776,11 +778,13 @@ def uddcache(release, packages, **db_args):
FROM packages, releases
WHERE packages.release=releases.release
AND (releases.release=%s OR releases.role=%s)
-AND (packages.package IN %s OR packages.provides in %s);'''
+AND (packages.package IN %s OR packages.provides in %s)
+AND packages.component IN %s;'''
with psycopg2.connect(**db_args) as conn:
cursor = conn.cursor()
-cursor.execute(stmt, (release, release, pkgtuple, pkgtuple))
+cursor.execute(stmt, (release, release, pkgtuple, pkgtuple,
+ componenttuple))
cache = dict()
for package, provides, arch, version in cursor:
=
devtools/blend-gen-control
=
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -86,7 +86,7 @@ for task in blend.tasks[:]:
blend.tasks.remove(task)
if args.udd:
-blend += uddcache(args.release, blend.all, host=args.udd_host,
+blend += uddcache(blend.all, args.release, host=args.udd_host,
user=args.udd_user, password=args.udd_password,
database=args.udd_database)
else:
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/b2bd2dff3896bb9940f8aa2c88addbfbbf459b9c
---
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/b2bd2dff3896bb9940f8aa2c88addbfbbf459b9c
You're receiving this email because of your account on salsa.debian.org.
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] blends.py: Normalize "provides" column in UDD query
Ole Streicher pushed to branch experimental at Debian Blends Team / blends
Commits:
41c7deb4 by Ole Streicher at 2018-04-12T14:55:43+02:00
blends.py: Normalize "provides" column in UDD query
- - - - -
1 changed file:
- blends.py
Changes:
=
blends.py
=
--- a/blends.py
+++ b/blends.py
@@ -771,27 +771,63 @@ def uddcache(packages, release, components=['main'],
**db_args):
Version = collections.namedtuple('Version',
('package', 'architecture', 'version'))
-stmt = '''SELECT packages.package,
- packages.provides,
- packages.architecture,
- packages.version
- FROM packages, releases
- WHERE packages.release=releases.release
-AND (releases.release=%s OR releases.role=%s)
-AND (packages.package IN %s OR packages.provides in %s)
-AND packages.component IN %s;'''
+# To make the SELECT statements easier, we create a virtual view
+# of the "packages" table that is restricted to the release and
+# the component(s)
+pkg_view_stmt = '''
+CREATE TEMPORARY VIEW pkg
+AS SELECT packages.package,
+ packages.version,
+ packages.architecture,
+ packages.provides
+FROM packages, releases
+WHERE packages.release=releases.release
+AND (releases.release=%s OR releases.role=%s)
+AND packages.component IN %s;
+'''
+
+# Since the "provides" are in a comma separated list, we create a
+# normalized view
+provides_view_stmt = '''
+CREATE TEMPORARY VIEW provides
+AS SELECT DISTINCT
+package,
+version,
+architecture,
+regexp_split_to_table(provides, E',\\s*') AS provides
+FROM pkg;
+'''
+
+# Query all packages that have one of the specified names either as
+# package name, or as one of the provides
+query_stmt = '''
+SELECT package,
+ version,
+ architecture,
+ provides
+FROM pkg
+WHERE package IN %s
+UNION
+SELECT package,
+ version,
+ architecture,
+ provides
+FROM provides
+WHERE provides IN %s;
+'''
with psycopg2.connect(**db_args) as conn:
cursor = conn.cursor()
-cursor.execute(stmt, (release, release, pkgtuple, pkgtuple,
- componenttuple))
+cursor.execute(pkg_view_stmt, (release, release, componenttuple))
+cursor.execute(provides_view_stmt)
+cursor.execute(query_stmt, (pkgtuple, pkgtuple))
cache = dict()
-for package, provides, arch, version in cursor:
+for package, version, arch, provides in cursor:
p = cache.setdefault(package, Package(package, []))
p.versions.append(Version(p, arch, version))
if provides:
-pp = cache.setdefault(provides, Package(package, []))
-pp.versions.append(Version(p, arch, version))
-
+for prv in provides.split(','):
+pp = cache.setdefault(prv, Package(package, []))
+pp.versions.append(Version(p, arch, version))
return cache
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/41c7deb4144113b28fbdbca92d8b87ea11177ef2
---
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/41c7deb4144113b28fbdbca92d8b87ea11177ef2
You're receiving this email because of your account on salsa.debian.org.
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] Fix file name in tasks gen stdout
Ole Streicher pushed to branch experimental at Debian Blends Team / blends
Commits:
43ca1b83 by Ole Streicher at 2018-04-13T17:37:14+02:00
Fix file name in tasks gen stdout
- - - - -
1 changed file:
- devtools/blend-gen-control
Changes:
=
devtools/blend-gen-control
=
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -130,7 +130,7 @@ if args.taskdesc:
with open(os.path.join(args.dir, '{}-tasks.desc'.format(blend.name)), 'w')
as fp:
blend.gen_task_desc(udeb=args.udebs).dump(fp, text_mode=True)
print("Generated {} for {} with {} using {} Depends+Recommends"
- .format('debian/control',
+ .format(blend.name + '-tasks.desc',
args.release,
'udd' if args.udd else 'apt',
len(wanted)))
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/43ca1b83f5451bdf5edc5c611e203feac533e314
---
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/43ca1b83f5451bdf5edc5c611e203feac533e314
You're receiving this email because of your account on salsa.debian.org.
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] Remove empty GENCONTROL_OPTS definition from blends-dev/Makefile
Ole Streicher pushed to branch experimental at Debian Blends Team / blends Commits: 96643c65 by Ole Streicher at 2018-04-13T12:58:51+02:00 Remove empty GENCONTROL_OPTS definition from blends-dev/Makefile - - - - - 1 changed file: - devtools/Makefile Changes: = devtools/Makefile = --- a/devtools/Makefile +++ b/devtools/Makefile @@ -30,7 +30,6 @@ VERSION := $(shell dpkg-parsechangelog -ldebian/changelog | grep Version: | cut GENCONTROL := /usr/share/blends-dev/blend-gen-control TASKSDIFF := /usr/share/blends-dev/tasks_diff DEPENDENCIES_DATA := dependency_data -GENCONTROL_OPTS := TASKSELOPTS := $(shell grep TASKSELOPTS Makefile | cut -d '=' -f2) # Verify whether config/control exists, if yes, add it to the depends of debian/control @@ -57,7 +56,7 @@ endif all: $(BLEND)-tasks.desc debian/control debian/control: debian/control.stub debian/changelog tasks/* $(CONFIGCONTROL) - $(GENCONTROL) $(GENCONTROL_OPTS) -r $(TARGET_DIST) -S -c -m + $(GENCONTROL) -r $(TARGET_DIST) -S -c -m tasksel: $(BLEND)-tasks.desc $(BLEND)-tasks.desc: tasks/* debian/changelog View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/96643c653bc71ebd3031be43e7e45b957d3028d7 --- View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/96643c653bc71ebd3031be43e7e45b957d3028d7 You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] 2 commits: blends.py: escape backslashes in sql query
Ole Streicher pushed to branch experimental at Debian Blends Team / blends
Commits:
af3096a3 by Ole Streicher at 2018-04-13T09:27:57+02:00
blends.py: escape backslashes in sql query
- - - - -
76f535f5 by Ole Streicher at 2018-04-13T09:28:39+02:00
blend-gen-control: help output fix
- - - - -
2 changed files:
- blends.py
- devtools/blend-gen-control
Changes:
=
blends.py
=
--- a/blends.py
+++ b/blends.py
@@ -794,9 +794,10 @@ def uddcache(packages, release, components=['main'],
**db_args):
package,
version,
architecture,
-regexp_split_to_table(regexp_replace(provides,
- E'\\s*\\([^)]*\\)', '', 'g'),
- E',\\s*') AS provides
+regexp_split_to_table(regexp_replace(provides,
+ E's*([^)]*)',
+ '', 'g'),
+ E',s*') AS provides
FROM pkg;
'''
=
devtools/blend-gen-control
=
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -133,4 +133,4 @@ if upgraded_tasks:
else:
print('Warning: {} tasks use the old format {}'
.format(len(upgraded_tasks), upgraded_tasks[0].format_version))
-print('Please consider upgrading the task files with the `-U` flag.')
+print('Please consider upgrading the task files with the `-F` flag.')
View it on GitLab:
https://salsa.debian.org/blends-team/blends/compare/1c01f7f777a6b3a7b6c78c5579aea068acfd09f4...76f535f5b8b4f278d67dd4bd2ead606e270cc6b3
---
View it on GitLab:
https://salsa.debian.org/blends-team/blends/compare/1c01f7f777a6b3a7b6c78c5579aea068acfd09f4...76f535f5b8b4f278d67dd4bd2ead606e270cc6b3
You're receiving this email because of your account on salsa.debian.org.
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] blends.py: Handle versionized provides
Ole Streicher pushed to branch experimental at Debian Blends Team / blends Commits: 1c01f7f7 by Ole Streicher at 2018-04-12T16:32:35+02:00 blends.py: Handle versionized provides Since some time, provides may be versionized. They are handled here by just ignoring them. - - - - - 1 changed file: - blends.py Changes: = blends.py = --- a/blends.py +++ b/blends.py @@ -794,7 +794,9 @@ def uddcache(packages, release, components=['main'], **db_args): package, version, architecture, -regexp_split_to_table(provides, E',\\s*') AS provides +regexp_split_to_table(regexp_replace(provides, + E'\\s*\\([^)]*\\)', '', 'g'), + E',\\s*') AS provides FROM pkg; ''' View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/1c01f7f777a6b3a7b6c78c5579aea068acfd09f4 --- View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/1c01f7f777a6b3a7b6c78c5579aea068acfd09f4 You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] Oops. Forgot to reset distribution for 'unstable'
Ole Streicher pushed to branch experimental at Debian Blends Team / blends Commits: 1a649bf1 by Ole Streicher at 2018-04-11T11:40:40+02:00 Oops. Forgot to reset distribution for 'unstable' - - - - - 1 changed file: - sources.list.unstable Changes: = sources.list.unstable = --- a/sources.list.unstable +++ b/sources.list.unstable @@ -1 +1 @@ -deb http://ftp.debian.org/debian testing main +deb http://ftp.debian.org/debian unstable main View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/1a649bf15d06f7a0814fda0df7cf62b1e9fb0b44 --- View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/1a649bf15d06f7a0814fda0df7cf62b1e9fb0b44 You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] Move distribution name fix to blends-dev Makefile
Ole Streicher pushed to branch experimental at Debian Blends Team / blends
Commits:
61fcc481 by Ole Streicher at 2018-04-11T08:50:20+02:00
Move distribution name fix to blends-dev Makefile
The idea is to have a consistent and transparent behaviour between udd
and apt update methods.
- - - - -
3 changed files:
- devtools/Makefile
- − sources.list.UNRELEASED
- sources.list.unstable
Changes:
=
devtools/Makefile
=
--- a/devtools/Makefile
+++ b/devtools/Makefile
@@ -9,6 +9,22 @@
# TARGET_DIST is one of stable, sarge, etch, unstable, or any other available
# sources.list file available
TARGET_DIST := $(shell head -1 debian/changelog |awk '{print $$3}'|tr -d ';')
+
+# using unstable as target distribution for the meta package dependencies
+# does actually not sound reasonable. The idea is to enable a smooth
transition
+# to testing for all meta packages and thus here testing is used as target
+# distribution.
+ifeq "$(TARGET_DIST)" "unstable"
+ TARGET_DIST := "testing"
+endif
+
+# It is a good practice to use UNRELEASED in the changelog as target
+# distribution for not yet finished packages and blends-dev should
+# also work in this case.
+ifeq "$(TARGET_DIST)" "UNRELEASED"
+ TARGET_DIST := "unstable"
+endif
+
BLEND := $(shell /usr/share/blends-dev/blend-get-names blendname)
VERSION := $(shell dpkg-parsechangelog -ldebian/changelog | grep Version: |
cut -f2 -d' ' | cut -f1 -d- )
GENCONTROL := /usr/share/blends-dev/blend-gen-control
=
sources.list.UNRELEASED deleted
=
--- a/sources.list.UNRELEASED
+++ /dev/null
@@ -1,5 +0,0 @@
-# For testing purposes this sources.list might be useful. It is a
-# good practice to use UNRELEASED in the changelog as target distribution
-# for not yet finished packages and blends-dev should also work in this
-# case
-deb http://ftp.debian.org/debian unstable main
=
sources.list.unstable
=
--- a/sources.list.unstable
+++ b/sources.list.unstable
@@ -1,7 +1 @@
-# using unstable as target distribution for the meta package dependencies
-# does actually not sound reasonable. The idea is to enable a smooth
transition
-# to testing for all meta packages and thus here testing is used as target
-# distribution. You are free to provide your own source.list.unstable
-# in the source of your meta package building code to force unstable as
-# target or alternatively you could change this file
(/etc/blends/sources.list.unstable).
deb http://ftp.debian.org/debian testing main
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/61fcc481892d37e87d5c4ee05ff143ec80e34048
---
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/61fcc481892d37e87d5c4ee05ff143ec80e34048
You're receiving this email because of your account on salsa.debian.org.
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] Fix suppression of empty tasks
Ole Streicher pushed to branch experimental at Debian Blends Team / blends Commits: e39204f2 by Ole Streicher at 2018-04-10T17:51:27+02:00 Fix suppression of empty tasks - - - - - 1 changed file: - devtools/blend-gen-control Changes: = devtools/blend-gen-control = --- a/devtools/blend-gen-control +++ b/devtools/blend-gen-control @@ -96,7 +96,7 @@ missing = blend.fix_dependencies() if args.suppressempty: for task in blend.tasks[:]: -if len(task.recommends) == 0 and len(task.dependencies) > 0: +if len(task.recommends) == 0 and len(task.dependencies) == 0: blend.tasks.remove(task) if missing and args.missing: View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/e39204f2ccf596863523bdc853dcbe67d8a638ed --- View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/e39204f2ccf596863523bdc853dcbe67d8a638ed You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] blends-gen-control: read defaults from GENCONTROL_OPTS env var
Ole Streicher pushed to branch experimental at Debian Blends Team / blends
Commits:
dc6f7bc9 by Ole Streicher at 2018-04-10T17:00:51+02:00
blends-gen-control: read defaults from GENCONTROL_OPTS env var
- - - - -
1 changed file:
- devtools/blend-gen-control
Changes:
=
devtools/blend-gen-control
=
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -69,6 +69,10 @@ parser.add_argument("--udd-database", dest="udd_database",
default="udd",
help="UDD database name (default: udd)")
+if 'GENCONTROL_OPTS' in os.environ:
+opts = parser.parse_args(os.environ['GENCONTROL_OPTS'].split())
+parser.set_defaults(**opts.__dict__)
+
args = parser.parse_args()
if args.release == "current":
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/dc6f7bc968c89f3af28a9d99911ba7ddc96bbd06
---
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/dc6f7bc968c89f3af28a9d99911ba7ddc96bbd06
You're receiving this email because of your account on salsa.debian.org.
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] Recommend python3-psycopg2 and note it in the help
Ole Streicher pushed to branch experimental at Debian Blends Team / blends
Commits:
876a6be3 by Ole Streicher at 2018-04-10T13:15:49+02:00
Recommend python3-psycopg2 and note it in the help
- - - - -
2 changed files:
- debian/control
- devtools/blend-gen-control
Changes:
=
debian/control
=
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Depends: debconf,
${misc:Depends},
${python3:Depends}
Suggests: blends-doc
+Recommends: python3-psycopg2
Description: Debian Pure Blends common files for developing metapackages
This package makes life easier when packaging metapackages. Perhaps
this will also encourage other people to build metapackages if there are
=
devtools/blend-gen-control
=
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -833,7 +833,7 @@ if __name__ == '__main__':
parser.add_argument("-U", "--udd", dest="udd",
action="store_true", default=False,
-help="Query UDD instead of apt")
+help="Query UDD instead of apt (needs
python3-psycopg2)")
parser.add_argument("--udd-host", dest="udd_host",
default="udd-mirror.debian.net",
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/876a6be3043cf96e3a1e68c22ab6fe752ec29dab
---
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/876a6be3043cf96e3a1e68c22ab6fe752ec29dab
You're receiving this email because of your account on salsa.debian.org.
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] Fix documentation of lowering priorities
Ole Streicher pushed to branch experimental at Debian Blends Team / blends Commits: 67e426ba by Ole Streicher at 2018-04-10T12:54:21+02:00 Fix documentation of lowering priorities - - - - - 1 changed file: - devtools/blend-gen-control Changes: = devtools/blend-gen-control = --- a/devtools/blend-gen-control +++ b/devtools/blend-gen-control @@ -179,10 +179,8 @@ class Task: ``Format: https://blends.debian.org/blends/1.1`` -then the priorities will be lowered when read: - -* ``Recommends`` --> ``Suggests`` -* ``Depends`` --> ``Recommends`` +then the ``Depends`` priorities will be lowered to ``Recommends`` +when read. Example: View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/67e426babb60a9b3c74816246bfb3b63b0b90eca --- View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/67e426babb60a9b3c74816246bfb3b63b0b90eca You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] Fix documentation of lowering priorities
Ole Streicher pushed to branch experimental at Debian Blends Team / blends Commits: 23652ce1 by Ole Streicher at 2018-04-10T12:53:07+02:00 Fix documentation of lowering priorities - - - - - 1 changed file: - devtools/blend-gen-control Changes: = devtools/blend-gen-control = --- a/devtools/blend-gen-control +++ b/devtools/blend-gen-control @@ -179,10 +179,8 @@ class Task: ``Format: https://blends.debian.org/blends/1.1`` -then the priorities will be lowered when read: - -* ``Recommends`` --> ``Suggests`` -* ``Depends`` --> ``Recommends`` +then the ``Recommends`` priorities will be lowered to ``Suggests`` +when read. Example: View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/23652ce112620febe871ce3a95dd00c1933cac4a --- View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/23652ce112620febe871ce3a95dd00c1933cac4a You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends][experimental] Fix help for --taskdesc option
Ole Streicher pushed to branch experimental at Debian Blends Team / blends
Commits:
204bedb2 by Ole Streicher at 2018-04-09T16:43:14+02:00
Fix help for --taskdesc option
- - - - -
1 changed file:
- devtools/blend-gen-control
Changes:
=
devtools/blend-gen-control
=
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -823,11 +823,11 @@ if __name__ == '__main__':
parser.add_argument("-t", '--taskdesc', dest="taskdesc",
action="store_true", default=False,
-help="Print task descriptions and package list for
task")
+help="Generate task descriptions and package list for
task")
parser.add_argument("-u", '--udebs', dest="udebs",
action="store_true", default=False,
-help="modify tasks desc file in case the blend uses
udebs")
+help="Modify tasks desc file in case the blend uses
udebs")
parser.add_argument("-F", '--upgrade-task-format', dest="upgrade_tasks",
action="store_true", default=False,
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/204bedb26a267d4a1125985c41b7472c7c08342e
---
View it on GitLab:
https://salsa.debian.org/blends-team/blends/commit/204bedb26a267d4a1125985c41b7472c7c08342e
You're receiving this email because of your account on salsa.debian.org.
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][debian-astro-team/debian-astro][master] Add python3-ndcube
Ole Streicher pushed to branch master at Debian Astro Team / debian-astro Commits: 415d0aa1 by Ole Streicher at 2018-04-06T15:18:59+02:00 Add python3-ndcube - - - - - 1 changed file: - tasks/python3 Changes: = tasks/python3 = --- a/tasks/python3 +++ b/tasks/python3 @@ -123,3 +123,18 @@ Pkg-Description: Toolkit for fitting and manipulating spectroscopic data baseline/continuum fitting, and equivalent width measurements. Recommends: python3-pyraf + +Recommends: python3-ndcube +WNPP: 895013 +Homepage: http://docs.sunpy.org/projects/ndcube/ +Pkg-Description: Base package for multi-dimensional coordinate aware arrays + ndcube is an open-source SunPy affiliated package for manipulating, + inspecting and visualizing multi-dimensional contiguous and + non-contiguous coordinate-aware data arrays. It combines data, + uncertainties, units, metadata, masking, and coordinate + transformations into classes with unified slicing and generic + coordinate transformations and plotting/animation capabilities. It is + designed to handle data of any number of dimensions and axis types + (e.g. spatial, temporal, spectral, etc.) whose relationship between + the array elements and the real world can be described by World + Coordinate System (WCS) translations. View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/commit/415d0aa175a1f414c77bd3e9998b7d3037d17daa --- View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/commit/415d0aa175a1f414c77bd3e9998b7d3037d17daa You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends] Pushed new tag debian/0.6.103
Ole Streicher pushed new tag debian/0.6.103 at Debian Blends Team / blends --- View it on GitLab: https://salsa.debian.org/blends-team/blends/tree/debian/0.6.103 You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends] Pushed new tag debian/0.6.101
Ole Streicher pushed new tag debian/0.6.101 at Debian Blends Team / blends --- View it on GitLab: https://salsa.debian.org/blends-team/blends/tree/debian/0.6.101 You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends] Pushed new tag debian/0.6.102
Ole Streicher pushed new tag debian/0.6.102 at Debian Blends Team / blends --- View it on GitLab: https://salsa.debian.org/blends-team/blends/tree/debian/0.6.102 You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][debian-astro-team/debian-astro][master] Update VCS fields to use salsa.d.o
Ole Streicher pushed to branch master at Debian Astro Team / debian-astro Commits: 79433b67 by Ole Streicher at 2018-03-27T12:57:14+02:00 Update VCS fields to use salsa.d.o - - - - - 1 changed file: - debian/control Changes: = debian/control = --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Uploaders: Ole Streicher , Paul Sladen Build-Depends-Indep: blends-dev (>= 0.6.15), inkscape Standards-Version: 4.1.3 -Vcs-Browser: https://anonscm.debian.org/cgit/blends/projects/astro.git -Vcs-Git: https://anonscm.debian.org/git/blends/projects/astro.git +Vcs-Browser: https://salsa.debian.org/debian-astro-team/debian-astro +Vcs-Git: https://salsa.debian.org/debian-astro-team/debian-astro.git Homepage: https://blends.debian.org/astro/ Package: astro-tasks @@ -59,8 +59,8 @@ Suggests: astro-catalogs, astro-python, astro-tcltk Description: Default selection of tasks for Debian Astro - This package is part of the Debian Astro Pure Blend and installs all - tasks for a default installation of this blend. +This package is part of the Debian Astro Pure Blend and installs all +tasks for a default installation of this blend. Package: astro-catalogs Section: metapackages @@ -531,7 +531,7 @@ Recommends: gcx, linguider, lynkeos.app, wxastrocapture -Suggests: aravis, +Suggests: aravis-tools, audela, freeture, rts2 View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/commit/79433b67a8d101b4fa91379270f8ebefde4fae32 --- View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/commit/79433b67a8d101b4fa91379270f8ebefde4fae32 You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][debian-astro-team/debian-astro] Pushed new tag debian/1.3
Ole Streicher pushed new tag debian/1.3 at Debian Astro Team / debian-astro --- View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/tree/debian/1.3 You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][blends-team/blends] Pushed new branch experimental
Ole Streicher pushed new branch experimental at Debian Blends Team / blends --- View it on GitLab: https://salsa.debian.org/blends-team/blends/tree/experimental You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][debian-astro-team/debian-astro][master] 2 commits: Add astroplan to ascl
Ole Streicher pushed to branch master at Debian Astro Team / debian-astro Commits: 94df5919 by Ole Streicher at 2018-03-13T13:35:22+01:00 Add astroplan to ascl - - - - - 21edcb8d by Ole Streicher at 2018-03-13T13:35:36+01:00 Fix name of aravis tools - - - - - 2 changed files: - tasks/ascl - tasks/telescopecontrol Changes: = tasks/ascl = --- a/tasks/ascl +++ b/tasks/ascl @@ -373,3 +373,6 @@ Remark: ASCL-Id 9912.003 Recommends: gnuastro Remark: ASCL-Id 1801.009 + +Recommends: python3-astroplan +Remark: ASCL-Id 1802.009 = tasks/telescopecontrol = --- a/tasks/telescopecontrol +++ b/tasks/telescopecontrol @@ -27,7 +27,7 @@ Pkg-Description: Free and open source astronomy software telescope mounts and cameras or DSLRs. Homepage: http://audela.org -Recommends: aravis +Recommends: aravis-tools WNPP: 843185 Homepage: https://github.com/AravisProject/aravis Pkg-Description: a vision library for genicam based cameras View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/compare/a7c16de8df262dd4596c976bd9338e138184c1af...21edcb8df824ff0e4f1d1a88bc93958df4915bf7 --- View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/compare/a7c16de8df262dd4596c976bd9338e138184c1af...21edcb8df824ff0e4f1d1a88bc93958df4915bf7 You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][debian-astro-team/debian-astro][master] Added splotch to simulation
Ole Streicher pushed to branch master at Debian Astro Team / debian-astro Commits: a7c16de8 by Ole Streicher at 2018-03-11T11:27:23+01:00 Added splotch to simulation - - - - - 1 changed file: - tasks/simulation Changes: = tasks/simulation = --- a/tasks/simulation +++ b/tasks/simulation @@ -38,3 +38,10 @@ Pkg-Description: kinematical backreaction and average scale factor evolution modelling structure formation properly?) and the library is aimed for use by more computationally intensive simulations studying the same family of questions. + +Recommends: splotch +WNPP: 892482 +Homepage: http://wwwmpa.mpa-garching.mpg.de/~kdolag/Splotch/ +Pkg-Description : Ray tracer to visualize SPH simulations + This is some software for high performance visualization of huge + scientific data. View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/commit/a7c16de8df262dd4596c976bd9338e138184c1af --- View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/commit/a7c16de8df262dd4596c976bd9338e138184c1af You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][debian-astro-team/debian-astro][master] Adjust names of q3c and pgspehere postgres extensions
Ole Streicher pushed to branch master at Debian Astro Team / debian-astro Commits: 29bf770f by Ole Streicher at 2018-03-03T10:22:03+01:00 Adjust names of q3c and pgspehere postgres extensions - - - - - 1 changed file: - tasks/development Changes: = tasks/development = --- a/tasks/development +++ b/tasks/development @@ -61,30 +61,7 @@ Pkg-Description: C API to control NexStar compatible telescopes corresponding Orion mounts. Homepage: https://sourceforge.net/projects/libnexstar -Recommends: postgresql-9.6-pgsphere -WNPP: 680188 -Homepage: http://pgsphere.projects.postgresql.org/ -Pkg-Description: Spherical data types for PostgreSQL - PgSphere, an extension for PostgreSQL, aims at providing uniform - access to spherical data. It allows for a fast search and analysis for - objects with spherical attributes in geographical, astronomical, or - other applications using PostgreSQL. - . - By using an SQL interface, PgSphere's users can conveniently manage - data of geographical objects around the world and astronomical data - collections like star and other catalogues. -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-postgresql/pgsphere.git - -Recommends: postgresql-9.6-q3c -WNPP: 680222 -Homepage: http://www.sai.msu.su/~megera/wiki/SkyPixelization -Pkg-Description: PostgreSQL extension used for indexing the sky - Q3C, an extension for PostgreSQL, is designed for the work with large - astronomical catalogues or any catalogs of objects on the sphere. - . - This extension allows a user to perform fast circular, elliptical or - polygonal searches on the sky as well as fast cross-matches. -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-postgresql/postgresql-q3c.git +Recommends: postgresql-pgsphere, postgresql-q3c Recommends: libpluto-jpl-eph-dev WNPP: 891852 View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/commit/29bf770f04ac798f413b03a5b050d3301b6920c5 --- View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/commit/29bf770f04ac798f413b03a5b050d3301b6920c5 You're receiving this email because of your account on salsa.debian.org. ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [Git][debian-astro-team/debian-astro][master] Add pluto-lunar and pluto-jpl-eph to tools and development
Ole Streicher pushed to branch master at Debian Astro Team / debian-astro Commits: b74b93a6 by Ole Streicher at 2018-03-01T21:17:20+01:00 Add pluto-lunar and pluto-jpl-eph to tools and development - - - - - 2 changed files: - tasks/development - tasks/tools Changes: = tasks/development = --- a/tasks/development +++ b/tasks/development @@ -84,4 +84,23 @@ Pkg-Description: PostgreSQL extension used for indexing the sky . This extension allows a user to perform fast circular, elliptical or polygonal searches on the sky as well as fast cross-matches. -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-postgresql/postgresql-q3c.git \ No newline at end of file +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-postgresql/postgresql-q3c.git + +Recommends: libpluto-jpl-eph-dev +WNPP: 891852 +Homepage: https://github.com/bill-gray/jpl_eph +Pkg-Description: Development files to interact with JPL ephemeres data + The position of asteroids and other moving stellar objects on the sky + at different time points is described as ephemeris. The Jet + Propulsion Laboratory is known for a respective database. + . + The package is a build requirement of the pluto-lunar tools. + +Recommends: libpluto-lunar-dev +WNPP: 891856 +Homepage: http://www.projectpluto.com/source.htm#astrocalc +Pkg-Description: Development files for astronomical Lunar library + This package provides a static library and header files to reuse the + routines of the Lunar tools to interpret data on asteroids/comments or + prepare the same for submission to the Minor Planet Center. + = tasks/tools = --- a/tasks/tools +++ b/tasks/tools @@ -32,3 +32,22 @@ Pkg-Description: Universal table translator for astronomy different formats. Tablator can read and write tables in fits, ipac table, hdf5, votable, json, json5, csv, and tsv, and can write html. The emphasis is on speed, so all conversions are done in memory. + +Recommends: pluto-jpl-eph +WNPP: 891852 +Homepage: https://github.com/bill-gray/jpl_eph +Pkg-Description: command line handling of JPL ephemeres data + The position of asteroids and other moving stellar objects on the sky + at different time points is described as ephemeris. The Jet + Propulsion Laboratory is known for a respective database. This + package offers tools to handle individual data sets. + +Recommends: pluto-lunar +WNPP: 891856 +Homepage: http://www.projectpluto.com/source.htm#astrocalc +Pkg-Description: routines for predictions of positions in solar system + Basic astronomical functions for solar system ephemerides, time systems, + coordinate systems, etc. This includes some utilities based on these + functions, such as a calendar computer and a utility to numerically + integrate asteroid orbits. + View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/commit/b74b93a66ae66607d23b403ffcb0df979c488482 --- View it on GitLab: https://salsa.debian.org/debian-astro-team/debian-astro/commit/b74b93a66ae66607d23b403ffcb0df979c488482 You're receiving this email because of your account on salsa.debian.org. ___ 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. 8db2dc0b5a98a05902ffeef14197c2153485d204
The following commit has been merged in the master branch: commit 8db2dc0b5a98a05902ffeef14197c2153485d204 Author: Ole Streicher Date: Mon Jun 19 10:22:31 2017 +0200 Update installation section for Debian Stretch diff --git a/webtools/templates/debian-astro_idx.xhtml b/webtools/templates/debian-astro_idx.xhtml index c481551..928a5e9 100644 --- a/webtools/templates/debian-astro_idx.xhtml +++ b/webtools/templates/debian-astro_idx.xhtml @@ -95,22 +95,10 @@ On an existing Debian Stretch installation, you can get the $projectname 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 $projectname - 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: $projectname is not available under Debian - Jessie. Our plan is to deliver the first version together with - Debian Stretch. + its metapackages. To get a comprehensive + selection of packages, you also may install the package + https://packages.debian.org/stretch/astro-all";>astro-all + with the command sudo apt install astro-all. -- 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. b6f6ebaec6676858ec59e695710953e01dde2958
The following commit has been merged in the master branch: commit b6f6ebaec6676858ec59e695710953e01dde2958 Author: Ole Streicher Date: Thu Apr 6 12:19:36 2017 +0200 Apply the remark also to pgplot5 diff --git a/tasks/viewing b/tasks/viewing index 2367e71..a7c5ea9 100644 --- a/tasks/viewing +++ b/tasks/viewing @@ -59,6 +59,7 @@ Suggests: jeuclid-mathviewer Suggests: texlive-pictures Suggests: pgplot5 +Remark: Giza-dev is a DFSG-free replacement for pgplot5. Depends: giza-dev Remark: Giza-dev is a DFSG-free replacement for pgplot5. -- 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, experimental, updated. 6eca84bb1ae75d000dc4a36b9f814fdec228302d
The following commit has been merged in the experimental branch: commit 6eca84bb1ae75d000dc4a36b9f814fdec228302d Author: Ole Streicher Date: Thu Apr 6 12:19:36 2017 +0200 Apply the remark also to pgplot5 diff --git a/tasks/viewing b/tasks/viewing index 2367e71..a7c5ea9 100644 --- a/tasks/viewing +++ b/tasks/viewing @@ -59,6 +59,7 @@ Suggests: jeuclid-mathviewer Suggests: texlive-pictures Suggests: pgplot5 +Remark: Giza-dev is a DFSG-free replacement for pgplot5. Depends: giza-dev Remark: Giza-dev is a DFSG-free replacement for pgplot5. -- 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, experimental, updated. ab9317f23762ee6531ee528d3c3cce8aab674d90
The following commit has been merged in the experimental branch: commit ab9317f23762ee6531ee528d3c3cce8aab674d90 Author: Ole Streicher Date: Tue Apr 4 09:52:41 2017 +0200 Add giza-dev (pgplot5 replacement) to viewing diff --git a/tasks/viewing b/tasks/viewing index f4744ce..8c6da28 100644 --- a/tasks/viewing +++ b/tasks/viewing @@ -58,8 +58,10 @@ Suggests: jeuclid-mathviewer Suggests: texlive-pictures +Depends: giza-dev Suggests: pgplot5 -Why: non-free +Remark: + Giza-dev is a DFSG-free replacement for pgplot5. Suggests: r-cran-plotrix, r-cran-colorspace, r-cran-labeling, r-cran-scales, r-cran-ggplot2, r-cran-scatterplot3d, r-cran-vioplot, r-cran-shape, r-cran-qqman -- 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. 9e5dcb11465b0b392e60c0d0f9634990bc054bd8
The following commit has been merged in the master branch: commit 9e5dcb11465b0b392e60c0d0f9634990bc054bd8 Author: Ole Streicher Date: Sat Feb 25 15:38:32 2017 +0100 Remove additional info of jel diff --git a/tasks/mathematics-dev b/tasks/mathematics-dev index 3d5c883..865e3d0 100644 --- a/tasks/mathematics-dev +++ b/tasks/mathematics-dev @@ -259,17 +259,3 @@ Depends: libp4est-dev Depends: coinor-libcoinmp-dev Depends: jel-java -WNPP: 661824 -Homepage: https://www.gnu.org/software/jel/ -Pkg-Description: Library for evaluating algebraic expressions in Java - The JEL library enables users to enter algebraic expressions into their - program. Since JEL converts expressions directly into Java bytecode, - it significantly speeds up their evaluation time. If the user's Java - virtual machine has a JIT compiler, expressions are transparently - compiled into native machine code. - . - JEL may be a very useful tool for a variety of applications in science - involving user-defined functions, e.g. to create plots, to apply fits - to a data set and to solve integrals or differential equations. - Another relevant use case for JEL is given by algebraic operations - between two or more columns of a database table. -- 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. bddf8fb60ff66374aef44c293b32de5cf814443a
The following commit has been merged in the master branch: commit bddf8fb60ff66374aef44c293b32de5cf814443a Author: Ole Streicher Date: Tue Feb 21 17:44:42 2017 +0100 Add jel-java to mathematics diff --git a/tasks/mathematics-dev b/tasks/mathematics-dev index d3b5700..3d5c883 100644 --- a/tasks/mathematics-dev +++ b/tasks/mathematics-dev @@ -257,3 +257,19 @@ Depends: libdeal.ii-dev Depends: libp4est-dev Depends: coinor-libcoinmp-dev + +Depends: jel-java +WNPP: 661824 +Homepage: https://www.gnu.org/software/jel/ +Pkg-Description: Library for evaluating algebraic expressions in Java + The JEL library enables users to enter algebraic expressions into their + program. Since JEL converts expressions directly into Java bytecode, + it significantly speeds up their evaluation time. If the user's Java + virtual machine has a JIT compiler, expressions are transparently + compiled into native machine code. + . + JEL may be a very useful tool for a variety of applications in science + involving user-defined functions, e.g. to create plots, to apply fits + to a data set and to solve integrals or differential equations. + Another relevant use case for JEL is given by algebraic operations + between two or more columns of a database table. -- 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. cb5e9b569ae3e6b646ba5fc43a44513ff00fd825
The following commit has been merged in the master branch: commit cb5e9b569ae3e6b646ba5fc43a44513ff00fd825 Author: Ole Streicher Date: Tue Jan 24 17:54:23 2017 +0100 Fix typo in astro-virtual-observatory and again depend on it diff --git a/debian/changelog b/debian/changelog index 815d021..c48ca6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +debian-science (1.7) UNRELEASED; urgency=medium + + * Fix typo in astro-virtual-observatory and again depend on it + + -- Ole Streicher Tue, 24 Jan 2017 17:52:54 +0100 + debian-science (1.6) unstable; urgency=medium [ Alastair McKinstry ] diff --git a/debian/control b/debian/control index 48fa93a..13f4316 100644 --- a/debian/control +++ b/debian/control @@ -37,8 +37,8 @@ Depends: astro-catalogs, astro-simulation, astro-telescopecontrol, astro-tools, - astro-viewers -Suggests: astro-virtualobservatory + astro-viewers, + astro-virtual-observatory Description: Debian Science Astronomy 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 diff --git a/debian/control.stub b/debian/control.stub index 0fd9fb2..4fdd884 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -36,8 +36,8 @@ Depends: astro-catalogs, astro-simulation, astro-telescopecontrol, astro-tools, - astro-viewers -Suggests: astro-virtualobservatory + astro-viewers, + astro-virtual-observatory Description: Debian Science Astronomy 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] blends-dev branch, master, updated. 8ee14419caa52cbd28956825923d4cc499f7fff5
The following commit has been merged in the master branch:
commit 8ee14419caa52cbd28956825923d4cc499f7fff5
Author: Ole Streicher
Date: Mon Dec 5 10:06:23 2016 +0100
Revert "Set blends-tasks to priority:optional. (Closes: #846002)"
This reverts commit 72387d598bcd95f132c838745422e70359b1264f.
diff --git a/debian/changelog b/debian/changelog
index 6a81332..aac0b65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-blends (0.6.97) UNRELEASED; urgency=medium
-
- * Set blends-tasks to priority:optional. (Closes: #846002)
-
- -- Holger Levsen Sun, 27 Nov 2016 18:07:38 +0100
-
blends (0.6.96) unstable; urgency=medium
* Use (= ${source:Version}) for arch:all depends
diff --git a/debian/control b/debian/control
index 24b8cad..e5c4d03 100644
--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,7 @@ Description: Debian Pure Blends documentation
Package: blends-tasks
Architecture: all
-Priority: optional
+Priority: important
Section: misc
Depends: ${misc:Depends},
tasksel
@@ -76,4 +76,4 @@ Description: Debian Pure Blends tasks for new installations
invocation of tasksel enables the choice of individual tasks.
.
The package is intended to be installed in the base system. Later
- (un)installation is harmless, but has no effect.
+ (un)installation is harmless, but has no effect.
\ No newline at end of file
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. d441eadb94015661074deed0c7f0122722185b50
The following commit has been merged in the master branch:
commit d441eadb94015661074deed0c7f0122722185b50
Author: Ole Streicher
Date: Tue Nov 15 10:03:36 2016 +0100
Remove warnings about undefined $_
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 4cb8bdf..42e6090 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -565,6 +565,7 @@ sub load_task {
my $header;
for $header (qw(Depends Recommends Suggests)) {
+ last if !defined $_;
if (m/^$header:\s+(.+)$/ && $1 !~ /^\s*$/) {
my $pkgs = $1;
$pkgs =~ s/\s*\\//;
@@ -595,6 +596,8 @@ sub load_task {
}
}
+next unless defined $_;
+
if (/^Avoid:\s+(.+)$/) {
my @pkgs = split(/\s*,\s*/, $1);
my $packages;
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 4c71dbe118703d32f5e4a4e21d8c24fea28646e9
The following commit has been merged in the master branch:
commit 4c71dbe118703d32f5e4a4e21d8c24fea28646e9
Author: Ole Streicher
Date: Thu Nov 10 22:35:51 2016 +0100
Remove backslashes from RFC834 continuation lines
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 1b4298d..4cb8bdf 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -567,10 +567,12 @@ sub load_task {
for $header (qw(Depends Recommends Suggests)) {
if (m/^$header:\s+(.+)$/ && $1 !~ /^\s*$/) {
my $pkgs = $1;
+ $pkgs =~ s/\s*\\//;
while () {
last if (m/^\S+/ || m/^\s*$/);
+ chop $_;
+ $_ =~ s/\s*\\//;
$pkgs .= $_;
- chomp $pkgs;
}
$taskinfo{$curpkg}{$header} = ()
if (! exists $taskinfo{$curpkg}{$header});
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 8c76c06be31c92c3eca5d1ae43b60cccf34fdfd2
The following commit has been merged in the master branch:
commit 8c76c06be31c92c3eca5d1ae43b60cccf34fdfd2
Author: Ole Streicher
Date: Thu Nov 10 13:48:21 2016 +0100
When adding RFC822 style line continuations in dependencies, remove
trailing newlines.
They are not handled by process_pkglist()
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index cde3237..1b4298d 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -570,6 +570,7 @@ sub load_task {
while () {
last if (m/^\S+/ || m/^\s*$/);
$pkgs .= $_;
+ chomp $pkgs;
}
$taskinfo{$curpkg}{$header} = ()
if (! exists $taskinfo{$curpkg}{$header});
--
Git repository for blends code
___
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. 8c06600d4314d4bce190b717265849a32188da28
The following commit has been merged in the master branch: commit 8c06600d4314d4bce190b717265849a32188da28 Author: Ole Streicher Date: Mon Oct 10 11:07:56 2016 +0200 Add libsopt-dev to mathematics-dev diff --git a/tasks/mathematics-dev b/tasks/mathematics-dev index 95bfc0a..cec9453 100644 --- a/tasks/mathematics-dev +++ b/tasks/mathematics-dev @@ -227,3 +227,6 @@ Depends: python3-dtcwt | python-dtcwt Suggests: jsurf-alggeo Depends: python3-pyfftw | python-pyfftw + +Depends: libsopt-dev +WNPP: 832659 -- 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. ab2a0527dc3c95302074e8ede54cd8a47df95ae3
The following commit has been merged in the master branch:
commit ab2a0527dc3c95302074e8ede54cd8a47df95ae3
Author: Ole Streicher
Date: Sat Sep 3 13:52:09 2016 +0200
Show description entry only if long description exists
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 7b91e7d..382d9fa 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -337,40 +337,42 @@ function show_fulldesc(hash) {
-
-
-
- https://screenshots.debian.net/package/${project.properties['name']}">
-
-
-
-
- Other
screenshots of package ${project.properties['name']}
- VersionURL
-
- ${screenshot['version']}${screenshot['url']}
-
-
-
-
-
-
-
- Description
-
-
-
+
-
- https://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.properties['name']}">
- ✏
-
-
${render_longdesc(project.properties['desc'][lang].get('long', ''))}
+
+
+ https://screenshots.debian.net/package/${project.properties['name']}">
+
+
+
+
+ Other
screenshots of package ${project.properties['name']}
+ VersionURL
+
+ ${screenshot['version']}${screenshot['url']}
+
+
+
+
+
-
${render_longdesc(project.properties['desc']['en'].get('long',''))}
+
+ Description
+
-
+
+
+
+ https://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${project.properties['name']}">
+ ✏
+
+
${render_longdesc(project.properties['desc'][lang].get('long', ''))}
+
+
${render_longdesc(project.properties['desc']['en'].get('long',''))}
+
+
+
Reference
--
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. a98156175e762332835c440830a9b7a2ef2c3f1c
The following commit has been merged in the master branch: commit a98156175e762332835c440830a9b7a2ef2c3f1c Author: Ole Streicher Date: Tue Jul 26 10:07:00 2016 +0200 Update dependencies of astronomy transitional packages diff --git a/debian/control b/debian/control index 059130f..ec05566 100644 --- a/debian/control +++ b/debian/control @@ -32,12 +32,13 @@ Depends: astro-catalogs, astro-frameworks, astro-gdl, astro-publication, - astro-python, astro-python3, + astro-radioastronomy, astro-simulation, astro-telescopecontrol, astro-tools, - astro-viewers + astro-viewers, + astro-virtualobservatory Description: Debian Science Astronomy 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 diff --git a/debian/control.stub b/debian/control.stub index 4048b71..4864428 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -31,12 +31,13 @@ Depends: astro-catalogs, astro-frameworks, astro-gdl, astro-publication, - astro-python, astro-python3, + astro-radioastronomy, astro-simulation, astro-telescopecontrol, astro-tools, - astro-viewers + astro-viewers, + astro-virtualobservatory Description: Debian Science Astronomy 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. d363f9d5923d0397f34dbf1bd36e4300e261e003
The following commit has been merged in the master branch:
commit d363f9d5923d0397f34dbf1bd36e4300e261e003
Author: Ole Streicher
Date: Tue Jul 19 09:41:53 2016 +0200
Enable "Go tagging" for contrib/non-free packages
diff --git a/webtools/templates/tasks.xhtml b/webtools/templates/tasks.xhtml
index f42c3f6..c9dd43a 100644
--- a/webtools/templates/tasks.xhtml
+++ b/webtools/templates/tasks.xhtml
@@ -127,9 +127,7 @@
https://debtags.debian.org/edit/${project.properties['name']}">Edit
Debtags
- https://debtags.debian.org/edit/${project.properties['name']}">Go
tagging
--
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. 3665ae4f2cc7ad6b1910d6cc1ba84dca4ce55ce0
The following commit has been merged in the master branch:
commit 3665ae4f2cc7ad6b1910d6cc1ba84dca4ce55ce0
Author: Ole Streicher
Date: Wed Jul 6 22:07:36 2016 +0200
In package list, show Debian section only when relevant
diff --git a/webtools/templates/packages.xhtml
b/webtools/templates/packages.xhtml
index 2a2befc..f738439 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -510,53 +510,55 @@ function show_fulldesc(hash) {
- Debian
-
-
-
-
- https://bugs.debian.org/${project.properties['wnpp']}">
- Announcement
-
-
-
-
-
- NEW
entry
-
-
-
-
- https://tracker.debian.org/pkg/${project.properties['name']}">
- Maintainer page
-
-
-
-
-
- https://bugs.debian.org/cgi-bin/pkgreport.cgi?repeatmerged=no&src=${project.properties['name']}">
- Bugs
-
-
-
-
-
-
-
-
- ${project.properties['vcs'].get('type',
'Vcs')}
-
-
-
-
- ${project.properties['vcs'].get('type',
'Vcs')}
-
-
-
-
-
-
-
+
+ Debian
+
+
+
+
+ https://bugs.debian.org/${project.properties['wnpp']}">
+ Announcement
+
+
+
+
+
+ NEW
entry
+
+
+
+
+ https://tracker.debian.org/pkg/${project.properties['name']}">
+ Maintainer page
+
+
+
+
+
+ https://bugs.debian.org/cgi-bin/pkgreport.cgi?repeatmerged=no&src=${project.properties['name']}">
+ Bugs
+
+
+
+
+
+
+
+
+ ${project.properties['vcs'].get('type',
'Vcs')}
+
+
+
+
+ ${project.properties['vcs'].get('type',
'Vcs')}
+
+
+
+
+
+
+
+
Upstream
--
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
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
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&searchon=names&exact=1&suite=all§ion=all'
+PKGURLMASK =
'https://packages.debian.org/search?keywords=%s&searchon=names&exact=1&suite=all§ion=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&sc=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&searchon=names&exact=1&suite=all§ion=all'
+PKGURLMASK =
'https://packages.debian.org/search?keywords=%s&searchon=names&exact=1&suite=all§ion=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/', '/ws
[Blends-commit] [SCM] website branch, master, updated. 93f6b5be1b1a54cf5db54fc10da0cb405af4c4ef
The following commit has been merged in the master branch: commit 93f6b5be1b1a54cf5db54fc10da0cb405af4c4ef Author: Ole Streicher Date: Mon Jun 20 10:22:30 2016 +0200 Consequently use https:// in Debian Astro web pages diff --git a/www/astro/contact.html b/www/astro/contact.html index f073124..af727fa 100644 --- a/www/astro/contact.html +++ b/www/astro/contact.html @@ -3,20 +3,20 @@ Debian Astro Contact -http://www.debian.org/debhandheld.css"; media="screen" +https://www.debian.org/debhandheld.css"; media="screen" rel="stylesheet" type="text/css" /> -http://www.debian.org/debian.css"; rel="stylesheet" +https://www.debian.org/debian.css"; rel="stylesheet" type="text/css" /> -http://blends.debian.org/css/blends.css"; rel="stylesheet" +https://blends.debian.org/css/blends.css"; rel="stylesheet" type="text/css" /> -http://www.debian.org/favicon.ico"; /> +https://www.debian.org/favicon.ico"; /> - http://www.debian.org/"; title="Debian Home"> - http://www.debian.org/Pics/openlogo-50.png"; + https://www.debian.org/"; title="Debian Home"> + https://www.debian.org/Pics/openlogo-50.png"; alt="Debian" width="50" height= "61" /> Pure Blend @@ -30,7 +30,7 @@ - http://blends.debian.org";>Debian Pure Blends + https://blends.debian.org";>Debian Pure Blends / Debian Astro / contact @@ -51,13 +51,13 @@ IRC: #debian-astro - on http://oftc.net/";>OFTC + on https://oftc.net/";>OFTC The source code powering these pages is available - http://anonscm.debian.org/cgit/blends/website.git";>here. + https://anonscm.debian.org/cgit/blends/website.git";>here. Debian is a registered trademark of http://www.spi-inc.org/";>Software in the Public diff --git a/www/astro/contribute.html b/www/astro/contribute.html index 205376c..0820018 100644 --- a/www/astro/contribute.html +++ b/www/astro/contribute.html @@ -3,20 +3,20 @@ Contribute to Debian Astro -http://www.debian.org/debhandheld.css"; media="screen" +https://www.debian.org/debhandheld.css"; media="screen" rel="stylesheet" type="text/css" /> -http://www.debian.org/debian.css"; rel="stylesheet" +https://www.debian.org/debian.css"; rel="stylesheet" type="text/css" /> -http://blends.debian.org/css/blends.css"; rel="stylesheet" +https://blends.debian.org/css/blends.css"; rel="stylesheet" type="text/css" /> -http://www.debian.org/favicon.ico"; /> +https://www.debian.org/favicon.ico"; /> - http://www.debian.org/"; title="Debian Home"> - http://www.debian.org/Pics/openlogo-50.png"; + https://www.debian.org/"; title="Debian Home"> + https://www.debian.org/Pics/openlogo-50.png"; alt="Debian" width="50" height= "61" /> Pure Blend @@ -30,7 +30,7 @@ - http://blends.debian.org";>Debian Pure Blends + https://blends.debian.org";>Debian Pure Blends / Debian Astro / contribute @@ -39,7 +39,7 @@ Contributing to Debian Astro Like Debian itself, Debian Astro is a volunteer project that is developed in the open. Our packaging code is organized in - http://anonscm.debian.org/cgit/debian-astro/packages/";> + https://anonscm.debian.org/cgit/debian-astro/packages/";> git repositories and contains mainly code under a @@ -86,7 +86,7 @@ https://alioth.debian.org/project/request.php?group_id=100893";> request a membership in debian-astro. We have no dedicated team policy yet and mainly adopt the general - http://debian-science.alioth.debian.org/debian-science-policy.html";> + https://debian-science.alioth.debian.org/debian-science-policy.html";> Debian Science Policy. There are already some packaging tutorials as well, for example for @@ -114,12 +114,12 @@ - http://blends.debian.org/astro/bugs/";> + https://blends.debian.org/astro/bugs/&quo
[Blends-commit] [SCM] blends-dev branch, master, updated. 4f725832f65f89e3be401392ab103de16b8a7fed
The following commit has been merged in the master branch: commit 4f725832f65f89e3be401392ab103de16b8a7fed Author: Ole Streicher Date: Tue May 24 22:16:12 2016 +0200 Exchange key and package list in debian-blends-tasks.desc (key is -all package now) This means that by default only those blends will be shown in the installer that have a -all package. So, when the blends maintainers are unaware of the Debian Installer stuff, their blend will not included with a possibly wrong or empty list. diff --git a/debian-blends-tasks.desc b/debian-blends-tasks.desc index 14168a5..4f1c8ab 100644 --- a/debian-blends-tasks.desc +++ b/debian-blends-tasks.desc @@ -19,9 +19,9 @@ Description: Debian Science (common) to many science fields, like presentation or numerical computation. Test-new-install: show skip Key: - science-tasks -Packages: list science-all +Packages: list + science-tasks Task: debian-astro Parent: debian-blends @@ -31,9 +31,9 @@ Description: Debian Astro goal to support both professional and amateur astronomers. Test-new-install: show skip Key: - astro-tasks -Packages: list astro-all +Packages: list + astro-tasks Task: debichem Parent: debian-blends @@ -45,9 +45,9 @@ Description: DebiChem teams are available in the Debichem metapackages. Test-new-install: show skip Key: - debichem-tasks -Packages: list debichem-all +Packages: list + debichem-tasks Task: debian-games Parent: debian-blends @@ -56,9 +56,9 @@ Description: Debian Games The goal of Debian Games is to provide games in Debian from arcade and aventure to simulation and strategy. Test-new-install: show skip -Key: games-tasks +Key: games-all Packages: list - games-all + games-tasks Task: debian-med Parent: debian-blends @@ -73,9 +73,9 @@ Description: Debian Med bioinformatics, clinic IT infrastructure, and others within Debian OS. Test-new-install: show skip Key: - med-tasks -Packages: list med-all +Packages: list + med-tasks Task: debian-edu Parent: debian-blends @@ -89,9 +89,9 @@ Description: Debian Edu community. Test-new-install: show skip Key: - education-tasks -Packages: list education-all +Packages: list + education-tasks Task: debian-gis Parent: debian-blends @@ -102,9 +102,9 @@ Description: Debian GIS applications and users. Test-new-install: show skip Key: - gis-tasks -Packages: list gis-all +Packages: list + gis-tasks Task: debian-junior Parent: debian-blends @@ -118,9 +118,9 @@ Description: Debian Junior using Debian without any special modifications. Test-new-install: show skip Key: - junior-tasks -Packages: list junior-all +Packages: list + junior-tasks Task: debian-multimedia Parent: debian-blends @@ -133,9 +133,9 @@ Description: DebianMultimedia projects in order to improve audio/video support in Debian. Test-new-install: show skip Key: - multimedia-tasks -Packages: list multimedia-all +Packages: list + multimedia-tasks Task: debian-accessibility Parent: debian-blends @@ -146,9 +146,9 @@ Description: Debian Accessibility requirements of people with disabilities. Test-new-install: show skip Key: - accessibility-tasks -Packages: list accessibility-all +Packages: list + accessibility-tasks Task: debian-ezgo Parent: debian-blends @@ -162,9 +162,9 @@ Description: Debian EzGo Afghanistan, Indonesia, Vietnam using Debian. Test-new-install: show skip Key: - ezgo-tasks -Packages: list ezgo-all +Packages: list + ezgo-tasks Task: debian-hamradio Parent: debian-blends @@ -176,6 +176,6 @@ Description: Hamradio radio amateurs. Test-new-install: show skip Key: - hamradio-tasks -Packages: list hamradio-all +Packages: list + hamradio-tasks -- Git repository for blends code ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 5deee96baecb8e7ad2d8918c161d7f39ea58c239
The following commit has been merged in the master branch:
commit 5deee96baecb8e7ad2d8918c161d7f39ea58c239
Author: Ole Streicher
Date: Tue May 24 21:38:20 2016 +0200
Use as prefix for the -all package
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 681eaf0..9d3ad76 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -192,7 +192,7 @@ sub gen_control {
}
}
if (@recommends) {
- print "Package: $blendshortname-all\n";
+ print "Package: " . $prefix . "all\n";
print "Section: metapackages\n" ;
print "Architecture: all\n";
print("Recommends: ", join(",\n ", @recommends),"\n");
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. ccddef8453cbc21e5ae940a60080d6f6d92f1dcb
The following commit has been merged in the master branch:
commit ccddef8453cbc21e5ae940a60080d6f6d92f1dcb
Author: Ole Streicher
Date: Tue May 24 15:19:28 2016 +0200
Dont put tasks that are not metapackages into the tasks desc
This is the case f.e. for debian-astro/fedora which is informational only.
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index ca627e9..681eaf0 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -295,6 +295,8 @@ sub print_task_desc {
foreach my $task (sort keys %taskinfo) {
next if (exists $taskinfo{$task}{'Leaf'} &&
$taskinfo{$task}{'Leaf'} eq 'false');
+ next if (exists $taskinfo{$task}{'Metapackage'} &&
+$taskinfo{$task}{'Metapackage'} eq 'false');
my $header;
if ( $suppressempty && $taskinfo{$task}{'haspackages'} == 0 ) {
# Check for Test-always-lang header. If this field exists
the
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 2f0df8d1831fd0710564c8ab68ce38ef5df34955
The following commit has been merged in the master branch: commit 2f0df8d1831fd0710564c8ab68ce38ef5df34955 Author: Ole Streicher Date: Tue May 24 12:20:59 2016 +0200 Mention the two last commits in d/changelog diff --git a/debian/changelog b/debian/changelog index f64bcde..697df4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ blends (0.6.94) UNRELEASED; urgency=medium * Adjust description of Debian Science: install only common tasks + * Make the default install opt-in instead of opt-out, and create the +-all package only when there were tasks opted-in as default +install. Closes: 825004 -- Ole Streicher Thu, 28 Apr 2016 11:57:38 +0200 -- Git repository for blends code ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 784d3a0ddc635e1305f6bc489ef7fb97d63c88a1
The following commit has been merged in the master branch:
commit 784d3a0ddc635e1305f6bc489ef7fb97d63c88a1
Author: Ole Streicher
Date: Tue May 24 12:16:09 2016 +0200
Suppress the creation of the -all package if no task to be installed
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index bd12c3b..ca627e9 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -178,9 +178,6 @@ sub uniq {
sub gen_control {
my $task;
-print "Package: $blendshortname-all\n";
-print "Section: metapackages\n" ;
-print "Architecture: all\n";
my @recommends;
my @suggests;
for $task (sort keys %taskinfo) {
@@ -194,11 +191,16 @@ sub gen_control {
push (@suggests, $task)
}
}
-print("Recommends: ", join(",\n ", @recommends),"\n") if @recommends;
-print("Suggests: ", join(",\n ", @suggests),"\n") if @suggests;
-print "Description: Default selection of tasks for $blendtitle\n";
-print " This package is part of the $blendtitle Pure Blend and installs
all\n";
-print " tasks for a default installation of this blend.\n\n";
+if (@recommends) {
+ print "Package: $blendshortname-all\n";
+ print "Section: metapackages\n" ;
+ print "Architecture: all\n";
+ print("Recommends: ", join(",\n ", @recommends),"\n");
+ print("Suggests: ", join(",\n ", @suggests),"\n") if @suggests;
+ print "Description: Default selection of tasks for $blendtitle\n";
+ print " This package is part of the $blendtitle Pure Blend and installs
all\n";
+ print " tasks for a default installation of this blend.\n\n";
+}
for $task (sort keys %taskinfo) {
next if (exists $taskinfo{$task}{'Metapackage'} &&
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 784d3a0ddc635e1305f6bc489ef7fb97d63c88a1
The following commit has been merged in the master branch:
commit 9987bd1c6f60ca8e4f955d16b784f9284500e152
Author: Ole Streicher
Date: Tue May 24 12:08:50 2016 +0200
Install a task in the Debian installer as opt-in instead of opt-out
This means that a task should have now a "Install: true" in the header field
for the tasks that should be installed during Debian installation when the
blend is selected.
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 7b7756c..bd12c3b 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -188,10 +188,10 @@ sub gen_control {
$taskinfo{$task}{'Metapackage'} eq 'false');
next if ( $suppressempty && $taskinfo{$task}{'haspackages'} == 0 );
if (exists $taskinfo{$task}{'Install'} &&
- $taskinfo{$task}{'Install'} eq 'false') {
- push (@suggests, $task)
- } else {
+ $taskinfo{$task}{'Install'} eq 'true') {
push (@recommends, $task)
+ } else {
+ push (@suggests, $task)
}
}
print("Recommends: ", join(",\n ", @recommends),"\n") if @recommends;
@@ -319,8 +319,8 @@ sub print_task_desc {
print "$taskinfo{$task}{'Description-long'}"; # Already
contain newline
print "Enhances: $taskinfo{$task}{Enhances}\n"
if exists $taskinfo{$task}{Enhances};
- if (!exists $taskinfo{$task}{'Install'} ||
- $taskinfo{$task}{'Install'} ne 'false') {
+ if (exists $taskinfo{$task}{'Install'} &&
+ $taskinfo{$task}{'Install'} eq 'true') {
print "Test-new-install: mark show\n";
}
for $header (keys %{$taskinfo{$task}}) {
--
Git repository for blends code
___
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. 57cc98f7db796390f8f200a179115a1d0504446f
The following commit has been merged in the master branch: commit 57cc98f7db796390f8f200a179115a1d0504446f Author: Ole Streicher Date: Tue May 24 12:03:33 2016 +0200 Add Install: true for all tasks that should be installed by default diff --git a/tasks/bci b/tasks/bci index 97443fe..f833271 100644 --- a/tasks/bci +++ b/tasks/bci @@ -1,5 +1,6 @@ Task: Brain-computer interface Metapackage: false +Install: true Description: Debian Science Brain-computer interface packages Debian Science packages for the design and use of brain-computer interface (BCI) -- direct communication pathway diff --git a/tasks/dataacquisition b/tasks/dataacquisition index f9a6614..ae0ecaf 100644 --- a/tasks/dataacquisition +++ b/tasks/dataacquisition @@ -1,4 +1,5 @@ Task: Data acquisition +Install: true Description: Debian Science data acquisition packages This metapackage will install Debian Science packages related to data acquisition. This might be used in several sciences (as for instance diff --git a/tasks/dataacquisition-dev b/tasks/dataacquisition-dev index cf2c290..b67e7f3 100644 --- a/tasks/dataacquisition-dev +++ b/tasks/dataacquisition-dev @@ -1,4 +1,5 @@ Task: Data acquisition development +Install: true Description: Debian Science data acquisition development packages This metapackage will install Debian Science packages which are helpful to develop applications related to data acquisition. This might be diff --git a/tasks/devices b/tasks/devices index 9ffa83f..3a2faf8 100644 --- a/tasks/devices +++ b/tasks/devices @@ -1,5 +1,6 @@ Task: Devices Metapackage: false +Install: true Description: Debian Science specific devices support This task lists Debian Science packages which are dedicated to specific devices that are typically used in sciences. This might reach from diff --git a/tasks/distributedcomputing b/tasks/distributedcomputing index 9af73b2..4b72bcb 100644 --- a/tasks/distributedcomputing +++ b/tasks/distributedcomputing @@ -1,4 +1,5 @@ Task: Distributed Computing +Install: true Description: Debian Science Distributed Computing packages This metapackage will install Debian Science packages useful for various types of distributed computing, such as grid-, cloud-, cluster- diff --git a/tasks/imageanalysis b/tasks/imageanalysis index 31f2d3c..5f2ac09 100644 --- a/tasks/imageanalysis +++ b/tasks/imageanalysis @@ -1,4 +1,5 @@ Task: Image analysis +Install: true Description: Debian Science image analysis packages This metapackage will install Debian Science packages related to scientific image acquisition. This might be used in several diff --git a/tasks/imageanalysis-dev b/tasks/imageanalysis-dev index faa5f5a..a44b8a7 100644 --- a/tasks/imageanalysis-dev +++ b/tasks/imageanalysis-dev @@ -1,4 +1,5 @@ Task: Image analysis development +Install: true Description: Debian Science development of image analysis applications This metapackage will install Debian Science development libraries to develop scientific image analysis applications acquisitions. diff --git a/tasks/machine-learning b/tasks/machine-learning index 8f7030a..1a14bd6 100644 --- a/tasks/machine-learning +++ b/tasks/machine-learning @@ -1,4 +1,5 @@ Task: Machine Learning +Install: true Description: Debian Science Machine Learning packages This metapackage will install Debian packages which might be useful for scientists interested in machine learning. Included packages range diff --git a/tasks/numericalcomputation b/tasks/numericalcomputation index d442b1e..47651d6 100644 --- a/tasks/numericalcomputation +++ b/tasks/numericalcomputation @@ -1,4 +1,5 @@ Task: Numerical Computation +Install: true Description: Debian Science Numerical Computation packages This metapackage will install Debian Science packages useful for numerical computation. The packages provide an array oriented diff --git a/tasks/presentation b/tasks/presentation index 928fd39..60aad6f 100644 --- a/tasks/presentation +++ b/tasks/presentation @@ -1,4 +1,5 @@ Task: Presentation +Install: true Description: Debian Science generic tools for presentations This metapackage will install Debian Science some packages which are useful for doing presentations for instance on scientific conferences. diff --git a/tasks/simulations b/tasks/simulations index fd28dd1..bdd81a2 100644 --- a/tasks/simulations +++ b/tasks/simulations @@ -1,4 +1,5 @@ Task: Simulations +Install: true Description: Debian Science Simulation packages This metapackage will install Debian Science packages that are used to do simulations in different fields of science. diff --git a/tasks/statistics b/tasks/statistics index c4ab7ee..30930c6 100644 --- a/tasks/statistics +++ b/tasks/statistics @@ -1,4 +1,5 @@ Task: Statistics +Install: true Description: Debian Science Statistics packages This metapackage is part of the Debian Pure Blend "Debian Science" and installs packages related to statistics. This task is a general diff --git a/tasks/too
[Blends-commit] [SCM] website branch, master, updated. 8f58caa67a06c12c5405cc56bb32911c62be4bd1
The following commit has been merged in the master branch:
commit 8f58caa67a06c12c5405cc56bb32911c62be4bd1
Author: Ole Streicher
Date: Thu May 12 15:34:04 2016 -0300
Disable the special handling of URLs in the descriptions.
This is already handled in markdown itself, and the disabled lines
produce wrong results if the line already contains markdown conform code,
like `line = '... [Scisoft](http://www.eso.org/scisoft)'`.
diff --git a/webtools/blendsmarkdown.py b/webtools/blendsmarkdown.py
index 4710daf..b637162 100644
--- a/webtools/blendsmarkdown.py
+++ b/webtools/blendsmarkdown.py
@@ -62,11 +62,14 @@ def PrepareMarkdownInput(lines):
# otherwise
if line.startswith('#'):
ret += '\\'
-if detect_url_re.search(line):
-# some descriptions put URLs in '<>' which is unneeded and might
-# confuse the parsing of '&' in URLs which is needed sometimes
-line = re.sub('<*([fh]t?tp://[-./\w?=~;&%]+)>*',
- '[\\1](\\1)', line)
+# The following is already handled by markdown itself, but confuses the
+# use of Markdown in the description, like for
+# line = '... [Scisoft](http://www.eso.org/scisoft)'
+#if detect_url_re.search(line):
+## some descriptions put URLs in '<>' which is unneeded and might
+## confuse the parsing of '&' in URLs which is needed sometimes
+#line = re.sub('<*([fh]t?tp://[-./\w?=~;&%]+)>*',
+# '[\\1](\\1)', line)
ret += line + "\n"
return ret
--
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. 499434f7a0328289e6946cbc817155b728887133
The following commit has been merged in the master branch:
commit 499434f7a0328289e6946cbc817155b728887133
Author: Ole Streicher
Date: Thu May 5 09:18:34 2016 -0300
Re-add class for version/popconn column
diff --git a/webtools/templates/tasks.xhtml b/webtools/templates/tasks.xhtml
index ae6f7ab..be9087f 100644
--- a/webtools/templates/tasks.xhtml
+++ b/webtools/templates/tasks.xhtml
@@ -96,7 +96,7 @@
mailto:${project.properties['maintainer']['email']}">${project.properties['maintainer']['name']}
(mailto:${project.properties['uploader']['email']}">${project.properties['uploader']['name']})
-
+
Versions of
package ${project.properties['name']}
--
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. 8560b675a4882040be365f1ee7a40dc8f2a8cc59
The following commit has been merged in the master branch:
commit 8560b675a4882040be365f1ee7a40dc8f2a8cc59
Author: Ole Streicher
Date: Tue May 3 10:41:18 2016 +0200
Re-enable popconn and version info for contrib and non-free
diff --git a/webtools/templates/tasks.xhtml b/webtools/templates/tasks.xhtml
index af0b73f..ae6f7ab 100644
--- a/webtools/templates/tasks.xhtml
+++ b/webtools/templates/tasks.xhtml
@@ -96,8 +96,7 @@
mailto:${project.properties['maintainer']['email']}">${project.properties['maintainer']['name']}
(mailto:${project.properties['uploader']['email']}">${project.properties['uploader']['name']})
-
+
Versions of
package ${project.properties['name']}
@@ -128,7 +127,10 @@
https://debtags.debian.org/edit/${project.properties['name']}">Edit
Debtags
- https://debtags.debian.org/edit/${project.properties['name']}">Go
tagging
+ https://debtags.debian.org/edit/${project.properties['name']}">Go
tagging
--
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. 20a4cd5dba0a772a89fa940ddb2e5f16128c6735
The following commit has been merged in the master branch:
commit 20a4cd5dba0a772a89fa940ddb2e5f16128c6735
Author: Ole Streicher
Date: Mon May 2 16:04:52 2016 +0200
New "Index" keyword in tasks header
This keyword (default: true) describes whether the task should be included
in
the tasks_idx.html index web page.
The use of this is to provide additional, informational tasks that can be
referenced with an URL, but are not part of the blend. In Debian-Astro, it
will be used to provide a comparison with other astronomy software
collections, as SciSoft or AstroConda.
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index f2335e3..a77ad88 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1009,7 +1009,7 @@ class Tasks:
def getPackageNames(self, sections):
return set(itertools.chain(*(task.getPackageNames(sections)
- for task in self.tasks.values(
+ for task in self.tasks.values() if
task.in_tasklist)))
class TaskDependencies:
# List of depencencies defined in one metapackage
@@ -1045,6 +1045,9 @@ class TaskDependencies:
# This is NOT YET implemented
self.metadepends = None
+# Include the task in the task list? Defaults to True.
+self.in_tasklist = True
+
def SetMetapackageInfo(self, pkgname, ddtptranslations=None):
# Gather information (specifically description translations if exists)
about metapackage itself
self.metapkg = DependantPackage(pkgname)
@@ -1115,6 +1118,9 @@ class TaskDependencies:
self.metapkg.properties['desc']['en']['long'] =
longDesc
found_description = True
continue
+if key == 'Index':
+self.in_tasklist = (stanza['index'].lower() != 'false')
+continue
if key == 'Meta-Depends':
self.metadepends = stanza['meta-depends']
continue
diff --git a/webtools/templates/tasks_idx.xhtml
b/webtools/templates/tasks_idx.xhtml
index 8d64c06..ae4fe7d 100644
--- a/webtools/templates/tasks_idx.xhtml
+++ b/webtools/templates/tasks_idx.xhtml
@@ -73,7 +73,7 @@ table {
-
+
${tasks[task].metapkg.properties['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. d2dbc2cbba010c14db1a2af1c3ca8b8ba49eff72
The following commit has been merged in the master branch:
commit c56d55bcadd318bb4840ad1fca8c5baae4b5c055
Author: Ole Streicher
Date: Fri Apr 29 15:04:05 2016 +0200
Use list of connection parameters instead of stacked try/catches
Also, include the public UDD mirror as last possibility
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index d344642..0c533f9 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -268,29 +268,33 @@ def GetDependencies2Use(dependencystatus=[],
max_order='prospective'):
logger.error("No valid dependencystatus in", dependencystatus)
return use_dependencystatus
-###
-# Define several prepared statements to query UDD
-try:
-conn = psycopg2.connect(host="localhost", port=PORT, user="guest",
-database="udd")
-except psycopg2.OperationalError as err:
+###
+connection_pars = [
+{'host': 'localhost', 'port': PORT, 'user': 'guest', 'database': 'udd'},
+{'service': 'udd'},
+{'host': 'localhost', 'port': DEFAULTPORT, 'user': 'guest', 'database':
'udd'},
+
+# Hmmm, I observed a really strange behaviour on one of my machines where
+# connecting to localhost does not work but 127.0.0.1 works fine. No idea
+# why ... but this should do the trick for the moment
+{'host': '127.0.0.1', 'port': DEFAULTPORT, 'user': 'guest', 'database':
'udd'},
+
+# Public UDD mirror as last resort
+{'host': 'public-udd-mirror.xvm.mit.edu', 'port': 5432,
+ 'user': 'public-udd-mirror', 'password': 'public-udd-mirror', 'database':
'udd'},
+]
+conn = None
+for par in connection_pars:
try:
-conn = psycopg2.connect("service=udd")
+conn = psycopg2.connect(**par)
+break
except psycopg2.OperationalError as err:
-# logger not known at this state: logger.warning
-stderr.write("Service=udd seems not to be installed on this
host.\tMessage: %s\n" % (str(err)))
-try:
-conn = psycopg2.connect(host="localhost", port=DEFAULTPORT,
-user="guest", database="udd")
-except psycopg2.OperationalError:
-# Hmmm, I observed a really strange behaviour on one of my
-# machines where connecting to localhost does not work but
-# 127.0.0.1 works fine. No idea why ... but this should
-# do the trick for the moment
-conn = psycopg2.connect(host="127.0.0.1", port=DEFAULTPORT,
-user="guest", database="udd")
-conn.set_client_encoding('utf-8')
+continue
+if conn is None:
+raise err
+
+conn.set_client_encoding('utf-8')
curs = conn.cursor()
# uddlog = open('logs/uddquery.log', 'w')
@@ -305,6 +309,7 @@ def _execute_udd_query(query):
except psycopg2.DataError as err:
stderr.write("%s; query was\n%s\n" % (str(err), query))
+# Define several prepared statements to query UDD
query = """PREPARE query_pkgs (text[],text[],text) AS
SELECT * FROM blends_query_packages($1,$2,$3) AS (
package text, distribution text, release text, component text,
version debversion,
diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index 36b9e6e..5558f69 100644
--- a/webtools/blendstasktools_udd.py
+++ b/webtools/blendstasktools_udd.py
@@ -264,24 +264,31 @@ def GetDependencies2Use(dependencystatus=[],
max_order='prospective'):
logger.error("No valid dependencystatus in", dependencystatus)
return use_dependencystatus
-###
-# Define several prepared statements to query UDD
-try:
-conn =
psycopg2.connect(host="localhost",port=PORT,user="guest",database="udd")
-except psycopg2.OperationalError as err:
- try:
-conn = psycopg2.connect("service=udd")
- except psycopg2.OperationalError as err:
-# logger not known at this state: logger.warning
-stderr.write("Service=udd seems not to be installed on this
host.\tMessage: %s" % (str(err)))
+###
+connection_pars = [
+{'host': 'localhost'
[Blends-commit] [SCM] website branch, master, updated. d2dbc2cbba010c14db1a2af1c3ca8b8ba49eff72
The following commit has been merged in the master branch:
commit d2dbc2cbba010c14db1a2af1c3ca8b8ba49eff72
Author: Ole Streicher
Date: Fri Apr 29 16:26:56 2016 +0200
Since 'source' is a flag, use True/False here
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index c889c33..f2335e3 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -842,9 +842,9 @@ class Tasks:
if os.path.isfile(os.path.join(self.tasksdir, task))
)
-def GetAllDependencies(self, source=0):
+def GetAllDependencies(self, source=False):
# If we want to subscribe ddpo we need the source package names.
-# In this case set source=1
+# In this case set source=True
# Obtain the prefix of the meta packages of the Blend using blends-dev
tools blend_get_names
if os.access('/usr/share/blends-dev/blend-get-names', os.X_OK):
@@ -893,7 +893,7 @@ class Tasks:
else: # Kick file that is obviously no task file from metapackage
list
self.metapackagekeys = [name for name in self.metapackagekeys
if name != task]
-if source == 0:
+if not source:
# total number popcon submissions
query = "EXECUTE popcon_submissions"
_execute_udd_query(query)
@@ -1071,7 +1071,7 @@ class TaskDependencies:
if dep.properties['dep_strength'] in ('Ignore', 'Avoid'):
logger.debug("Ignore/Avoid package : %s" % dep.properties['name'])
return
-if source != 1:
+if not source:
# In general we can just add the dependency to the list
self.dependencies[dep.properties['pkgstatus']].append(dep)
return
@@ -1086,7 +1086,7 @@ class TaskDependencies:
if not found:
self.dependencies[dep.properties['pkgstatus']].append(dep)
-def GetTaskDependencies(self, source=0):
+def GetTaskDependencies(self, source=False):
global dep_strength_keys
found_description = False
@@ -1697,7 +1697,7 @@ class TaskDependencies:
if 'browser' not in self.properties['vcs']:
vcs['browser'] = BrowserFromVcsURL(vcs['type'],
vcs['url'])
# We are only interested in source packages (for instance for Bugs
page)
-if source == 1:
+if source:
self.properties['name'] = self.properties['source']
# Stop using source package in self.properties['name'] because we
need the source package to obtain latest uploaders and
# and bugs should be rendered in the same job - so we need the
differentiation anyway
@@ -1706,7 +1706,7 @@ class TaskDependencies:
logger.error("Failed to obtain source for package",
self.properties['name'])
return
-if source == 0:
+if not source:
# If we are querying for source packages to render BTS pages
# tranlations are irrelevant - so only obtain ddtp translations
# otherwise
@@ -1772,7 +1772,7 @@ class Available:
#available = Available( # Initialize instance
# release='testing', # (default='unstable')
# components=('main'), # Regard only main,
default: main, contrib, non-free
-# source=1 # Use source package
names, default: use binaries
+# source=True, # Use source package
names, default: use binaries
# arch='sparc' # (default='i386')
# )
#
diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index 5558f69..8016076 100644
--- a/webtools/blendstasktools_udd.py
+++ b/webtools/blendstasktools_udd.py
@@ -812,9 +812,9 @@ class Tasks:
_execute_udd_query(query)
self.metapackagekeys = [t[0] for t in curs.fetchall()]
-def GetAllDependencies(self, source=0):
+def GetAllDependencies(self, source=False):
# If we want to subscribe ddpo we need the source package names.
-# In this case set source=1
+# In this case set source=True
# Obtain the prefix of the meta packages of the Blend
try:
@@ -858,7 +858,7 @@ class Tasks:
else: # Kick file that is obviously no task file from metapackage
list
self.metapackagekeys = [name for name in self.metapackagekeys
if name != task]
-if source == 0:
+if not source:
# total number popcon submissions
query = "EXECUTE popcon_submissions"
_execute_u
[Blends-commit] [SCM] website branch, master, updated. d2dbc2cbba010c14db1a2af1c3ca8b8ba49eff72
The following commit has been merged in the master branch:
commit c685b1289dd03e2c23728ee1a83047243f0e7578
Author: Ole Streicher
Date: Fri Apr 29 16:01:53 2016 +0200
Lower dependency strength of alternative packages
Packages that are listed in the tasks files as alternative of other packages
delimited by "|" are usually only installed if the main package is not
available. So, they are counted as lower priority packages.
This commit moved them from "High urgency" to "low urgency".
An example are the alternative Python 2 packages for existing Python 3
packages: Since we are moving to Python 3, the Python 2 packages serve
just as an low-urgency alternative of the Python 3 version.
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 0c533f9..04d0dbf 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1151,34 +1151,34 @@ class TaskDependencies:
# Remove versions from versioned depends
dependencies = re.sub(' *\([ ><=\.0-9]+\) *', '',
dependencies)
-# turn alternatives ('|') into real depends for this
purpose
-# because we are finally interested in all alternatives
-dependencies = dependencies.replace('|', ',')
-
for dep_in_line in dependencies.split(','):
dep_in_line = dep_in_line.strip()
if not dep_in_line:
continue
-# If there are more than one dependencies in one line
-# just put the current one into the right list of
dependencies
-# before initiating the next instance
-if dep is not None:
-tmp_dep_list.append(dep)
-if not dep_in_line.islower():
-logger.warning("Package names may not contain
upper case letters, so %s is an invalid package name which is turned into %s"
- % (dep_in_line,
dep_in_line.lower()))
-dep_in_line = dep_in_line.lower()
-dep = DependantPackage(dep_in_line)
-# Store the comments in case they might be usefull for
later applications
-if why:
-dep.properties['why'] = why
-if responsible:
-(_name, _url) = email.utils.parseaddr(responsible)
-dep.properties['maintainer'] = {'name':_name,
'email': _url}
-
-dep.properties['dep_strength'] = key
-continue
+# Each dependency may have alternatives delimited by
"|".
+for i, dep_name in enumerate(dep_in_line.split('|')):
+dep_name = dep_name.strip()
+if not dep_name:
+continue
+
+if not dep_in_line.islower():
+logger.warning("Package names may not contain
upper case letters, so %s is an invalid package name which is turned into %s"
+ % (dep_name, dep_name.lower()))
+dep_name = dep_name.lower()
+dep = DependantPackage(dep_name)
+# Store the comments in case they might be usefull
for later applications
+if why:
+dep.properties['why'] = why
+if responsible:
+(_name, _url) =
email.utils.parseaddr(responsible)
+dep.properties['maintainer'] = {'name':_name,
'email': _url}
+if i > 0 and key == "Depends":
+# Alternatives will be lowered to suggestions.
+dep.properties['dep_strength'] = "Suggests"
+else:
+dep.properties['dep_strength'] = key
+tmp_dep_list.append(dep)
# sometimes the tasks file contains standalone comments or
other RFC 822 entries.
# Just ignore this stuff
@@ -1347,7 +1347,6 @@ class TaskDependencies:
if flag == 1:
break
-tmp_dep_list.append(dep)
# remarks which are common to several dependencies in a list have
# to be added to all of the depende
[Blends-commit] [SCM] website branch, master, updated. d2dbc2cbba010c14db1a2af1c3ca8b8ba49eff72
The following commit has been merged in the master branch:
commit d0d1b6291bff5e93b983cbeece4781360a516519
Author: Ole Streicher
Date: Fri Apr 29 16:15:22 2016 +0200
Remove redundant 'dep is None' tests
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 04d0dbf..c889c33 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1201,115 +1201,70 @@ class TaskDependencies:
if key == 'Homepage':
if fields_duplicated is not None:
fields_duplicated.append(key)
-if dep is not None:
-# set Homepage only if not just set via official
package information
-if dep.properties['homepage'] == HOMEPAGENONE:
-dep.properties['homepage'] = stanza['homepage']
-else:
-fields_obsolete.append(key)
+# set Homepage only if not just set via official package
information
+if dep.properties['homepage'] == HOMEPAGENONE:
+dep.properties['homepage'] = stanza['homepage']
else:
-logger.error("Dep not initiated before Homepage %s ->
something is wrong."
- % stanza['homepage'])
+fields_obsolete.append(key)
elif key.lower() in ('vcs-svn', 'vcs-git'):
-if dep is not None:
-vcs = dep.properties.setdefault('vcs', {})
-vcs['url'] = stanza[key.lower()]
-vcs['type'] = key.split('-')[1].capitalize()
-if 'browser' not in vcs:
-try:
-vcs['browser'] =
BrowserFromVcsURL(vcs['type'], vcs['url'])
-except KeyError as err:
-logger.error("Vcs Property missing in packages
file:", vcs, err)
-else:
-logger.error("Dep not initiated before %s %s ->
something is wrong."
- % (key, stanza[key.lower()]))
+vcs = dep.properties.setdefault('vcs', {})
+vcs['url'] = stanza[key.lower()]
+vcs['type'] = key.split('-')[1].capitalize()
+if 'browser' not in vcs:
+try:
+vcs['browser'] = BrowserFromVcsURL(vcs['type'],
vcs['url'])
+except KeyError as err:
+logger.error("Vcs Property missing in packages
file:", vcs, err)
if dep.properties['pkgstatus'] == 'unknown':
dep.properties['pkgstatus'] = 'pkgvcs'
elif key.lower() == 'vcs-browser':
-if dep is not None:
-vcs = dep.properties.setdefault('vcs', {})
-vcs['browser'] = stanza['vcs-browser']
-if re.compile("[/.]git\.").search(vcs['browser']):
-vcs['type'] = 'Git'
-elif re.compile("[/.]svn\.").search(vcs['browser']):
-vcs['type'] = 'Svn'
-else:
-# no chance to guess Vcs type
-vcs['type'] = 'Vcs'
-# There is no need to specify the Vcs-{Git,SVN} field
in the tasks file but property 'vcs-type' should be set in
-# any case - so set it here in case it was not set
before. If an apropriate field is set later it becomes
-# overriden anyway
-if 'url' not in vcs:
-vcs['url'] = vcs['browser']
+vcs = dep.properties.setdefault('vcs', {})
+vcs['browser'] = stanza['vcs-browser']
+if re.compile("[/.]git\.").search(vcs['browser']):
+vcs['type'] = 'Git'
+elif re.compile("[/.]svn\.").search(vcs['browser']):
+vcs['type'] = 'Svn'
else:
-logger.error("Dep not initia
[Blends-commit] [SCM] blends-dev branch, master, updated. 1d9c5d9c053896a6a347e30a506dededc60571d1
The following commit has been merged in the master branch: commit 1d9c5d9c053896a6a347e30a506dededc60571d1 Author: Ole Streicher Date: Thu Apr 28 11:58:01 2016 +0200 Disable default installation for special science fields diff --git a/debian-blends-tasks.desc b/debian-blends-tasks.desc index 18a4b2c..2a7fda7 100644 --- a/debian-blends-tasks.desc +++ b/debian-blends-tasks.desc @@ -11,9 +11,12 @@ Test-new-install: show skip Task: debian-science Parent: debian-blends Section: debian-blends -Description: Debian Science +Description: Debian Science (common) The goal of Debian Science is to provide a better experience when using Debian to researchers and scientists. + . + This task installs all tasks of the Debian Science Pure Blend that are common + to many science fields, like presentation or numerical computation. Test-new-install: show skip Key: science-tasks diff --git a/debian/changelog b/debian/changelog index 7ded14b..f64bcde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +blends (0.6.94) UNRELEASED; urgency=medium + + * Adjust description of Debian Science: install only common tasks + + -- Ole Streicher Thu, 28 Apr 2016 11:57:38 +0200 + blends (0.6.93) unstable; urgency=medium [ Ole Streicher ] -- Git repository for blends code ___ 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. b7196f9e2b4c8998f41309111c381a12e5e4af0d
The following commit has been merged in the master branch: commit e819488ad100f89b4c066864bc33e7b4c95ced6d Author: Ole Streicher Date: Thu Apr 28 11:49:14 2016 +0200 Add gnudatalanguage to numericalcomputation diff --git a/tasks/numericalcomputation b/tasks/numericalcomputation index 9b08e2d..b9bbf32 100644 --- a/tasks/numericalcomputation +++ b/tasks/numericalcomputation @@ -152,3 +152,5 @@ Depends: libarrayfire-unified-dev Depends: python-arrayfire | python3-arrayfire Depends: pyzo + +Depends: gnudatalanguage -- 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. b7196f9e2b4c8998f41309111c381a12e5e4af0d
The following commit has been merged in the master branch: commit b7196f9e2b4c8998f41309111c381a12e5e4af0d Author: Ole Streicher Date: Thu Apr 28 11:51:10 2016 +0200 Disable default installation for special science fields diff --git a/debian/changelog b/debian/changelog index e296267..a7b7189 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debian-science (1.6) UNRELEASED; urgency=medium + + [ Ole Streicher ] + * Disable default installation for special science fields + + -- Ole Streicher Thu, 28 Apr 2016 11:51:50 +0200 + debian-science (1.5) unstable; urgency=medium [ Ole Streicher ] diff --git a/tasks/biology b/tasks/biology index df1a4d3..12256d8 100644 --- a/tasks/biology +++ b/tasks/biology @@ -1,4 +1,5 @@ Task: Biology +Install: false Description: Debian Science Biology packages This metapackage will install Debian Science packages related to Biology. You might also be interested in the field::biology debtag. diff --git a/tasks/chemistry b/tasks/chemistry index c5b44da..9c72d0e 100644 --- a/tasks/chemistry +++ b/tasks/chemistry @@ -1,4 +1,5 @@ Task: Chemistry +Install: false Description: Debian Science Chemistry packages This metapackage will install Debian Science packages related to Chemistry. You might also be interested in the field::chemistry diff --git a/tasks/economics b/tasks/economics index 37d9495..e172d25 100644 --- a/tasks/economics +++ b/tasks/economics @@ -1,4 +1,5 @@ Task: Economics +Install: false Description: Debian Science Economics packages This metapackage will install Debian Science packages useful for economics and econometrics. It includes user-friendly programs for simulating and estimating diff --git a/tasks/electronics b/tasks/electronics index 390436e..9f5c990 100644 --- a/tasks/electronics +++ b/tasks/electronics @@ -1,4 +1,5 @@ Task: Electronics +Install: false Description: Debian Science Electronics packages This metapackage will install Debian Science packages related to Electronics. You might also be interested in the field::electronics diff --git a/tasks/electrophysiology b/tasks/electrophysiology index e8e8560..d310652 100644 --- a/tasks/electrophysiology +++ b/tasks/electrophysiology @@ -1,4 +1,5 @@ Task: Electrophysiology +Install: false Description: Debian Science packages for Electrophysiology This metapackage will install Debian packages which might be useful for scientists doing electrophysiology-based neuroscience research. diff --git a/tasks/engineering b/tasks/engineering index 30d33ca..fe8c408 100644 --- a/tasks/engineering +++ b/tasks/engineering @@ -1,4 +1,5 @@ Task: Engineering +Install: false Description: Debian Science Engineering packages This metapackage is part of the Debian Pure Blend "Debian Science" and installs packages related to Engineering. diff --git a/tasks/engineering-dev b/tasks/engineering-dev index d424b44..aa8e68e 100644 --- a/tasks/engineering-dev +++ b/tasks/engineering-dev @@ -1,4 +1,5 @@ Task: Engineering-dev +Install: false Description: Debian Science Engineering-dev packages This metapackage will install Debian Science packages which might be helpful for development of applications for Engineering. diff --git a/tasks/financial b/tasks/financial index 821287b..429a7dc 100644 --- a/tasks/financial +++ b/tasks/financial @@ -1,4 +1,5 @@ Task: Financial engineering +Install: false Description: Debian Science financial engineering and computational finance This metapackage will install Debian Science packages for financial engineering and computational finance. diff --git a/tasks/geography b/tasks/geography index 006c7b6..c7b4965 100644 --- a/tasks/geography +++ b/tasks/geography @@ -1,4 +1,5 @@ Task: Geography +Install: false Description: Debian Science Geography packages This metapackage will install Debian Science packages related to Geography. You might also be interested in the field::geography diff --git a/tasks/geometry b/tasks/geometry index 4f820db..bf8aae4 100644 --- a/tasks/geometry +++ b/tasks/geometry @@ -1,4 +1,5 @@ Task: Geometry +Install: false Description: Debian Science geometry packages This metapackage will install Debian Science packages related to geometry. You might also be interested in the field::mathematics diff --git a/tasks/highenergy-physics b/tasks/highenergy-physics index e1058fd..8bfc08a 100644 --- a/tasks/highenergy-physics +++ b/tasks/highenergy-physics @@ -1,4 +1,5 @@ Task: High Energy Physics +Install: false Description: Debian Science High Energy Physics packages This metapackage will install Debian Science packages related to High Energy Physics, which is a branch of physics that studies the elementary subatomic diff --git a/tasks/highenergy-physics-dev b/tasks/highenergy-physics-dev index 7c175f9..cfabe78 100644 --- a/tasks/highenergy-physics-dev +++ b/tasks/highenergy-physics-dev @@ -1,4 +1,5 @@ Task: High Energy Physics (devel) +Install: false Description: Debian Science H
[Blends-commit] [SCM] website branch, master, updated. 2535a81b90b695e2c9b985d638cee436fbf9cadf
The following commit has been merged in the master branch:
commit 2535a81b90b695e2c9b985d638cee436fbf9cadf
Author: Ole Streicher
Date: Wed Apr 27 13:49:36 2016 +0200
Simplify dependency creation
This is apreparation to lower the priority of alternatives.
The idea is that in alternatives separated with "|" in high relevance
packages,
only the main dependency goes into that section. Other alternatives shall
go into low relevance packages: they are not going to be installed by
default,
but may be on request.
A use case is to put "python" and "python3" packages as alternatives. Since
we should make a transition to Python 3, Python 2 packages (when listed as
alternative) should only have a lower priority.
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 1b2fcc3..d344642 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1148,15 +1148,12 @@ class TaskDependencies:
# turn alternatives ('|') into real depends for this
purpose
# because we are finally interested in all alternatives
-dependencylist = dependencies.replace('|', ',').split(',')
-# Collect all dependencies in one line first,
-# create an object for each later
-deps_in_one_line = []
-for dependency in dependencylist:
-if dependency.strip() != '': # avoid confusion when
',' is at end of line
-deps_in_one_line.append(dependency.strip())
-
-for dep_in_line in deps_in_one_line:
+dependencies = dependencies.replace('|', ',')
+
+for dep_in_line in dependencies.split(','):
+dep_in_line = dep_in_line.strip()
+if not dep_in_line:
+continue
# If there are more than one dependencies in one line
# just put the current one into the right list of
dependencies
# before initiating the next instance
--
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. a4a1935750ff73446217913e7f622f1d2cc0d135
The following commit has been merged in the master branch:
commit a4a1935750ff73446217913e7f622f1d2cc0d135
Author: Ole Streicher
Date: Wed Apr 27 13:18:34 2016 +0200
Make tasks.py and blendstasktools.py fully Python 3 compatible
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 148e0f4..1b2fcc3 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -289,6 +289,7 @@ except psycopg2.OperationalError as err:
# do the trick for the moment
conn = psycopg2.connect(host="127.0.0.1", port=DEFAULTPORT,
user="guest", database="udd")
+conn.set_client_encoding('utf-8')
curs = conn.cursor()
# uddlog = open('logs/uddquery.log', 'w')
@@ -643,15 +644,21 @@ def RowDictionaries(cursor):
"""Return a list of dictionaries which specify the values by their column
names"""
if not cursor.description:
-# even if there are no data sets to return the description should
contain the table structure. If not something went
+# even if there are no data sets to return the description
+# should contain the table structure. If not something went
# wrong and we return None as to represent a problem
return None
-return [dict((dd[0],
- unicode(dv.decode('utf-8')) if isinstance(dv, str) else dv)
- for (dd, dv) in zip(cursor.description, row))
-for row in cursor]
-
+try:
+return [dict((dd[0],
+ unicode(dv.decode('utf-8')) if isinstance(dv, str)
+ else dv)
+ for (dd, dv) in zip(cursor.description, row))
+for row in cursor]
+
+except NameError: # Python 3
+return [dict((dd[0], dv) for (dd, dv) in zip(cursor.description, row))
+for row in cursor]
def BrowserFromVcsURL(vcs_type, vcs_url):
# Guess Vcs-Browser URL from VCS URL
@@ -723,14 +730,6 @@ class DependantPackage:
self.properties['version'] = [] # list of {'release', 'version',
'archs'} dictionary containing version and architecture information
self.properties['desc'] = {'en': {}} # An English description should
be available in any case
-# sort these objects according to the package name
-def __cmp__(self, other):
-# Comparing with None object has to return something reasonable
-if other is None:
-return -2
-# Sort according to package name
-return cmp(self.properties['name'], other.properties['name'])
-
def __str__(self):
ret = "pkg:"+ self.properties['name']
for prop in self.properties:
@@ -876,17 +875,13 @@ class Tasks:
if hastranslations > 0:
query = "EXECUTE query_metapkg_trans('%s')" %
List2PgArray(metapackages)
_execute_udd_query(query)
-if curs.rowcount > 0:
-for row in RowDictionaries(curs):
-metapkg_translations[row['package']] = row
+for row in RowDictionaries(curs):
+metapkg_translations[row['package']] = row
for task in self.metapackagekeys:
td = TaskDependencies(self.blendname, task=task,
tasksdir=self.tasksdir)
pkgname = prefix + task
-translations = None
-if pkgname in metapkg_translations:
-translations = metapkg_translations[pkgname]
-td.SetMetapackageInfo(pkgname, translations)
+td.SetMetapackageInfo(pkgname, metapkg_translations.get(pkgname))
logger.debug("Task : %s " % task)
if td.GetTaskDependencies(source):
self.tasks[task] = td
@@ -1692,7 +1687,7 @@ class TaskDependencies:
del dep.properties['wnpp']
for dependency in self.dependencies.keys():
-self.dependencies[dependency].sort()
+self.dependencies[dependency].sort(key = lambda x:
x.properties['name'])
return 1 # Success
def getPackageNames(self, sections):
@@ -1806,7 +1801,7 @@ class TaskDependencies:
logger.warning("Dependency with unknown status: %s (Task
%s)" % (dep.properties['name'], self.task))
for dependency in self.dependencies.values():
-dependency.sort()
+dependency.sort(key = lambda x: x.properties['name'])
def __str__(self):
ret = "Blend: " + self.blendname + ", " \
diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index 60958e6..36b9e6e 100644
--- a/webtools/blendstasktools
[Blends-commit] [SCM] website branch, master, updated. a4a1935750ff73446217913e7f622f1d2cc0d135
The following commit has been merged in the master branch:
commit 1dad6454ca8a35ceccd11b63acc32db887ed70f5
Author: Ole Streicher
Date: Wed Apr 27 10:12:28 2016 +0200
Make dep_strength_keys and pkgstatus_sortedkeys more pythonic
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index d75013c..148e0f4 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -180,20 +180,11 @@ pkgstatus = {
},
}
-# http://wiki.python.org/moin/HowTo/Sorting#Sortingbykeys
-_tmplist = []
-for key in pkgstatus.keys():
-_tmplist.append((key, pkgstatus[key]['order']))
-_tmpsorted = sorted(_tmplist, key=lambda x: (x[1], x[0]))
-pkgstatus_sortedkeys = []
-for _tmp in _tmpsorted:
-pkgstatus_sortedkeys.append(_tmp[0])
-
-dep_strength_keys = []
-for pkgstat in pkgstatus:
-for dep in pkgstatus[pkgstat]['dependencies']:
-if dep not in dep_strength_keys:
-dep_strength_keys.append(dep)
+pkgstatus_sortedkeys = sorted(pkgstatus.keys(),
+ key=lambda x: (pkgstatus[x]['order'], x))
+
+dep_strength_keys = set(itertools.chain(*(pkgstatus[pkgstat]['dependencies']
+ for pkgstat in pkgstatus)))
rmpub = codecs.open('remove-publications-from-tasks-files.dat', 'w+', 'utf-8')
diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index 8299262..60958e6 100644
--- a/webtools/blendstasktools_udd.py
+++ b/webtools/blendstasktools_udd.py
@@ -176,20 +176,11 @@ pkgstatus = {
},
}
-# http://wiki.python.org/moin/HowTo/Sorting#Sortingbykeys
-_tmplist = []
-for key in pkgstatus.keys():
-_tmplist.append((key, pkgstatus[key]['order']))
-_tmpsorted = sorted(_tmplist, key=lambda x: (x[1], x[0]))
-pkgstatus_sortedkeys = []
-for _tmp in _tmpsorted:
-pkgstatus_sortedkeys.append(_tmp[0])
-
-dep_strength_keys = []
-for pkgstat in pkgstatus:
-for dep in pkgstatus[pkgstat]['dependencies']:
-if dep not in dep_strength_keys:
-dep_strength_keys.append(dep)
+pkgstatus_sortedkeys = sorted(pkgstatus.keys(),
+ key=lambda x: (pkgstatus[x]['order'], x))
+
+dep_strength_keys = set(itertools.chain(*(pkgstatus[pkgstat]['dependencies']
+ for pkgstat in pkgstatus)))
rmpub = codecs.open('remove-publications-from-tasks-files.dat', 'w+', 'utf-8')
--
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. 92fe277c4a75f48f9b7906458849dbb10040a74f
The following commit has been merged in the master branch:
commit 92fe277c4a75f48f9b7906458849dbb10040a74f
Author: Ole Streicher
Date: Wed Apr 20 17:51:06 2016 +0200
Better version: don't create the table cells at all for screenshot and
versions/tagging
diff --git a/webtools/templates/tasks.xhtml b/webtools/templates/tasks.xhtml
index 543878f..af0b73f 100644
--- a/webtools/templates/tasks.xhtml
+++ b/webtools/templates/tasks.xhtml
@@ -96,7 +96,8 @@
mailto:${project.properties['maintainer']['email']}">${project.properties['maintainer']['name']}
(mailto:${project.properties['uploader']['email']}">${project.properties['uploader']['name']})
-
+
Versions of
package ${project.properties['name']}
@@ -127,10 +128,7 @@
https://debtags.debian.org/edit/${project.properties['name']}">Edit
Debtags
- https://debtags.debian.org/edit/${project.properties['name']}">Go
tagging
-
+ https://debtags.debian.org/edit/${project.properties['name']}">Go
tagging
@@ -198,7 +196,8 @@
(${project.properties['published']['year']})
-
+
@@ -214,10 +213,8 @@
http://screenshots.debian.net/package/${project.properties['name']}">
- http://screenshots.debian.net/uploadfile?packagename=${project.properties['name']}">Upload
screenshot
-
--
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. 20ae08103736ee5bec11cdc10b33825854e204d5
The following commit has been merged in the master branch:
commit 20ae08103736ee5bec11cdc10b33825854e204d5
Author: Ole Streicher
Date: Wed Apr 20 17:38:15 2016 +0200
Don't show "Go Tagging" and "Upload screenshot" for non-official packages
diff --git a/webtools/templates/tasks.xhtml b/webtools/templates/tasks.xhtml
index dd85f9b..543878f 100644
--- a/webtools/templates/tasks.xhtml
+++ b/webtools/templates/tasks.xhtml
@@ -127,9 +127,10 @@
https://debtags.debian.org/edit/${project.properties['name']}">Edit
Debtags
-
-https://debtags.debian.org/edit/${project.properties['name']}">Go
tagging
-
+ https://debtags.debian.org/edit/${project.properties['name']}">Go
tagging
+
@@ -213,8 +214,11 @@
http://screenshots.debian.net/package/${project.properties['name']}">
- http://screenshots.debian.net/uploadfile?packagename=${project.properties['name']}">Upload
screenshot
-
+ http://screenshots.debian.net/uploadfile?packagename=${project.properties['name']}">Upload
screenshot
+
+
--
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] blends-dev branch, master, updated. f151035310218d030ffca67e9ca9973dd9978a25
The following commit has been merged in the master branch: commit f151035310218d030ffca67e9ca9973dd9978a25 Author: Ole Streicher Date: Sat Apr 9 20:42:45 2016 +0200 Finalize d/changelog diff --git a/debian/changelog b/debian/changelog index a9da372..7ded14b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -blends (0.6.93) UNRELEASED; urgency=medium +blends (0.6.93) unstable; urgency=medium [ Ole Streicher ] * Fix Relevance field for tasksel @@ -13,7 +13,7 @@ blends (0.6.93) UNRELEASED; urgency=medium * Re-enable dist target in rules file Closes: #819425 - -- Ole Streicher Thu, 31 Mar 2016 15:33:25 +0200 + -- Ole Streicher Sat, 09 Apr 2016 20:42:12 +0200 blends (0.6.92.5) unstable; urgency=medium -- Git repository for blends code ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev tag, 0.6.93, created. f151035310218d030ffca67e9ca9973dd9978a25
The tag, 0.6.93 has been created at f151035310218d030ffca67e9ca9973dd9978a25 (commit) - Shortlog commit f151035310218d030ffca67e9ca9973dd9978a25 Author: Ole Streicher Date: Sat Apr 9 20:42:45 2016 +0200 Finalize d/changelog --- -- Git repository for blends code ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. b529662df3bb1f728e24954319448dd09001e83a
The following commit has been merged in the master branch:
commit b529662df3bb1f728e24954319448dd09001e83a
Author: Ole Streicher
Date: Wed Apr 6 12:30:36 2016 +0200
Adjust Relevances so that individual blend tasks appear above the default
blends tasks
diff --git a/debian-blends-tasks.desc b/debian-blends-tasks.desc
index 0d934b1..18a4b2c 100644
--- a/debian-blends-tasks.desc
+++ b/debian-blends-tasks.desc
@@ -1,5 +1,5 @@
Task: debian-blends
-Relevance: 7
+Relevance: 8
Section: debian-blends
Description: Debian Pure Blends
Debian Pure Blends are a solution for groups of people with specific
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 32ab6ae..7b7756c 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -282,7 +282,7 @@ sub gen_control {
my $task_depends_are_keys = 0;
sub print_task_desc {
print "Task: $blendname\n";
- print "Relevance: 9\n";
+ print "Relevance: 7\n";
print "Section: $blendname\n";
# print "Key: \n";
# print " $blendshortname-tasks\n";
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. d03e7478b34e79950a000e4923c5ece46aa8fd04
The following commit has been merged in the master branch:
commit d03e7478b34e79950a000e4923c5ece46aa8fd04
Author: Ole Streicher
Date: Wed Apr 6 12:22:56 2016 +0200
Automatically mark default packages for install in new installations
This allows pre-seeding with "apt install $blends-tasks" so that the
individual blends tasks are visible during installation, with the default
tasks being preselected.
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index bf8ef0a..32ab6ae 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -319,6 +319,10 @@ sub print_task_desc {
print "$taskinfo{$task}{'Description-long'}"; # Already
contain newline
print "Enhances: $taskinfo{$task}{Enhances}\n"
if exists $taskinfo{$task}{Enhances};
+ if (!exists $taskinfo{$task}{'Install'} ||
+ $taskinfo{$task}{'Install'} ne 'false') {
+ print "Test-new-install: mark show\n";
+ }
for $header (keys %{$taskinfo{$task}}) {
if ($header =~ m/test-.+/i) {
print "$header: $taskinfo{$task}{$header}\n";
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 8b2c0d28d5d2714c3d3fc7b767531474644bc39e
The following commit has been merged in the master branch:
commit 8b2c0d28d5d2714c3d3fc7b767531474644bc39e
Author: Ole Streicher
Date: Wed Apr 6 12:05:01 2016 +0200
Task $blend-all: put packages that are not installed to "Suggests:"
This way, the -all task includes all packages for a specific blend,
which may be useful for a later re-selection.
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 71f52b1..bf8ef0a 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -181,18 +181,22 @@ sub gen_control {
print "Package: $blendshortname-all\n";
print "Section: metapackages\n" ;
print "Architecture: all\n";
-my @list;
+my @recommends;
+my @suggests;
for $task (sort keys %taskinfo) {
next if (exists $taskinfo{$task}{'Metapackage'} &&
$taskinfo{$task}{'Metapackage'} eq 'false');
-next if (exists $taskinfo{$task}{'Install'} &&
-$taskinfo{$task}{'Install'} eq 'false');
next if ( $suppressempty && $taskinfo{$task}{'haspackages'} == 0 );
-push (@list, $task)
+if (exists $taskinfo{$task}{'Install'} &&
+ $taskinfo{$task}{'Install'} eq 'false') {
+ push (@suggests, $task)
+ } else {
+ push (@recommends, $task)
+ }
}
-print "Recommends: ";
-print join(",\n ",@list);
-print "\nDescription: Default selection of tasks for $blendtitle\n";
+print("Recommends: ", join(",\n ", @recommends),"\n") if @recommends;
+print("Suggests: ", join(",\n ", @suggests),"\n") if @suggests;
+print "Description: Default selection of tasks for $blendtitle\n";
print " This package is part of the $blendtitle Pure Blend and installs
all\n";
print " tasks for a default installation of this blend.\n\n";
--
Git repository for blends code
___
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. 157d867d4879f80f58e088b7b936e856a3c0c7d2
The following commit has been merged in the master branch: commit 157d867d4879f80f58e088b7b936e856a3c0c7d2 Author: Ole Streicher Date: Tue Apr 5 16:18:57 2016 +0200 Revert priority change. As Andreas pointed out, the priority needs to set to default "extra" in order to include packages that have this priority. diff --git a/debian/changelog b/debian/changelog index 58a6b2f..36df8e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,6 @@ debian-science (1.5) UNRELEASED; urgency=medium * Replace astronomy and astronomy-dev packages with the metapackages from debian-astro * Recommend other science blends tasks in science-tasks - * Change default Priority to optional * Push Standards-Version to 3.9.7 (No changes) [ Andreas Tille ] diff --git a/debian/control b/debian/control index dba46be..2d38fad 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ # This file is autogenerated via make -f debian/rules dist. Do not edit! Source: debian-science Section: science -Priority: optional +Priority: extra Maintainer: Debian Science Team Uploaders: Frederic Daniel Luc Lehobey , Andreas Tille , diff --git a/debian/control.stub b/debian/control.stub index e46e6ad..209f4c2 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -1,6 +1,6 @@ Source: debian-science Section: science -Priority: optional +Priority: extra Maintainer: Debian Science Team Uploaders: Frederic Daniel Luc Lehobey , Andreas Tille , -- 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. 62a9741420de5201ef8c55e8db751b3709150359
The following commit has been merged in the master branch: commit 62a9741420de5201ef8c55e8db751b3709150359 Author: Ole Streicher Date: Tue Apr 5 15:11:15 2016 +0200 Fix short description of science-bci diff --git a/debian-science-tasks.desc b/debian-science-tasks.desc index 8a39b62..9d034e7 100644 --- a/debian-science-tasks.desc +++ b/debian-science-tasks.desc @@ -7,7 +7,8 @@ Description: Debian Science Pure Blend Task: science-bci Parent: debian-science Section: debian-science -Description: Debian Science packages for the design and use of +Description: Debian Science Brain-computer interface packages + Debian Science packages for the design and use of brain-computer interface (BCI) -- direct communication pathway between a brain and an external device. BCIs are often aimed at assisting, augmenting or repairing human cognitive or diff --git a/tasks/bci b/tasks/bci index 147f266..97443fe 100644 --- a/tasks/bci +++ b/tasks/bci @@ -1,6 +1,7 @@ Task: Brain-computer interface Metapackage: false -Description: Debian Science packages for the design and use of +Description: Debian Science Brain-computer interface packages + Debian Science packages for the design and use of brain-computer interface (BCI) -- direct communication pathway between a brain and an external device. BCIs are often aimed at assisting, augmenting or repairing human cognitive or -- 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. 62a9741420de5201ef8c55e8db751b3709150359
The following commit has been merged in the master branch: commit 2fd4b0806af41eeaafe8b85f9dbe7db0e9e8bb5c Author: Ole Streicher Date: Tue Apr 5 15:10:50 2016 +0200 Chage Priority and Standards-Version in d/control.stub as well diff --git a/debian/control.stub b/debian/control.stub index 0758f20..e46e6ad 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -1,12 +1,12 @@ Source: debian-science Section: science -Priority: extra +Priority: optional Maintainer: Debian Science Team Uploaders: Frederic Daniel Luc Lehobey , Andreas Tille , Sylvestre Ledru Build-Depends-Indep: blends-dev (>= 0.6.15) -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Vcs-Browser: https://anonscm.debian.org/cgit/blends/projects/science.git Vcs-Git: https://anonscm.debian.org/git/blends/projects/science.git Homepage: http://wiki.debian.org/DebianScience/ -- 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. 6b9ff0ddc4dea6bf892e0fc459f03e4e0f829879
The following commit has been merged in the master branch: commit 6b9ff0ddc4dea6bf892e0fc459f03e4e0f829879 Author: Ole Streicher Date: Tue Apr 5 14:38:04 2016 +0200 Remove astronomy from science-config as well diff --git a/config/control b/config/control index daa5a56..9f000b0 100644 --- a/config/control +++ b/config/control @@ -7,9 +7,6 @@ Description: Debian Science Project config package . These are the science related metapackages in the Debian Science project: . - * science-astronomy packages related to astronomy - * science-astronomy-dev packages related to development of -astronomical applications * science-biology packages related to biology * science-chemistry packages related to chemistry * science-dataacquisition packages related to data acquisition @@ -66,7 +63,6 @@ Description: Debian Science Project config package * science-tools packages containing misc tools useful in science * science-typesetting packages related to typesetting * science-viewing packages related to viewing - * science-viewing packages related to viewing * science-viewing-dev packages related to development of viewing applications . diff --git a/debian/control b/debian/control index d37021c..dba46be 100644 --- a/debian/control +++ b/debian/control @@ -67,9 +67,6 @@ Description: Debian Science Project config package . These are the science related metapackages in the Debian Science project: . - * science-astronomy packages related to astronomy - * science-astronomy-dev packages related to development of -astronomical applications * science-biology packages related to biology * science-chemistry packages related to chemistry * science-dataacquisition packages related to data acquisition @@ -126,7 +123,6 @@ Description: Debian Science Project config package * science-tools packages containing misc tools useful in science * science-typesetting packages related to typesetting * science-viewing packages related to viewing - * science-viewing packages related to viewing * science-viewing-dev packages related to development of viewing applications . -- 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. c5f32703829ec6bd43385c3fba9533188c72beae
The following commit has been merged in the master branch: commit c5f32703829ec6bd43385c3fba9533188c72beae Author: Ole Streicher Date: Tue Apr 5 14:33:26 2016 +0200 Push Standards-Version to 3.9.7; Change default Priority to optional diff --git a/debian/changelog b/debian/changelog index 323c312..58a6b2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ debian-science (1.5) UNRELEASED; urgency=medium * Replace astronomy and astronomy-dev packages with the metapackages from debian-astro * Recommend other science blends tasks in science-tasks + * Change default Priority to optional + * Push Standards-Version to 3.9.7 (No changes) [ Andreas Tille ] * Add new task imageanalysis-dev diff --git a/debian/control b/debian/control index aea6874..d37021c 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ # This file is autogenerated via make -f debian/rules dist. Do not edit! Source: debian-science Section: science -Priority: extra +Priority: optional Maintainer: Debian Science Team Uploaders: Frederic Daniel Luc Lehobey , Andreas Tille , Sylvestre Ledru Build-Depends-Indep: blends-dev (>= 0.6.15) -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Vcs-Browser: https://anonscm.debian.org/cgit/blends/projects/science.git Vcs-Git: https://anonscm.debian.org/git/blends/projects/science.git Homepage: http://wiki.debian.org/DebianScience/ -- 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. c5f32703829ec6bd43385c3fba9533188c72beae
The following commit has been merged in the master branch: commit bbbc0c262b4f9331033ebb34f44076cc334322f1 Author: Ole Streicher Date: Tue Apr 5 14:29:03 2016 +0200 Recommend other science blends tasks in science-tasks diff --git a/debian/changelog b/debian/changelog index 3e0b2cc..323c312 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ debian-science (1.5) UNRELEASED; urgency=medium [ Ole Streicher ] * Replace astronomy and astronomy-dev packages with the metapackages from debian-astro + * Recommend other science blends tasks in science-tasks [ Andreas Tille ] * Add new task imageanalysis-dev diff --git a/debian/control b/debian/control index da7db54..aea6874 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,9 @@ Homepage: http://wiki.debian.org/DebianScience/ Package: science-tasks Architecture: all Depends: tasksel +Recommends: astro-tasks, +debichem-tasks, +med-tasks Description: Debian Science tasks for tasksel This package is part of the Debian Pure Blend "Debian Science" and provides additional tasks for tasksel. If this package will be installed all tasks diff --git a/debian/control.stub b/debian/control.stub index 863b860..0758f20 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -14,6 +14,9 @@ Homepage: http://wiki.debian.org/DebianScience/ Package: science-tasks Architecture: all Depends: tasksel +Recommends: astro-tasks, +debichem-tasks, +med-tasks Description: Debian Science tasks for tasksel This package is part of the Debian Pure Blend "Debian Science" and provides additional tasks for tasksel. If this package will be installed all tasks -- 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. c5f32703829ec6bd43385c3fba9533188c72beae
The following commit has been merged in the master branch:
commit 7e58509786d44c222051c274dc9344b18f9d9a0a
Author: Ole Streicher
Date: Tue Apr 5 14:12:17 2016 +0200
Make astronomy metapackages transional
diff --git a/debian-science-tasks.desc b/debian-science-tasks.desc
index 87139de..8a39b62 100644
--- a/debian-science-tasks.desc
+++ b/debian-science-tasks.desc
@@ -4,26 +4,6 @@ Section: debian-science
Description: Debian Science Pure Blend
.
-Task: science-astronomy
-Parent: debian-science
-Section: debian-science
-Description: Debian Science Astronomy 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
- install all user related tasks from Debian-Astro.
-Key:
- science-astronomy
-
-Task: science-astronomy-dev
-Parent: debian-science
-Section: debian-science
-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
- install all development related tasks from Debian-Astro.
-Key:
- science-astronomy-dev
-
Task: science-bci
Parent: debian-science
Section: debian-science
diff --git a/debian/control b/debian/control
index da7..da7db54 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Frederic Daniel Luc Lehobey ,
Build-Depends-Indep: blends-dev (>= 0.6.15)
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/blends/projects/science.git
-Vcs-Git: git://anonscm.debian.org/blends/projects/science.git
+Vcs-Git: https://anonscm.debian.org/git/blends/projects/science.git
Homepage: http://wiki.debian.org/DebianScience/
Package: science-tasks
@@ -20,6 +20,41 @@ Description: Debian Science tasks for tasksel
additional tasks for tasksel. If this package will be installed all tasks
which are provided by Debian Science will be added to the tasksel menu.
+Package: science-astronomy
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: astro-catalogs,
+ astro-datareduction,
+ astro-education,
+ astro-frameworks,
+ astro-gdl,
+ astro-publication,
+ astro-python,
+ astro-python3,
+ astro-simulation,
+ astro-telescopecontrol,
+ astro-tools,
+ astro-viewers
+Description: Debian Science Astronomy 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
+ install all user related tasks from Debian-Astro.
+
+Package: science-astronomy-dev
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: astro-development,
+ astro-java,
+ astro-python,
+ astro-python3,
+ astro-tcltk
+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
+ install all development related tasks from Debian-Astro.
+
Package: science-config
Architecture: all
Depends: adduser, ${misc:Depends}, menu, blends-common (>= 0.6.15)
@@ -101,9 +136,7 @@ Description: Debian Science Project config package
Package: science-all
Section: metapackages
Architecture: all
-Recommends: science-astronomy,
- science-astronomy-dev,
- science-biology,
+Recommends: science-biology,
science-chemistry,
science-dataacquisition,
science-dataacquisition-dev,
@@ -148,26 +181,6 @@ Description: Default selection of tasks for Debian Science
This package is part of the Debian Science Pure Blend and installs all
tasks for a default installation of this blend.
-Package: science-astronomy
-Section: metapackages
-Architecture: all
-Depends: science-tasks (= ${binary:Version}), science-config (=
${binary:Version})
-Recommends: astro-catalogs
-Description: Debian Science Astronomy 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
- install all user related tasks from Debian-Astro.
-
-Package: science-astronomy-dev
-Section: metapackages
-Architecture: all
-Depends: science-tasks (= ${binary:Version}), science-config (=
${binary:Version})
-Recommends: astro-development
-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
- install all development related tasks from Debian-Astro.
-
Package: science-biology
Section: metapackages
Architecture: all
diff --git a/debian/control.stub b/debian/control.stub
index b698296..863b860 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -19,3 +19,38 @@ Description:
[Blends-commit] [SCM] blends-dev branch, master, updated. 65bfff2268dcce1abba377d290c6b3bc13b994ea
The following commit has been merged in the master branch:
commit 65bfff2268dcce1abba377d290c6b3bc13b994ea
Author: Ole Streicher
Date: Mon Apr 4 20:39:27 2016 +0200
New header keyword "Install"
Setting this to false causes the corresponding task not installed by
debinstaller. Default is true.
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index f9c1681..71f52b1 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -185,10 +185,10 @@ sub gen_control {
for $task (sort keys %taskinfo) {
next if (exists $taskinfo{$task}{'Metapackage'} &&
$taskinfo{$task}{'Metapackage'} eq 'false');
- if ( $suppressempty && $taskinfo{$task}{'haspackages'} == 0 ) {
- next ;
- }
- push (@list, $task)
+next if (exists $taskinfo{$task}{'Install'} &&
+$taskinfo{$task}{'Install'} eq 'false');
+next if ( $suppressempty && $taskinfo{$task}{'haspackages'} == 0 );
+push (@list, $task)
}
print "Recommends: ";
print join(",\n ",@list);
@@ -515,7 +515,7 @@ sub load_task {
$line =~ s/\s+$//;
$_ = $line;
-for my $header (qw(Section Architecture Priority Leaf Enhances
Metapackage)) {
+for my $header (qw(Section Architecture Priority Leaf Enhances
Metapackage Install)) {
$taskinfo{$curpkg}{$header} = $1 if (m/^$header:\s+(.+)$/);
}
$taskinfo{$curpkg}{$1} = $2 if (m/^(test-.+):\s+(.+)$/i);
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 00dfa40971d40301db1298e3adab8baf5167df0b
The following commit has been merged in the master branch:
commit 98cf1c1a94ebde4286dcb9474eb60d0db722dab1
Author: Ole Streicher
Date: Mon Apr 4 15:36:13 2016 +0200
Omit the 'Pure Blend' from the blends title
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 735a62a..786607f 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -263,7 +263,7 @@ sub print_task_desc {
print "Section: $blendname\n";
# print "Key: \n";
# print " $blendshortname-tasks\n";
- print "Description: $blendtitle\n";
+ print "Description: $blendtitle Pure Blend\n";
print " .\n"; # no long description available
print "\n";
diff --git a/devtools/blend-get-names b/devtools/blend-get-names
index 4509592..6bfd1d4 100755
--- a/devtools/blend-get-names
+++ b/devtools/blend-get-names
@@ -37,7 +37,7 @@ case "$1" in
exit 0
;;
blendtitle) # default title is the short name with capital first char
- GetShortName | sed 's/.*/Debian \u& Pure Blend/'
+ GetShortName | sed 's/.*/Debian \u&/'
exit 0
;;
metapackageprefix)
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 00dfa40971d40301db1298e3adab8baf5167df0b
The following commit has been merged in the master branch:
commit 00dfa40971d40301db1298e3adab8baf5167df0b
Author: Ole Streicher
Date: Mon Apr 4 15:37:43 2016 +0200
Add a $blend-all task
This task contains the default (complete, in the moment) selection of tasks
for the Debian installer.
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 786607f..f9c1681 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -177,6 +177,25 @@ sub uniq {
sub gen_control {
my $task;
+
+print "Package: $blendshortname-all\n";
+print "Section: metapackages\n" ;
+print "Architecture: all\n";
+my @list;
+for $task (sort keys %taskinfo) {
+next if (exists $taskinfo{$task}{'Metapackage'} &&
+$taskinfo{$task}{'Metapackage'} eq 'false');
+ if ( $suppressempty && $taskinfo{$task}{'haspackages'} == 0 ) {
+ next ;
+ }
+ push (@list, $task)
+}
+print "Recommends: ";
+print join(",\n ",@list);
+print "\nDescription: Default selection of tasks for $blendtitle\n";
+print " This package is part of the $blendtitle Pure Blend and installs
all\n";
+print " tasks for a default installation of this blend.\n\n";
+
for $task (sort keys %taskinfo) {
next if (exists $taskinfo{$task}{'Metapackage'} &&
$taskinfo{$task}{'Metapackage'} eq 'false');
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 28ce363d376a03462c1cf219ced9df90b2e02e4c
The following commit has been merged in the master branch: commit 5c3b9b878e3f02a189a0bba490c617dede09fbd6 Author: Ole Streicher Date: Sun Apr 3 13:43:09 2016 +0200 Update Standards-Version to 3.9.7: Change VCS-Git URL to https diff --git a/debian/changelog b/debian/changelog index 9ba5722..37ba792 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ blends (0.6.92.6) UNRELEASED; urgency=medium * Fix Relevance field for tasksel * Group tasks of one blend under a parent in tasksel + * Update Standards-Version to 3.9.7: Change VCS-Git URL to https -- Ole Streicher Thu, 31 Mar 2016 15:33:25 +0200 diff --git a/debian/control b/debian/control index 56de08f..2f3d65b 100644 --- a/debian/control +++ b/debian/control @@ -12,9 +12,9 @@ Build-Depends: debhelper (>= 9) Build-Depends-Indep: xmlto, dblatex, w3m -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Vcs-Browser: https://anonscm.debian.org/cgit/blends/blends.git -Vcs-Git: git://anonscm.debian.org/blends/blends.git +Vcs-Git: https://anonscm.debian.org/git/blends/blends.git Package: blends-dev Architecture: all -- Git repository for blends code ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 28ce363d376a03462c1cf219ced9df90b2e02e4c
The following commit has been merged in the master branch: commit 28ce363d376a03462c1cf219ced9df90b2e02e4c Author: Ole Streicher Date: Sun Apr 3 13:37:41 2016 +0200 New package blends-tasks. Closes: #758116 diff --git a/debian-blends-tasks.desc b/debian-blends-tasks.desc new file mode 100644 index 000..0d934b1 --- /dev/null +++ b/debian-blends-tasks.desc @@ -0,0 +1,179 @@ +Task: debian-blends +Relevance: 7 +Section: debian-blends +Description: Debian Pure Blends + Debian Pure Blends are a solution for groups of people with specific + needs. They cover the interests of different groups of people, who + might be children, scientists, gamers, lawyers, medical staff, + visually impaired people, etc. +Test-new-install: show skip + +Task: debian-science +Parent: debian-blends +Section: debian-blends +Description: Debian Science + The goal of Debian Science is to provide a better experience when + using Debian to researchers and scientists. +Test-new-install: show skip +Key: + science-tasks +Packages: list + science-all + +Task: debian-astro +Parent: debian-blends +Section: debian-blends +Description: Debian Astro + Debian Astro is a spin-off from the Debian Science Pure Blend with the + goal to support both professional and amateur astronomers. +Test-new-install: show skip +Key: + astro-tasks +Packages: list + astro-all + +Task: debichem +Parent: debian-blends +Section: debian-blends +Description: DebiChem + Debichem is a Debian Pure Blend targeted at Chemistry. The Debichem + Team also maintains most of the chemistry-related packages in Debian, + although some additional packages from other packagers or packaging + teams are available in the Debichem metapackages. +Test-new-install: show skip +Key: + debichem-tasks +Packages: list + debichem-all + +Task: debian-games +Parent: debian-blends +Section: debian-blends +Description: Debian Games + The goal of Debian Games is to provide games in Debian from arcade + and aventure to simulation and strategy. +Test-new-install: show skip +Key: games-tasks +Packages: list + games-all + +Task: debian-med +Parent: debian-blends +Section: debian-blends +Description: Debian Med + Debian Med is a "Debian Pure Blend" with the aim to develop Debian + into an operating system that is particularly well fit for the + requirements for medical practice and biomedical research. The goal + of Debian Med is a complete free and open system for all tasks in + medical care and research. To achieve this goal Debian Med integrates + related free and open source software for medical imaging, + bioinformatics, clinic IT infrastructure, and others within Debian OS. +Test-new-install: show skip +Key: + med-tasks +Packages: list + med-all + +Task: debian-edu +Parent: debian-blends +Section: debian-blends +Description: Debian Edu + DebianEdu/Skolelinux is an operating system intended for educational + use and a Debian Pure Blend . As skole [skuːlə] is the Norwegian word + for school, Skolelinux's literal translation is "school linux". It + has been created as an overall free software computer solution + designed to fit on school's resources and needs and is currently + being internationally developed by a large international and growing + community. +Test-new-install: show skip +Key: + education-tasks +Packages: list + education-all + +Task: debian-gis +Parent: debian-blends +Section: debian-blends +Description: Debian GIS + Debian GIS is a "Debian Pure Blend" with the aim to develop Debian + into the best distribution for Geographical Information System + applications and users. +Test-new-install: show skip +Key: + gis-tasks +Packages: list + gis-all + +Task: debian-junior +Parent: debian-blends +Section: debian-blends +Description: Debian Junior + This is a Debian Pure Blend (in short Blend). Our goal is to make + Debian an OS that children of all ages will want to use. Our initial + focus will be on producing something for children up to age 8. Once + we have accomplished this, our next target age range is 7 to 12. By + the time children reach their teens, they should be comfortable with + using Debian without any special modifications. +Test-new-install: show skip +Key: + junior-tasks +Packages: list + junior-all + +Task: debian-multimedia +Parent: debian-blends +Section: debian-blends +Description: DebianMultimedia + The Debian Multimedia Maintainers team aims to make Debian a good + platform for audio and multimedia work. This basically means + packaging/maintaining multimedia applications and libraries, and + collaborating with other maintainers or teams as well as upstream + projects in order to improve audio/video support in Debian. +Test-new-install: show skip +Key: + multimedia-tasks +Packages: list + multimedia-all + +Task: debian-accessibility +Parent: debian-blends +Section: debian-blends +Description: Debian Accessibility + The goal of Debian Accessibility is to develop Debian into an + operating system that is particularly well
[Blends-commit] [SCM] blends-dev branch, master, updated. 635a33a63228ace10fddd6ae0c8d354787e5dda5
The following commit has been merged in the master branch:
commit 635a33a63228ace10fddd6ae0c8d354787e5dda5
Author: Ole Streicher
Date: Fri Apr 1 10:44:04 2016 +0200
Remove Relevance and Packages: list fields from individual tasks
The parent already has Relevance: 9, and the tasks are sorted below that.
The package list is redundant since the packages are installed from the
tasks file specified in the "Key:" field.
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 90093cb..735a62a 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -294,7 +294,6 @@ sub print_task_desc {
print "Section: $blendname\n";
print "Description: $taskinfo{$task}{Description}\n";
print "$taskinfo{$task}{'Description-long'}"; # Already
contain newline
-print "Relevance: 9\n";
print "Enhances: $taskinfo{$task}{Enhances}\n"
if exists $taskinfo{$task}{Enhances};
for $header (keys %{$taskinfo{$task}}) {
@@ -316,14 +315,6 @@ sub print_task_desc {
$seen{$package} = 1;
}
}
-print "Packages: list\n";
-for my $header (qw(Depends Recommends)) {
-@_ = task_packages($task, $header, 1);
-foreach my $package (sort @_) {
-print " $package\n" unless $seen{$package};
-$seen{$package} = 1;
-}
-}
print "\n";
}
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 1f366f8aa778d0b3c4b0ce274765365d636a0d62
The following commit has been merged in the master branch: commit 1f366f8aa778d0b3c4b0ce274765365d636a0d62 Author: Ole Streicher Date: Thu Mar 31 15:39:00 2016 +0200 Document changes in d/changelog diff --git a/debian/changelog b/debian/changelog index 3f68fa3..9ba5722 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +blends (0.6.92.6) UNRELEASED; urgency=medium + + * Fix Relevance field for tasksel + * Group tasks of one blend under a parent in tasksel + + -- Ole Streicher Thu, 31 Mar 2016 15:33:25 +0200 + blends (0.6.92.5) unstable; urgency=medium [ Markus Koschany ] -- Git repository for blends code ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 35d46f354547349e7c20f48458df33a908398027
The following commit has been merged in the master branch: commit 1b58bf6cb0cdee085d383c9b2205beb58bec19e9 Author: Ole Streicher Date: Thu Mar 31 15:28:38 2016 +0200 Add (simple) blendtitle as parameter of blend-get-names diff --git a/devtools/blend-get-names b/devtools/blend-get-names index 89a5647..4509592 100755 --- a/devtools/blend-get-names +++ b/devtools/blend-get-names @@ -22,7 +22,7 @@ fi if [ "$#" -ne 1 ] ; then echo "Missing argument" - echo "Usage: $0 blendname|blendshortname|metapackageprefix" + echo "Usage: $0 blendname|blendshortname|blendtitle|metapackageprefix" exit 64 # EX_USAGE fi @@ -36,6 +36,10 @@ case "$1" in GetShortName exit 0 ;; +blendtitle) # default title is the short name with capital first char + GetShortName | sed 's/.*/Debian \u& Pure Blend/' + exit 0 + ;; metapackageprefix) mprefix=`grep '^Package:[[:space:]]*' "$CONTROLFILE" |head -1| \ sed 's/^Package:[[:space:]]*\([[:alnum:]]\+\)-*.*/\1/'` -- Git repository for blends code ___ Blends-commit mailing list Blends-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 35d46f354547349e7c20f48458df33a908398027
The following commit has been merged in the master branch:
commit 35d46f354547349e7c20f48458df33a908398027
Author: Ole Streicher
Date: Thu Mar 31 15:29:28 2016 +0200
Group tasks of one blend under a parent task
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 668a48c..90093cb 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -39,6 +39,7 @@ my $CommonPackage = "" ;
my $prefix= "test-" ;
my $blendname = "" ;
my $blendshortname = "" ;
+my $blendtitle = "" ;
my $tasksname = "" ;
my $hasconfig = 0 ;
@@ -257,6 +258,15 @@ sub gen_control {
# Enable to list all dependencies as key packages
my $task_depends_are_keys = 0;
sub print_task_desc {
+print "Task: $blendname\n";
+ print "Relevance: 9\n";
+ print "Section: $blendname\n";
+# print "Key: \n";
+# print " $blendshortname-tasks\n";
+ print "Description: $blendtitle\n";
+ print " .\n"; # no long description available
+ print "\n";
+
foreach my $task (sort keys %taskinfo) {
next if (exists $taskinfo{$task}{'Leaf'} &&
$taskinfo{$task}{'Leaf'} eq 'false');
@@ -280,6 +290,7 @@ sub print_task_desc {
}
}
print "Task: $task\n";
+print "Parent: $blendname\n";
print "Section: $blendname\n";
print "Description: $taskinfo{$task}{Description}\n";
print "$taskinfo{$task}{'Description-long'}"; # Already
contain newline
@@ -677,6 +688,7 @@ sub blend_init {
$tasksname= $prefix . "tasks";
chomp($blendshortname = `$blend_dev_dir/blend-get-names
blendshortname`);
chomp($blendname = `$blend_dev_dir/blend-get-names blendname`);
+ chomp($blendtitle = `$blend_dev_dir/blend-get-names blendtitle`);
}
if ( -d "config" && -e "config/control" ) {
$hasconfig = 1;
--
Git repository for blends code
___
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
[Blends-commit] [SCM] blends-dev branch, master, updated. 82f33c1561ce735e8d93403bc91268eb1152aeff
The following commit has been merged in the master branch:
commit 82f33c1561ce735e8d93403bc91268eb1152aeff
Author: Ole Streicher
Date: Thu Mar 31 14:28:48 2016 +0200
Fix "Relevance" field of tasks.
This needs to be a one-digit number.
diff --git a/devtools/blend-gen-control b/devtools/blend-gen-control
index 2cae3dd..668a48c 100755
--- a/devtools/blend-gen-control
+++ b/devtools/blend-gen-control
@@ -283,7 +283,7 @@ sub print_task_desc {
print "Section: $blendname\n";
print "Description: $taskinfo{$task}{Description}\n";
print "$taskinfo{$task}{'Description-long'}"; # Already
contain newline
-print "Relevance: 10\n";
+print "Relevance: 9\n";
print "Enhances: $taskinfo{$task}{Enhances}\n"
if exists $taskinfo{$task}{Enhances};
for $header (keys %{$taskinfo{$task}}) {
--
Git repository for blends code
___
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. 03683493aedf7804a4cbba659aa41426c44e3520
The following commit has been merged in the master branch: commit 03683493aedf7804a4cbba659aa41426c44e3520 Author: Ole Streicher Date: Fri Mar 25 15:57:07 2016 +0100 Temporarily keep glueviz until we have a screenshot for python3-glue diff --git a/webtools/templates/debian-astro_idx.xhtml b/webtools/templates/debian-astro_idx.xhtml index e8b0b23..ffec737 100644 --- a/webtools/templates/debian-astro_idx.xhtml +++ b/webtools/templates/debian-astro_idx.xhtml @@ -47,7 +47,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. 0f63e18424fc1b25a8f6af7adc545bf5c706e6c7
The following commit has been merged in the master branch: commit 0f63e18424fc1b25a8f6af7adc545bf5c706e6c7 Author: Ole Streicher Date: Fri Mar 25 15:35:32 2016 +0100 Replace glueviz by python3-glue diff --git a/webtools/templates/debian-astro_idx.xhtml b/webtools/templates/debian-astro_idx.xhtml index c49d63b..e8b0b23 100644 --- a/webtools/templates/debian-astro_idx.xhtml +++ b/webtools/templates/debian-astro_idx.xhtml @@ -47,7 +47,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. 9265134b3fd1e0cf494470c898970ce1a9a41664
The following commit has been merged in the master branch:
commit 9265134b3fd1e0cf494470c898970ce1a9a41664
Author: Ole Streicher
Date: Thu Mar 24 08:26:19 2016 +0100
Fix Task.getPackageNames()
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 7754a58..5f795ee 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1017,8 +1017,8 @@ class Tasks:
logger.debug(" %s -> %s" % (enh,
dep.properties['Enhances'][enh]))
def getPackageNames(self, sections):
-return set(*(task.getPackageNames(sections)
- for task in self.tasks.values()))
+return set(itertool.chain(*(task.getPackageNames(sections)
+for task in self.tasks.values(
class TaskDependencies:
# List of depencencies defined in one metapackage
diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index bb302c2..1f4ee2b 100644
--- a/webtools/blendstasktools_udd.py
+++ b/webtools/blendstasktools_udd.py
@@ -946,8 +946,8 @@ class Tasks:
logger.debug(" %s -> %s" % (enh,
dep.properties['Enhances'][enh]))
def getPackageNames(self, sections):
-return set(*(task.getPackageNames(sections)
- for task in self.tasks.values()))
+return set(itertool.chain(*(task.getPackageNames(sections)
+for task in self.tasks.values(
class TaskDependencies:
# List of depencencies defined in one metapackage
--
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. 89c601c11eb22ba6b62a0c62f1f6e255ac7b9803
The following commit has been merged in the master branch:
commit 8a4a6e8e3668a223b4d6e785f1d5643bdf1a3bb4
Author: Ole Streicher
Date: Tue Mar 22 08:47:55 2016 +0100
Change DependantPackage.SetPublications to a function.
Since this was the only method of DependantPackage, this class can now
replaced
by a dict.
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 3487843..d6c1c18 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -748,60 +748,60 @@ class DependantPackage:
#ret += ", desc['en']:" + str(self.desc['en'])
return ret
-def SetPublications(self, taskname, row):
-for pub in ("year", "title", "authors", "doi", "pubmed", "url",
-"journal", "volume", "number", "pages", "eprint"):
-if row[pub]:
-if pub == "pages":
-row[pub] = re.sub("--", "-", row[pub])
-if (pub == "authors" and row[pub].count(" and ") or
row[pub].count(" AND ")):
-# assume "authors" string is a regular BibTeX "and"
separated list of authors
-row[pub] = re.sub("AND", "and", row[pub].strip())
-authors_list = row[pub].split(" and ")
-# normalize several BibTeX styles to "First Last, First
Last and First Last":
-# 1. "First Last and First Last and First Last"
-# 2. "Last, First and Last, First and Last, First"
-# 3. "First Last, First Last and First Last"
-authors_string = ""
-while (authors_list):
-author = authors_list.pop(0)
-if (author.count(",") > 1):
-# 3. "First Last, First Last and First Last"
-# authors string is already in desired format,
keep it
-authors_string = row[pub].strip()
-break
-elif (row[pub].count(",") == row[pub].count(" and ") +
1):
-# 2. "Last, First and Last, First and Last, First"
-# reverse last and first name
-(last, first) = author.split(", ")
-full_author = first + " " + last
-else:
-# 1. "First Last and First Last and First Last"
-full_author = author
-if (len(authors_list) > 1):
-authors_string += full_author + ", "
-elif (len(authors_list) > 0):
-authors_string += full_author + " and "
-else:
-authors_string += full_author
-if row[pub] != authors_string:
-# emergency brake if algorithm fails to detect
non-names like '1000 Genome Project Data Processing Subgroup'
-if authors_string.count(',') > row[pub].count(' and '):
-logger.warning("Refuse to change Author string in
%s: '%s'(%i) -> '%s'(%i)"
- % (self.properties['name'],
row[pub], row[pub].count(' and '), authors_string, authors_string.count(',')))
-else:
-logger.debug("Author string changed in %s: '%s' ->
'%s'"
- % (self.properties['name'], row[pub],
authors_string))
-row[pub] = authors_string
-if 'published' not in self.properties:
-self.properties['published'] = {}
-if pub in self.properties['published']:
-if self.properties['published'][pub] == row[pub]:
-rmpub.write("%s: %s: Published-%s: %s" % (taskname,
self.properties['name'], pub, row[pub]))
-logger.info("%s/%s: Publication-%s = %s can be
removed" % (taskname, self.properties['name'], pub, row[pub]))
+def setPublications(dep, taskname, row):
+for pub in ("year", "title", "authors", "doi", "pubmed", "url",
+"journ
[Blends-commit] [SCM] website branch, master, updated. 89c601c11eb22ba6b62a0c62f1f6e255ac7b9803
The following commit has been merged in the master branch:
commit 89c601c11eb22ba6b62a0c62f1f6e255ac7b9803
Author: Ole Streicher
Date: Wed Mar 23 20:52:33 2016 +0100
Remove duplicates from package count, and use only existing packages
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index d6c1c18..7754a58 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -13,6 +13,7 @@ License: GPL
'''
from sys import stderr, exit
+import itertools
from subprocess import Popen, PIPE
import codecs
import os
@@ -1015,8 +1016,9 @@ class Tasks:
break
logger.debug(" %s -> %s" % (enh,
dep.properties['Enhances'][enh]))
-def getPackageCount(self):
-return sum(task.getPackageCount() for task in self.tasks.values())
+def getPackageNames(self, sections):
+return set(*(task.getPackageNames(sections)
+ for task in self.tasks.values()))
class TaskDependencies:
# List of depencencies defined in one metapackage
@@ -1702,8 +1704,11 @@ class TaskDependencies:
self.dependencies[dependency].sort()
return 1 # Success
-def getPackageCount(self):
-return sum(len(dep) for dep in self.dependencies.values())
+def getPackageNames(self, sections):
+return set(itertools.chain(*(
+(dep.properties['name'] for dep in self.dependencies[d])
+for d in sections
+)))
def _QueryUDD4Package(self, source):
query = "EXECUTE pkg_releases ('%s', '%s')" %
(self.properties['name'], self.properties['component'])
diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index ef39ea9..bb302c2 100644
--- a/webtools/blendstasktools_udd.py
+++ b/webtools/blendstasktools_udd.py
@@ -13,6 +13,7 @@ License: GPL
'''
from sys import stderr, exit
+import itertools
import codecs
import os
import grp
@@ -944,8 +945,9 @@ class Tasks:
break
logger.debug(" %s -> %s" % (enh,
dep.properties['Enhances'][enh]))
-def getPackageCount(self):
-return sum(task.getPackageCount() for task in self.tasks.values())
+def getPackageNames(self, sections):
+return set(*(task.getPackageNames(sections)
+ for task in self.tasks.values()))
class TaskDependencies:
# List of depencencies defined in one metapackage
@@ -1264,8 +1266,11 @@ class TaskDependencies:
return 1
-def getPackageCount(self):
-return sum(len(dep) for dep in self.dependencies.values())
+def getPackageNames(self, sections):
+return set(itertools.chain(*(
+(dep.properties['name'] for dep in self.dependencies[d])
+for d in sections
+)))
def __str__(self):
ret = "Blend: " + self.blendname + ", " \
diff --git a/webtools/tasks.py b/webtools/tasks.py
index ae5f3ec..a2b1ceb 100755
--- a/webtools/tasks.py
+++ b/webtools/tasks.py
@@ -30,12 +30,13 @@ packages = tasks.GetNamesOnlyDict()
tasks.GetAllDependentPackagesOfBlend()
data = tasks.data
-data['timestamp']= formatdate(time.mktime(datetime.now().timetuple()))
-data['tasks']= tasks.GetTaskDescDict()
-data['taskskeys']= tasks.metapackagekeys
-data['pkgcount'] = tasks.getPackageCount()
+data['timestamp'] = formatdate(time.mktime(datetime.now().timetuple()))
+data['tasks'] = tasks.GetTaskDescDict()
+data['taskskeys'] = tasks.metapackagekeys
+data['pkgcount'] = len(tasks.getPackageNames(['official_high', 'official_low',
+ 'non-free', 'experimental']))
data['popconsubmit'] = tasks.popconsubmit or 'unknown'
-data['languages']= languages
+data['languages'] = languages
# Define directories used
current_dir = os.path.dirname(__file__)
diff --git a/webtools/tasks_udd.py b/webtools/tasks_udd.py
index e069afc..2fe47de 100755
--- a/webtools/tasks_udd.py
+++ b/webtools/tasks_udd.py
@@ -30,12 +30,13 @@ packages = tasks.GetNamesOnlyDict()
tasks.GetAllDependentPackagesOfBlend()
data = tasks.data
-data['timestamp']= formatdate(time.mktime(datetime.now().timetuple()))
-data['tasks']= tasks.GetTaskDescDict()
-data['taskskeys']= tasks.metapackagekeys
-data['pkgcount'] = tasks.getPackageCount()
+data['timestamp'] = formatdate(time.mktime(datetime.now().timetuple()))
+data['tasks'] = tasks.GetTaskDescDict()
+data['taskskeys'] = tasks.metapackagekeys
+data[&#
[Blends-commit] [SCM] website branch, master, updated. c28c481491f9c9bc2b605fe78247b9c59356ea6a
The following commit has been merged in the master branch: commit c28c481491f9c9bc2b605fe78247b9c59356ea6a Author: Ole Streicher Date: Mon Mar 21 10:15:28 2016 +0100 Reformat maintainer stats to fit into Debian Astro Web pages diff --git a/www/astro/contribute.html b/www/astro/contribute.html index e135652..205376c 100644 --- a/www/astro/contribute.html +++ b/www/astro/contribute.html @@ -109,6 +109,11 @@ of the Debian Astro Pure Blend: + + Maintainer statistics + + + http://blends.debian.org/astro/bugs/";> Coloured bugs page @@ -118,11 +123,6 @@ Coloured package list (thermometer) - - http://blends.debian.org/astro/maintstats/";> - Maintainer statistics - - diff --git a/www/astro/maintstats.html b/www/astro/maintstats.html new file mode 100644 index 000..da5b9b8 --- /dev/null +++ b/www/astro/maintstats.html @@ -0,0 +1,95 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> + +Debian Astro Maintainer Statistics + +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 + + + + Debian Astro + Packages + Contact + Contribute + + + + http://blends.debian.org";>Debian Pure Blends + / Debian Astro + / contribute + / maintainer statistics + + + + Debian Astro Maintainer Statistics + + + http://blends.debian.net/liststats/authorstat_debian-astro.png"; + title="Active writers on debian-as...@lists.debian.org" + alt="Bar chart of active writers on mailing list" + width="100%"> + + + http://blends.debian.net/liststats/commitstat_debian-astro.png"; + title="Commits SVN/Git" + alt="Bar chart of Commits to Debian Astro repositories obtained via teammetrics project" + width="100%"> + + + + + http://blends.debian.net/liststats/authorstat_debian-astro-packaging.png"; + title="Active writers development list debian-astro-packag...@lists.alioth.debian.org" + alt="Bar chart of active writers on packaging list" + width="100%"> + + + http://blends.debian.net/liststats/uploaders_debian-astro.png"; + title="Uploaders of Debian Astro packages" + alt="Bar chart of Debian Astro uploaders" + width="100%"> + + + + + http://blends.debian.net/liststats/bugs_debian-astro.png"; + title="Bugs closed by Debian Astro team members" + alt="Bar chart of bugs closed by Debian Astro team members" + width="100%"> + + + http://blends.debian.net/liststats/maintainer_per_package_debian-astro.png"; + title="Bugs closed by Debian Astro team members" + alt="Bar chart of bugs closed by Debian Astro team members" + width="100%"> + + + + + + + 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. + + + + diff --git a/www/astro/maintstats/index.html b/www/astro/maintstats/index.html deleted file mode 100644 index 96b58fc..000 --- a/www/astro/maintstats/index.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - Maintainer Statistics · Debian Astro Pure Blend - - - - - - - - - - -
[Blends-commit] [SCM] website branch, master, updated. be9c9fdeeba7084eac39e27279d9c76813233009
The following commit has been merged in the master branch:
commit be9c9fdeeba7084eac39e27279d9c76813233009
Author: Ole Streicher
Date: Mon Mar 21 09:35:52 2016 +0100
Fix access to not-yet-existing DependantPackage
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index e4a8c55..3487843 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -1176,7 +1176,7 @@ class TaskDependencies:
tmp_dep_list.append(dep)
if not dep_in_line.islower():
logger.warning("Package names may not contain
upper case letters, so %s is an invalid package name which is turned into %s"
- % (dep_in_line,
dep.properties['name']))
+ % (dep_in_line,
dep_in_line.lower()))
dep_in_line = dep_in_line.lower()
dep = DependantPackage(dep_in_line)
# Store the comments in case they might be usefull for
later applications
--
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. fee6695d591460d4515e4545e4d9d185a24bdced
The following commit has been merged in the master branch:
commit fee6695d591460d4515e4545e4d9d185a24bdced
Author: Ole Streicher
Date: Sun Mar 20 21:49:44 2016 +0100
Move desc into properties as well
Now, all attributes are in properties, and we could use the "properties"
dict
instead of the DependantPackage.
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 1433c60..e4a8c55 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -729,10 +729,7 @@ class DependantPackage:
# because Enhances relations are
quite seldom
self.properties['stable_testing_version'] = [] # (release, version)
tuples where release is codename for stable and testing
self.properties['version'] = [] # list of {'release', 'version',
'archs'} dictionary containing version and architecture information
-self.desc = {}# Prospective packages should have a
description ...
-# ... which could be copied to (or from if
exists)
-# WNPP bug and finally can be used for
packaging
-self.desc['en'] = {}# An English description should be
available in any case
+self.properties['desc'] = {'en': {}} # An English description should
be available in any case
# sort these objects according to the package name
def __cmp__(self, other):
@@ -744,8 +741,6 @@ class DependantPackage:
def __str__(self):
ret = "pkg:"+ self.properties['name']
-if self.desc:
-ret += ", desc: " + str(self.desc)
for prop in self.properties:
ret += ", %s: %s" % (prop, str(self.properties[prop]))
@@ -1065,15 +1060,15 @@ class TaskDependencies:
return
for lang in languages:
if ddtptranslations['description_' + lang['ddtp']]:
-self.metapkg.desc[lang['ddtp']] = {
+self.metapkg.properties['desc'][lang['ddtp']] = {
'short': ddtptranslations['description_' + lang['ddtp']]
}
try:
-self.metapkg.desc[lang['ddtp']]['long'] =
PrepareMarkdownInput(ddtptranslations['long_description_' + lang['ddtp']])
+self.metapkg.properties['desc'][lang['ddtp']]['long'] =
PrepareMarkdownInput(ddtptranslations['long_description_' + lang['ddtp']])
except AttributeError as err:
logger.error("===> AttributeError in metapackage long %s
(lang='%s'): '%s'; ErrTxt: %s"
% (self.metapkg.properties['name'],
lang['ddtp'], ddtptranslations['long_description_' + lang['ddtp']], err))
-self.metapkg.desc[lang['ddtp']]['long'] = 'Missing long
description'
+self.metapkg.properties['desc'][lang['ddtp']]['long'] =
'Missing long description'
def _AppendDependency2List(self, dep, source):
# Append dependency which was found in the tasks file if not Ignore /
Avoid and
@@ -1123,8 +1118,8 @@ class TaskDependencies:
logger.error("Duplicate description entry in task %s;
you probably want to use Pkg-Description field instead!" % self.task)
else:
(shortDesc, longDesc) =
SplitDescription(stanza['description'])
-self.metapkg.desc['en']['short'] = shortDesc
-self.metapkg.desc['en']['long'] = longDesc
+self.metapkg.properties['desc']['en']['short'] =
shortDesc
+self.metapkg.properties['desc']['en']['long'] =
longDesc
found_description = True
continue
if key == 'Meta-Depends':
@@ -1318,10 +1313,10 @@ class TaskDependencies:
%
stanza['pkg-description'].splitlines()[0])
else:
# Only update use description from task file if not
known from official package
-if dep.desc['en'] == {}:
+if dep.properties['desc']['en'] == {}:
(shortDesc, longDesc) =
SplitDescription(stanza['pkg-description'])
-de
[Blends-commit] [SCM] website branch, master, updated. e644763a5204df9f821bff6337f9d50654ae9b9c
The following commit has been merged in the master branch: commit e644763a5204df9f821bff6337f9d50654ae9b9c Author: Ole Streicher Date: Sun Mar 20 21:41:10 2016 +0100 Reset debugging stuff (other pg database etc.) that slipped into last commit diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py index eef328b..1433c60 100644 --- a/webtools/blendstasktools.py +++ b/webtools/blendstasktools.py @@ -279,8 +279,7 @@ def GetDependencies2Use(dependencystatus=[], max_order='prospective'): ### # Define several prepared statements to query UDD try: -conn = psycopg2.connect(host="public-udd-mirror.xvm.mit.edu", port=5432, -user="public-udd-mirror", password="public-udd-mirror", +conn = psycopg2.connect(host="localhost", port=PORT, user="guest", database="udd") except psycopg2.OperationalError as err: try: @@ -851,7 +850,6 @@ class Tasks: task for task in os.listdir(self.tasksdir) if os.path.isfile(os.path.join(self.tasksdir, task)) ) -self.metapackagekeys = ['python'] def GetAllDependencies(self, source=0): # If we want to subscribe ddpo we need the source package names. @@ -896,7 +894,6 @@ class Tasks: metapkg_translations[row['package']] = row for task in self.metapackagekeys: -print(task) td = TaskDependencies(self.blendname, task=task, tasksdir=self.tasksdir) pkgname = prefix + task translations = None -- 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. 9aa8df51f6ecda5a9242ea890e7e59eefde7f3a1
The following commit has been merged in the master branch:
commit 9aa8df51f6ecda5a9242ea890e7e59eefde7f3a1
Author: Ole Streicher
Date: Sun Mar 20 20:27:45 2016 +0100
Rename last .pkg -> .properties['name']
diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index 88707d2..eef328b 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -279,7 +279,8 @@ def GetDependencies2Use(dependencystatus=[],
max_order='prospective'):
###
# Define several prepared statements to query UDD
try:
-conn = psycopg2.connect(host="localhost", port=PORT, user="guest",
+conn = psycopg2.connect(host="public-udd-mirror.xvm.mit.edu", port=5432,
+user="public-udd-mirror",
password="public-udd-mirror",
database="udd")
except psycopg2.OperationalError as err:
try:
@@ -733,7 +734,6 @@ class DependantPackage:
# ... which could be copied to (or from if
exists)
# WNPP bug and finally can be used for
packaging
self.desc['en'] = {}# An English description should be
available in any case
-self.dep_strength = 0 # Type of Dependency (Depends, Recommends,
Suggests, Experimental, New, Avoid, Ignore, WNPP
# sort these objects according to the package name
def __cmp__(self, other):
@@ -745,8 +745,6 @@ class DependantPackage:
def __str__(self):
ret = "pkg:"+ self.properties['name']
-if self.dep_strength:
-ret += ", Dep_strength: " + self.dep_strength
if self.desc:
ret += ", desc: " + str(self.desc)
for prop in self.properties:
@@ -853,6 +851,7 @@ class Tasks:
task for task in os.listdir(self.tasksdir)
if os.path.isfile(os.path.join(self.tasksdir, task))
)
+self.metapackagekeys = ['python']
def GetAllDependencies(self, source=0):
# If we want to subscribe ddpo we need the source package names.
@@ -897,6 +896,7 @@ class Tasks:
metapkg_translations[row['package']] = row
for task in self.metapackagekeys:
+print(task)
td = TaskDependencies(self.blendname, task=task,
tasksdir=self.tasksdir)
pkgname = prefix + task
translations = None
@@ -1083,7 +1083,7 @@ class TaskDependencies:
# no dupplication in case of source depencencies
if dep is None:
return
-if dep.dep_strength == 'Ignore' or dep.dep_strength == 'Avoid':
+if dep.properties['dep_strength'] in ('Ignore', 'Avoid'):
logger.debug("Ignore/Avoid package : %s" % dep.properties['name'])
return
if source != 1:
@@ -1194,7 +1194,7 @@ class TaskDependencies:
(_name, _url) = email.utils.parseaddr(responsible)
dep.properties['maintainer'] = {'name':_name,
'email': _url}
-dep.dep_strength = key
+dep.properties['dep_strength'] = key
continue
@@ -1413,9 +1413,9 @@ class TaskDependencies:
# Debian Edu contains packages from main/debian-installer -
that's why we use startswith here
if row['component'].startswith('main'):
dep.properties['component'] = 'main'
-if dep.dep_strength == 'Depends' or dep.dep_strength ==
'Recommends':
+if dep.properties['dep_strength'] in ('Depends',
'Recommends'):
dep.properties['pkgstatus'] = 'official_high'
-elif dep.dep_strength == 'Suggests':
+elif dep.properties['dep_strength'] == 'Suggests':
dep.properties['pkgstatus'] = 'official_low'
else:
dep.properties['component'] = row['component']
@@ -1657,7 +1657,7 @@ class TaskDependencies:
'version':row['version']})
# Warn about remaining information of prospective package
if (dep.desc['en'] and dep.desc['en']['short']) or
dep.properties['homepage'] != HOMEPAGENONE:
-logger.info("The package %s is not yet in Debian but it is
just in Blends
