[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [RFR] templates://neurodebian/{neurodebian.templates}



Christian PERRIER wrote:
> It's indeed hard to detail each and every proposed changes : there are
> many because the original files had to be both reviewed for English
> usage....and also using the standardized writing style we usually
> recommend.
> 
> The same stands for debian/control.
>
> --- neurodebian.old/debian/neurodebian.templates	2015-05-21 21:14:37.627014717 +0200
> +++ neurodebian/debian/neurodebian.templates	2015-06-04 10:07:49.400262065 +0200
> @@ -5,26 +5,30 @@
>  Template: neurodebian/enable
>  Type: boolean
>  Default: false
> -_Description: Should NeuroDebian repository be enabled?
> +_Description: Enable the NeuroDebian packages repository?

Make that "package repository".

> - NeuroDebian project provides a separate APT repository with backport
> - builds of most recent releases of maintained software, datasets and
> - some software not in Debian proper yet.  Enabling this additional
> - repository will make those packages available on your base system.
> + The NeuroDebian project provides a separate APT repository with
> + the most recent releases of maintained software and datasets as
> + well as software that is not yet provided in Debian.

Are we avoiding the phrase "backport builds" on the basis that it's
developer jargon?  The trouble is, backports aren't necessarily the
same thing as "the most recent releases".  And does "maintained
software" mean "some software (which we're maintaining)" or "only the
software that's maintained"?  And doesn't the category "software that
is not yet provided in Debian" also cover both the backports and
datasets?

Maybe we should just say:

    The NeuroDebian project provides a separate APT repository with
    software that is not available in Debian, including datasets and
    backported new releases.

I should hope by the time they're reading this users would already
know what NeuroDebian is anyway.

> + .
> + If you choose this option, those packages will be available
> + for upgrades and installation.

Minor tweaks:
    .
    If you choose this option, these packages will be available for
    installation and upgrades.

> - .
> - Note: although NeuroDebian team aims to assure robust and correct
> - operation of provided packages, enabling this additional archive
> - might compromise the integrity of your base system.
> + .
> + Even though these packages are closely maintained
> + by the NeuroDebian team, enabling this additional archive
> + may compromise the integrity of the system.

OK.

>  Template: neurodebian/release
>  Type: select
> -Choices: auto, ${releases}
> +__Choices: automatic, ${releases}
> +Choices-C: auto, ${releases}

Oh, one of these.

>  Default: auto
>  _Description: Release name of the base system:
> - Specify for which Debian or Ubuntu release (e.g. wheezy or trusty).
> + Please specify the relevant Debian or Ubuntu release name
> + (for instance "wheezy" or "trusty").

It's not immediately obvious what the name would be "relevant"
to; how about

    Please specify the appropriate Debian or Ubuntu release codename
    (for instance "stretch" or "trusty").

(Updating the Debian codename just for futureproofing.)

>   .
> - If 'auto', Debian or Ubuntu release name will be '${release}' as
> - deduced from the output of apt-cache policy.  If the release of your
> - system is not '${release}' -- please choose specific one which
> + If this is set to "automatic"', the release name is chosen
> + after the output of "apt-cache policy". If the release name
> + for this system is not "${release}", you should choose specific one which
>   matches best.

s/after/according to/
s/choose specific one/choose the specific one/
  
>  Template: neurodebian/mirror
>  Type: select
>  Choices: origin, best, custom, ${mirrors}
>  Default: best
>  _Description: NeuroDebian mirror to use:
> - NeuroDebian project has a number of community-maintainer mirrors
> + NeuroDebian project has a number of community-maintained mirrors
>   around the globe.

^The^ NeuroDebian project.

>   .
>   If you do not know which mirror URL to choose, select among

s/select among/select one of:/

>    - origin: original NeuroDebian repository

     * origin: the original NeuroDebian repository

(Does it mean the one that was set up first, or the primary
copy that the others are mirroring?  Presumably those are both
the same server at present.)

>    - best: will try to use netselect to select "closest" mirror.
>      Depending on the configuration of the firewall, and actual mirror
> -    setup, might fail to select actually closest one.  If netselect
> -    is not available, default mirror (possibly 'origin') will be used.
> +    setup, this might fail to select the really closest one.  If netselect
> +    is not available, the default mirror will be used.


I suspect that's a false-friend "actual(ly)".  There's still one
missing article, and reshuffling slightly lets me reduce the
repetition:

     * best: will try to use netselect to select the "closest" mirror.
       This may fail depending on the current mirror setup and the
       configuration of your firewall. If netselect is not available, the
       default mirror will be used.

>  Template: neurodebian/flavor
>  Type: select
>  Choices: auto, libre, full
>  Default: auto
>  _Description: NeuroDebian flavor to use:
> - NeuroDebian project adheres to Debian Free Software Guidelines and
> - has three areas of the archive in all suites/releases:
> + The NeuroDebian project adheres to Debian Free Software Guidelines and
                                      ^the
> + offers three packages areas, depending on software licenses, for all suites/releases:

Not quite "depending on".  "Classified by license"?

>   .
>    libre
> -    only the DFSG-compliant materials
> +    DFSG-compliant material only
>    full
>      all three areas (main, contrib, non-free)
>    auto
> -    according to output of apt-cache policy '${flavor}' will be used.
> -    If that is not the flavor you need, select manually another one.
> +    picked from the output of "apt-cache policy"
> +    (for this machine: "${flavor}").

Do we want to rearrange this as

   * auto - picked according to the output of "apt-cache policy"
     (for this machine: "${flavor}");
   * libre - DFSG-compliant software only;
   * full - all three areas (main, contrib, non-free).
         
or will translators have an easier life with the headwords as
separate lines?  I won't bother.
  
>  Template: neurodebian/components
>  Type: multiselect
>  Choices: software, data, devel
>  Default: software, data
>  _Description: NeuroDebian repository components to enable:
> - NeuroDebian repository provides
> + NeuroDebian repository provides different sets of packages:

When you say it like this it sounds odd ("different from what?") but
add a number and it's just an idiom:

    The NeuroDebian repository provides three different sets of packages:

Wait, are these equivalent to "sections" (like "kde" or "devel"), or
"components/areas" (like "main" and "contrib"), or "suites/releases"
(like "stable" and "experimental"), or what?  Later on it refers to
devel as a "repository" in its own right, which makes a kind of
sense... but here we're saying there are three such sets of packages
in the NeuroDebian repository!  Maybe it should really be something
like:

    NeuroDebian provides three sub-repositories of packages:

But I'll stick with the first option.

>   .
>    software
>     Packages containing software packages, often backports of stable
>     software releases for previous Debian/Ubuntu releases

First repositories containing repositories, now packages containing
packages!  (And wasn't there a GR to establish that *anything* you
can download from a repository is "software"?  Oh well.)

     software
      Packages containing software, often backports of stable software
      releases for previous Debian/Ubuntu releases;

>    devel

(Another baffling name - "devel" is already in use as a Section name
referring to tools for developers.  If it's like "experimental", why
not call it "experimental"?  Or there are plenty of other convenient
short words they could have used, like, say, "alpha".  Oh well...)

> -   Additional "bleeding edge" software packages, which might not be a
> -   good fit for being enabled by default. (Similar to Debian
> -   experimental)
> +   Additional "bleeding edge" software packages, more risky to be
> +   enabled by default. It is similar to Debian experimental.

Do you mean "too risky to be enabled by default"?  I always thought
the point of experimental was that we *never* want users to have it
in their sources.list without at the very least some heavy-duty
pinning.  If it's just a suite of slightly risky software, *that's*
more like unstable.  But since clearly this is all way off outside
d-l-e's jurisdiction:

      Additional "bleeding edge" software packages (like those in
      Debian experimental), which it may not be safe to enable by
      default;

>    data
>     Packages containing data (e.g. atlases, sample datasets), often
> -   required by software packages.  Should generally be enabled.
> +   required by software packages. It should most often be enabled.

Quite apart from the fact that data packages *are* software
packages, "software" is also a NeuroDebian sub-repository name, so
putting it like this implies that packages in "devel" never depend
on data packages...

     data
      Packages containing data (such as atlases or sample datasets),
      often required by other packages. This should usually be enabled.
  
>  Template: neurodebian/overwrite
>  Type: boolean
>  Default: true
> -_Description: Should existing NeuroDebian APT file be overridden?
> - If not allowed, configuration would fail if there is
> - an existing apt configuration file for the NeuroDebian.
> +_Description: Override the existing NeuroDebian APT file entries?
> + If an APT sources.list file already exists for NeuroDebian, choosing
> + this option will lead to a failure in the configuration of this package.

I think you've got it backwards.  The original says that it will
fail if it needs to override a sources.list, but I've refused it
permission; you've got it failing if I answered "yes".

It would be a bug if it was trying to modify the system's primary
/etc/apt/sources.list file; I'm fairly sure it's talking about a
sources.list.d/neurodebian.list file or similar.  But does it in
fact mean "override" or is it "overwrite"?  I don't think there's
any way for one sources.list file to "override" another (they're
just additive), so surely it must be "overwrite"?  Oh, and in fact
that's what the template name says!

Either way, is it saying that it has already checked and that such a
file does exist?  If not, why *hasn't* it checked?  Or if so,
shouldn't it be "Description: Abort install?"?  Never mind...

   _Description: Overwrite the existing NeuroDebian APT file?
    If an APT sources.list file already exists for NeuroDebian, this
    package will fail to configure unless given permission to overwrite it.
  
>  Template: neurodebian/suffix
>  Type: string
>  Default:
> _Description: Additional suffix for the NeuroDebian APT file name:
>   For instance if you would like to enable additional repository
>   (e.g. NeuroDebian devel) or release, without interfering with the
>   main/default configuration file.  Generally should be left empty.

It needs to tell me something before it can start on the "for
instance"s and "e.g."s!  I think it's saying:

    Adding a suffix makes it possible to enable an additional repository
    (such as NeuroDebian devel) or release, without interfering with the
    main NeuroDebian sources list.
    .
    It should usually be left empty.
  
>  Template: neurodebian/run-update-note
>  Type: note
> -_Description: APT list of packages needs to be updated
> - For the installed (or removed) NeuroDebian APT configuration to take
> - an effect, list of packages needs to be updated.  This needs to be
> - done "manually" (e.g., via apt-get update) upon completion of
> - installation or reconfiguration of the neurodebian package.
> +_Description: Needed update for the packages list
                 Update needed

> + The installion or removal of the NeuroDebian APT configuration file

Install^at^ion.  Or s/ion/ing/.

> + requires running the "apt-get update" command. This needs to be
> + done manually after the installation of the neurodebian package.

It isn't required (as a prerequisite) *for* the addition/removal of
a sources.list file, it's just made necessary by the
addition/removal of a sources.list file.  (And not only will
"aptitude update" work equally well, but these days aptitudophobes
can just invoke "apt update", but I'll assume "apt-get" is still
more "standard".)

   _Description: APT update required
    For the installation (or removal) of a NeuroDebian sources.list file
    to take effect, APT's packages list needs to be updated. Please
    manually run "apt-get update" after the neurodebian package has been
    installed or reconfigured.
  
>  Template: neurodebian/netselect-not-found
>  Type: error
> -_Description: netselect tool was not found!
> - Please install netselect tool first (apt-get install netselect) or
> - choose a specific mirror.
> +_Description: Missing netselect tool
> + The "netselect" utility was not found. You probably need to
> + install the netselect package.
> + .
> + Alternatively, you can manually select the mirror to use.

Ah, phew, a non-problematic one.
  
>  Template: neurodebian/netselect-cannot-be-used
>  Type: error
> -_Description: netselect tool was not found (no other mirror)!
> - Please install netselect tool first (apt-get install netselect)
> - before installing/configuring this package, or run with a lower
> - DEBIAN_PRIORITY to choose a specific mirror.
> +_Description: Missing netselect tool
> + The "netselect" utility was not found. You probably need to
> + install the netselect package.
> + .
> + Unless this package is installed, the NeuroDebian mirror to use has
> + to be chosen manually. You may be prompted with the relevant question
> + by running "dpg-reconfigure -plow neurodebian".
> +

"May" makes it sound uncertain; here you need something like

    Unless this package is installed, the NeuroDebian mirror to use has
    to be chosen manually. To be prompted with the relevant question, you
    can run "dpg-reconfigure -plow neurodebian".

> --- neurodebian.old/debian/control	2015-05-21 21:14:37.627014717 +0200
> +++ neurodebian/debian/control	2015-06-04 10:18:02.377606437 +0200
> @@ -14,14 +14,14 @@
>  Package: neurodebian
[...]
> -Description: turnkey platform for the neuroscience
> +Description: neuroscience-oriented distribution - repository configuration

A bit sesquipedalian, but an improvement on "turnkey".

>   The NeuroDebian project integrates and maintain a variety of
>   neuroscience-oriented (such as AFNI, FSL, PsychoPy, etc.) and many
>   generic computational (such as condor, pandas, etc.) software projects
>   within Debian.

An over-heavy modifying clause.

    The NeuroDebian project integrates and maintains a variety of software
    projects within Debian that are useful for neuroscience (such as AFNI,
    FSL, PsychoPy, etc.) or generic computation (such as condor,
    pandas, etc.).

And isn't it HTCondor (as opposed to the condor package in Debian)?

>   .
> - This package enables NeuroDebian repository on top of the stock
> - Debian or Ubuntu system.
> + This package enables the NeuroDebian repository on top of standard
> + Debian or Ubuntu systems.

I don't know why, but this sounds better to me with a singular.

    This package enables the NeuroDebian repository on top of a standard
    Debian or Ubuntu system.
  
>  Package: neurodebian-dev
[...]
> -Description: NeuroDebian development tools
> - neuro.debian.net sphinx website sources and development tools used by

Huh?

> +Description: neuroscience-oriented distribution - development tools
> + The NeuroDebian project integrates and maintain a variety of
> + neuroscience-oriented (such as AFNI, FSL, PsychoPy, etc.) and many
> + generic computational (such as condor, pandas, etc.) software projects
> + within Debian.

As above.

> + .
> + This package provides sources and development tools used by
>   NeuroDebian to provide backports for a range of Debian/Ubuntu
>   releases.

I hope that's what they were trying to say.
  
>  Package: neurodebian-desktop

I was so disappointed when I first saw this packagename and then
discovered it doesn't have a brain-implant user interface.

[...]
> -Description: neuroscience research environment
> - This package contains NeuroDebian artwork (icons, background image)
> +Description: neuroscience-oriented distribution - desktop integration
> + The NeuroDebian project integrates and maintain a variety of
> + neuroscience-oriented (such as AFNI, FSL, PsychoPy, etc.) and many
> + generic computational (such as condor, pandas, etc.) software projects
> + within Debian.
> + .
> + This package provides NeuroDebian artwork (icons, background image)
>   and a NeuroDebian menu featuring most popular neuroscience tools
>   automatically installed upon initial invocation.

I'll assume that means "featuring the most popular tools", not
"featuring most of the popular tools".  Oh, and it's saying that the
packages are installed automatically if and when a user tries to run
the command?  Well, okay.

    This package provides NeuroDebian artwork (icons, background image)
    and a NeuroDebian menu featuring the most popular neuroscience tools,
    which will be automatically installed upon initial invocation.
  
>  Package: neurodebian-archive-keyring
>  Depends: ${misc:Depends}
>  Replaces: neurodebian-keyring (<< 0.34~)
>  Breaks: neurodebian-keyring (<< 0.34~)
> -Description: GnuPG archive keys of the NeuroDebian archive
> +Description: neuroscience-oriented distribution - GnuPG archive keys
> + The NeuroDebian project integrates and maintain a variety of
> + neuroscience-oriented (such as AFNI, FSL, PsychoPy, etc.) and many
> + generic computational (such as condor, pandas, etc.) software projects
> + within Debian.
> + .
>   The NeuroDebian project digitally signs its Release files. This package
>   contains the archive keys used for that.

No problem.
  
>  Package: neurodebian-popularity-contest
>  Architecture: all
>  Depends: ${misc:Depends}, popularity-contest
> -Description: Helper for NeuroDebian popularity contest submissions
> +Description: neuroscience-oriented distribution - popcon integration
> + The NeuroDebian project integrates and maintain a variety of
> + neuroscience-oriented (such as AFNI, FSL, PsychoPy, etc.) and many
> + generic computational (such as condor, pandas, etc.) software projects
> + within Debian.
> + .
>   This package is a complement to the generic popularity-contest
>   package to enable anonymous submission of usage statistics to
>   NeuroDebian in addition to the popcon submissions to the underlying
> - distribution (e.g. Debian or Ubuntu) popcon server.
> + distribution (either Debian or Ubuntu) popcon server.
>   .
> - Your participation in popcon is important for following reasons:
> + Participatin to in popcon is important for following reasons:

Oops, I think you mean:
    Participating in popcon is important for the following reasons:

>    - Popular packages receive more attention from developers, bugs are
>      fixed faster and updates are provided quicker.

Oh, this is one of those cases where serial comma reduces ambiguity.
It might be either a list of three benefits:

     * Popular packages receive more attention from developers, bugs are
       fixed faster, and updates are provided quicker.

or one that's then further explained in two ways (a bit of a "run-on
sentence", so upgrade the comma to a semicolon):

     * Popular packages receive more attention from developers; bugs are
       fixed faster and updates are provided quicker.

Actually I think the latter makes more sense.

> -  - Assure that we do not drop support for a previous release of Debian
> +  - Assure that support is not dropped for a previous release of Debian
>      or Ubuntu while are active users.
                      ^there
The other bulletpoints are full sentences, so for consistency:

     * It ensures that support is not dropped for a previous release of
       Debian or Ubuntu while there are active users.

>    - User statistics could be used by upstream research software
>      developers to acquire funding for continued development.

I'm not sure about "could".  I suppose I could rephrase it:

     * User statistics may be useful for upstream research software
       developers seeking funding for continued development.

>   .
> - It has an effect only if you have decided to participate in the
> - Popularity Contest of your distribution, i.e. Debian or Ubuntu.
> - You can always enable or disable your participation in popcon by
> - running 'dpkg-reconfigure popularity-contest' as root.
> + This requires that popcon is activated for the underlying distribution
> + (Debian or Ubuntu). This can be achieved by running
> + "dpkg-reconfigure popularity-contest" as root.

Or as one sentence,  ", which can be achieved".

Have I finished?
-- 
JBR	with qualifications in linguistics, experience as a Debian
	sysadmin, and probably no clue about this particular package
Template: neurodebian/title
Type: title
_Description: NeuroDebian APT repository installer

Template: neurodebian/enable
Type: boolean
Default: false
_Description: Enable the NeuroDebian package repository?
 The NeuroDebian project provides a separate APT repository with
 software that is not available in Debian, including datasets and
 backported new releases.
 .
 If you choose this option, these packages will be available for
 installation and upgrades.
 .
 Even though these packages are closely maintained
 by the NeuroDebian team, enabling this additional archive
 may compromise the integrity of the system.

Template: neurodebian/release
Type: select
__Choices: automatic, ${releases}
Choices-C: auto, ${releases}
Default: auto
_Description: Release name of the base system:
 Please specify the appropriate Debian or Ubuntu release codename
 (for instance "stretch" or "trusty").
 .
 If this is set to "automatic"', the release name is chosen according
 to the output of "apt-cache policy". If the release name for this
 system is not "${release}", you should choose the specific one which
 matches best.


Template: neurodebian/mirror
Type: select
Choices: origin, best, custom, ${mirrors}
Default: best
_Description: NeuroDebian mirror to use:
 The NeuroDebian project has a number of community-maintained mirrors
 around the globe.
 .
 If you do not know which mirror URL to choose, select one of:
 .
  * origin: the original NeuroDebian repository;
  * best: will try to use netselect to select the "closest" mirror.
    This may fail depending on the current mirror setup and the
    configuration of the firewall. If netselect is not available, the
    default mirror will be used.


Template: neurodebian/flavor
Type: select
Choices: auto, libre, full
Default: auto
_Description: NeuroDebian flavor to use:
 The NeuroDebian project adheres to the Debian Free Software Guidelines,
 and offers three packages areas, classified by license, for all
 suites/releases:
 .
  libre
    DFSG-compliant material only
  full
    all three areas (main, contrib, non-free)
  auto
    picked from the output of "apt-cache policy"
    (for this machine: "${flavor}").

Template: neurodebian/components
Type: multiselect
Choices: software, data, devel
Default: software, data
_Description: NeuroDebian repository components to enable:
 NeuroDebian repository provides three different sets of packages:
 .
  software
   Packages containing software, often backports of stable software
   releases for previous Debian/Ubuntu releases;
  devel
   Additional "bleeding edge" software packages (like those in Debian
   experimental), which it may not be safe to enable by default.
  data
   Packages containing data (such as atlases or sample datasets), often
   required by other packages. This should usually be enabled.


Template: neurodebian/overwrite
Type: boolean
Default: true
_Description: Overwrite the existing NeuroDebian APT file?
 If an APT sources.list file already exists for NeuroDebian, this
 package will fail to configure unless given permission to overwrite it.

Template: neurodebian/suffix
Type: string
Default:
_Description: Additional suffix for the NeuroDebian APT file name:
 Adding a suffix makes it possible to enable an additional repository
 (such as NeuroDebian devel) or release, without interfering with the
 main NeuroDebian sources list.
 .
 It should usually be left empty.

Template: neurodebian/run-update-note
Type: note
_Description: APT update required
 For the installation (or removal) of a NeuroDebian sources.list file
 to take effect, APT's packages list needs to be updated. Please
 manually run "apt-get update" after the neurodebian package has been
 installed or reconfigured.

Template: neurodebian/netselect-not-found
Type: error
_Description: Missing netselect tool
 The "netselect" utility was not found. You probably need to
 install the netselect package.
 .
 Alternatively, you can manually select the mirror to use.

Template: neurodebian/netselect-cannot-be-used
Type: error
_Description: Missing netselect tool
 The "netselect" utility was not found. You probably need to
 install the netselect package.
 .
 Unless this package is installed, the NeuroDebian mirror to use has
 to be chosen manually. To be prompted with the relevant question, you
 can run "dpg-reconfigure -plow neurodebian".
Source: neurodebian
Section: science
Priority: optional
Maintainer: NeuroDebian Team <team@neuro.debian.net>
Uploaders: Michael Hanke <mih@debian.org>, Yaroslav Halchenko <debian@onerussian.com>
Build-Depends: debhelper (>= 7.0.50~), xcftools, help2man, inkscape, imagemagick, python-html5lib, po-debconf
Standards-Version: 3.9.5
Homepage: http://neuro.debian.net
Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/neurodebian.git
Vcs-Git: git://git.debian.org/git/pkg-exppsy/neurodebian.git

Package: neurodebian
Architecture: all
Depends: python, wget, neurodebian-archive-keyring, ${misc:Depends}
Recommends: netselect
Suggests: neurodebian-desktop, neurodebian-popularity-contest
Description: neuroscience-oriented distribution - repository configuration
 The NeuroDebian project integrates and maintains a variety of software
 projects within Debian that are useful for neuroscience (such as AFNI,
 FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
 pandas, etc.).
 .
 This package enables the NeuroDebian repository on top of a standard
 Debian or Ubuntu system.


Package: neurodebian-dev
Architecture: all
Depends: ${misc:Depends}, devscripts, cowbuilder, neurodebian-archive-keyring
Recommends: python, zerofree, moreutils, time, ubuntu-keyring, debian-archive-keyring, apt-utils
Suggests: virtualbox-ose, virtualbox-ose-fuse
Description: neuroscience-oriented distribution - development tools
 The NeuroDebian project integrates and maintains a variety of software
 projects within Debian that are useful for neuroscience (such as AFNI,
 FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
 pandas, etc.).
 .
 This package provides sources and development tools used by
 NeuroDebian to provide backports for a range of Debian/Ubuntu
 releases.


Package: neurodebian-desktop
Architecture: all
Depends: ${misc:Depends}, ssh-askpass-gnome | ssh-askpass, desktop-base, gnome-icon-theme,
         neurodebian-popularity-contest
Suggests:
Description: neuroscience-oriented distribution - desktop integration
 The NeuroDebian project integrates and maintains a variety of software
 projects within Debian that are useful for neuroscience (such as AFNI,
 FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
 pandas, etc.).
 .
 This package provides NeuroDebian artwork (icons, background image)
 and a NeuroDebian menu featuring the most popular neuroscience tools,
 which will be automatically installed upon initial invocation.


Package: neurodebian-archive-keyring
Architecture: all
Depends: ${misc:Depends}
Replaces: neurodebian-keyring (<< 0.34~)
Breaks: neurodebian-keyring (<< 0.34~)
Description: neuroscience-oriented distribution - GnuPG archive keys
 The NeuroDebian project integrates and maintains a variety of software
 projects within Debian that are useful for neuroscience (such as AFNI,
 FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
 pandas, etc.).
 .
 The NeuroDebian project digitally signs its Release files. This package
 contains the archive keys used for that.

Package: neurodebian-popularity-contest
Architecture: all
Depends: ${misc:Depends}, popularity-contest
Description: neuroscience-oriented distribution - popcon integration
 The NeuroDebian project integrates and maintains a variety of software
 projects within Debian that are useful for neuroscience (such as AFNI,
 FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
 pandas, etc.).
 .
 This package is a complement to the generic popularity-contest
 package to enable anonymous submission of usage statistics to
 NeuroDebian in addition to the popcon submissions to the underlying
 distribution (either Debian or Ubuntu) popcon server.
 .
 Participating in popcon is important for the following reasons:
  * Popular packages receive more attention from developers; bugs are
    fixed faster and updates are provided quicker.
  * It ensures that support is not dropped for a previous release of
    Debian or Ubuntu while there are active users.
  * User statistics may be useful for upstream research software
    developers seeking funding for continued development.
 .
 This requires that popcon is activated for the underlying distribution
 (Debian or Ubuntu), which can be achieved by running
 "dpkg-reconfigure popularity-contest" as root.
diff -ru neurodebian-0.34.pristine/debian/control neurodebian-0.34/debian/control
--- neurodebian-0.34.pristine/debian/control	2014-08-14 18:46:21.000000000 +0100
+++ neurodebian-0.34/debian/control	2015-06-04 15:48:43.258535497 +0100
@@ -14,13 +14,13 @@
 Depends: python, wget, neurodebian-archive-keyring, ${misc:Depends}
 Recommends: netselect
 Suggests: neurodebian-desktop, neurodebian-popularity-contest
-Description: turnkey platform for the neuroscience
- The NeuroDebian project integrates and maintain a variety of
- neuroscience-oriented (such as AFNI, FSL, PsychoPy, etc.) and many
- generic computational (such as condor, pandas, etc.) software projects
- within Debian.
+Description: neuroscience-oriented distribution - repository configuration
+ The NeuroDebian project integrates and maintains a variety of software
+ projects within Debian that are useful for neuroscience (such as AFNI,
+ FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
+ pandas, etc.).
  .
- This package enables NeuroDebian repository on top of the stock
+ This package enables the NeuroDebian repository on top of a standard
  Debian or Ubuntu system.
 
 
@@ -29,8 +29,13 @@
 Depends: ${misc:Depends}, devscripts, cowbuilder, neurodebian-archive-keyring
 Recommends: python, zerofree, moreutils, time, ubuntu-keyring, debian-archive-keyring, apt-utils
 Suggests: virtualbox-ose, virtualbox-ose-fuse
-Description: NeuroDebian development tools
- neuro.debian.net sphinx website sources and development tools used by
+Description: neuroscience-oriented distribution - development tools
+ The NeuroDebian project integrates and maintains a variety of software
+ projects within Debian that are useful for neuroscience (such as AFNI,
+ FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
+ pandas, etc.).
+ .
+ This package provides sources and development tools used by
  NeuroDebian to provide backports for a range of Debian/Ubuntu
  releases.
 
@@ -40,10 +45,15 @@
 Depends: ${misc:Depends}, ssh-askpass-gnome | ssh-askpass, desktop-base, gnome-icon-theme,
          neurodebian-popularity-contest
 Suggests:
-Description: neuroscience research environment
- This package contains NeuroDebian artwork (icons, background image)
- and a NeuroDebian menu featuring most popular neuroscience tools
- automatically installed upon initial invocation.
+Description: neuroscience-oriented distribution - desktop integration
+ The NeuroDebian project integrates and maintains a variety of software
+ projects within Debian that are useful for neuroscience (such as AFNI,
+ FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
+ pandas, etc.).
+ .
+ This package provides NeuroDebian artwork (icons, background image)
+ and a NeuroDebian menu featuring the most popular neuroscience tools,
+ which will be automatically installed upon initial invocation.
 
 
 Package: neurodebian-archive-keyring
@@ -51,29 +61,37 @@
 Depends: ${misc:Depends}
 Replaces: neurodebian-keyring (<< 0.34~)
 Breaks: neurodebian-keyring (<< 0.34~)
-Description: GnuPG archive keys of the NeuroDebian archive
+Description: neuroscience-oriented distribution - GnuPG archive keys
+ The NeuroDebian project integrates and maintains a variety of software
+ projects within Debian that are useful for neuroscience (such as AFNI,
+ FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
+ pandas, etc.).
+ .
  The NeuroDebian project digitally signs its Release files. This package
  contains the archive keys used for that.
 
 Package: neurodebian-popularity-contest
 Architecture: all
 Depends: ${misc:Depends}, popularity-contest
-Description: Helper for NeuroDebian popularity contest submissions
+Description: neuroscience-oriented distribution - popcon integration
+ The NeuroDebian project integrates and maintains a variety of software
+ projects within Debian that are useful for neuroscience (such as AFNI,
+ FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
+ pandas, etc.).
+ .
  This package is a complement to the generic popularity-contest
  package to enable anonymous submission of usage statistics to
  NeuroDebian in addition to the popcon submissions to the underlying
- distribution (e.g. Debian or Ubuntu) popcon server.
+ distribution (either Debian or Ubuntu) popcon server.
  .
- Your participation in popcon is important for following reasons:
-  - Popular packages receive more attention from developers, bugs are
+ Participating in popcon is important for the following reasons:
+  * Popular packages receive more attention from developers; bugs are
     fixed faster and updates are provided quicker.
-  - Assure that we do not drop support for a previous release of Debian
-    or Ubuntu while are active users.
-  - User statistics could be used by upstream research software
-    developers to acquire funding for continued development.
- .
- It has an effect only if you have decided to participate in the
- Popularity Contest of your distribution, i.e. Debian or Ubuntu.
- You can always enable or disable your participation in popcon by
- running 'dpkg-reconfigure popularity-contest' as root.
-
+  * It ensures that support is not dropped for a previous release of
+    Debian or Ubuntu while there are active users.
+  * User statistics may be useful for upstream research software
+    developers seeking funding for continued development.
+ .
+ This requires that popcon is activated for the underlying distribution
+ (Debian or Ubuntu), which can be achieved by running
+ "dpkg-reconfigure popularity-contest" as root.
diff -ru neurodebian-0.34.pristine/debian/neurodebian.templates neurodebian-0.34/debian/neurodebian.templates
--- neurodebian-0.34.pristine/debian/neurodebian.templates	2014-08-14 18:46:21.000000000 +0100
+++ neurodebian-0.34/debian/neurodebian.templates	2015-06-04 16:09:19.499615136 +0100
@@ -5,26 +5,30 @@
 Template: neurodebian/enable
 Type: boolean
 Default: false
-_Description: Should NeuroDebian repository be enabled?
- NeuroDebian project provides a separate APT repository with backport
- builds of most recent releases of maintained software, datasets and
- some software not in Debian proper yet.  Enabling this additional
- repository will make those packages available on your base system.
- .
- Note: although NeuroDebian team aims to assure robust and correct
- operation of provided packages, enabling this additional archive
- might compromise the integrity of your base system.
+_Description: Enable the NeuroDebian package repository?
+ The NeuroDebian project provides a separate APT repository with
+ software that is not available in Debian, including datasets and
+ backported new releases.
+ .
+ If you choose this option, these packages will be available for
+ installation and upgrades.
+ .
+ Even though these packages are closely maintained
+ by the NeuroDebian team, enabling this additional archive
+ may compromise the integrity of the system.
 
 Template: neurodebian/release
 Type: select
-Choices: auto, ${releases}
+__Choices: automatic, ${releases}
+Choices-C: auto, ${releases}
 Default: auto
 _Description: Release name of the base system:
- Specify for which Debian or Ubuntu release (e.g. wheezy or trusty).
+ Please specify the appropriate Debian or Ubuntu release codename
+ (for instance "stretch" or "trusty").
  .
- If 'auto', Debian or Ubuntu release name will be '${release}' as
- deduced from the output of apt-cache policy.  If the release of your
- system is not '${release}' -- please choose specific one which
+ If this is set to "automatic"', the release name is chosen according
+ to the output of "apt-cache policy". If the release name for this
+ system is not "${release}", you should choose the specific one which
  matches best.
 
 
@@ -33,16 +37,16 @@
 Choices: origin, best, custom, ${mirrors}
 Default: best
 _Description: NeuroDebian mirror to use:
- NeuroDebian project has a number of community-maintainer mirrors
+ The NeuroDebian project has a number of community-maintained mirrors
  around the globe.
  .
- If you do not know which mirror URL to choose, select among
+ If you do not know which mirror URL to choose, select one of:
  .
-  - origin: original NeuroDebian repository
-  - best: will try to use netselect to select "closest" mirror.
-    Depending on the configuration of the firewall, and actual mirror
-    setup, might fail to select actually closest one.  If netselect
-    is not available, default mirror (possibly 'origin') will be used.
+  * origin: the original NeuroDebian repository;
+  * best: will try to use netselect to select the "closest" mirror.
+    This may fail depending on the current mirror setup and the
+    configuration of the firewall. If netselect is not available, the
+    default mirror will be used.
 
 
 Template: neurodebian/flavor
@@ -50,69 +54,75 @@
 Choices: auto, libre, full
 Default: auto
 _Description: NeuroDebian flavor to use:
- NeuroDebian project adheres to Debian Free Software Guidelines and
- has three areas of the archive in all suites/releases:
+ The NeuroDebian project adheres to the Debian Free Software Guidelines,
+ and offers three packages areas, classified by license, for all
+ suites/releases:
  .
   libre
-    only the DFSG-compliant materials
+    DFSG-compliant material only
   full
     all three areas (main, contrib, non-free)
   auto
-    according to output of apt-cache policy '${flavor}' will be used.
-    If that is not the flavor you need, select manually another one.
+    picked from the output of "apt-cache policy"
+    (for this machine: "${flavor}").
 
 Template: neurodebian/components
 Type: multiselect
 Choices: software, data, devel
 Default: software, data
 _Description: NeuroDebian repository components to enable:
- NeuroDebian repository provides
+ NeuroDebian repository provides three different sets of packages:
  .
   software
-   Packages containing software packages, often backports of stable
-   software releases for previous Debian/Ubuntu releases
+   Packages containing software, often backports of stable software
+   releases for previous Debian/Ubuntu releases;
   devel
-   Additional "bleeding edge" software packages, which might not be a
-   good fit for being enabled by default. (Similar to Debian
-   experimental)
+   Additional "bleeding edge" software packages (like those in Debian
+   experimental), which it may not be safe to enable by default.
   data
-   Packages containing data (e.g. atlases, sample datasets), often
-   required by software packages.  Should generally be enabled.
+   Packages containing data (such as atlases or sample datasets), often
+   required by other packages. This should usually be enabled.
 
 
 Template: neurodebian/overwrite
 Type: boolean
 Default: true
-_Description: Should existing NeuroDebian APT file be overridden?
- If not allowed, configuration would fail if there is
- an existing apt configuration file for the NeuroDebian.
+_Description: Overwrite the existing NeuroDebian APT file?
+ If an APT sources.list file already exists for NeuroDebian, this
+ package will fail to configure unless given permission to overwrite it.
 
 Template: neurodebian/suffix
 Type: string
 Default:
 _Description: Additional suffix for the NeuroDebian APT file name:
- For instance if you would like to enable additional repository
- (e.g. NeuroDebian devel) or release, without interfering with the
- main/default configuration file.  Generally should be left empty.
+ Adding a suffix makes it possible to enable an additional repository
+ (such as NeuroDebian devel) or release, without interfering with the
+ main NeuroDebian sources list.
+ .
+ It should usually be left empty.
 
 Template: neurodebian/run-update-note
 Type: note
-_Description: APT list of packages needs to be updated
- For the installed (or removed) NeuroDebian APT configuration to take
- an effect, list of packages needs to be updated.  This needs to be
- done "manually" (e.g., via apt-get update) upon completion of
- installation or reconfiguration of the neurodebian package.
+_Description: APT update required
+ For the installation (or removal) of a NeuroDebian sources.list file
+ to take effect, APT's packages list needs to be updated. Please
+ manually run "apt-get update" after the neurodebian package has been
+ installed or reconfigured.
 
 Template: neurodebian/netselect-not-found
 Type: error
-_Description: netselect tool was not found!
- Please install netselect tool first (apt-get install netselect) or
- choose a specific mirror.
+_Description: Missing netselect tool
+ The "netselect" utility was not found. You probably need to
+ install the netselect package.
+ .
+ Alternatively, you can manually select the mirror to use.
 
 Template: neurodebian/netselect-cannot-be-used
 Type: error
-_Description: netselect tool was not found (no other mirror)!
- Please install netselect tool first (apt-get install netselect)
- before installing/configuring this package, or run with a lower
- DEBIAN_PRIORITY to choose a specific mirror.
-
+_Description: Missing netselect tool
+ The "netselect" utility was not found. You probably need to
+ install the netselect package.
+ .
+ Unless this package is installed, the NeuroDebian mirror to use has
+ to be chosen manually. To be prompted with the relevant question, you
+ can run "dpg-reconfigure -plow neurodebian".

Reply to: