Merge remote-tracking branch 'alioth/devel'

Merge remote-tracking branch 'alioth/devel'

* alioth/devel:
  thanks to lintian -- fixed typos, remove /bin for ls call
  BF: renaming keyring files into archive-keyring
  Improve error msg and adjust test for now "high" priority for enable question -- passed on sid docker
  enable question must be of high priority
  neurodebian - moved wget, python to Depends from Pre-Depends
  Rename neurodebian-keyring to neurodebian-archive-keyring to be closer to what it actually is
  ENH: added an explicit question (and even a warning note) to debconf of neurodebian. NEURODEBIAN_ENABLE env can override default/current value
  build guest additions only for neurodebian wheezy
  updated template, fixed up control, updated patch, added custom series for quilt to ease updates of the wheezy dsc patches
  wheezy-dsc-patch to recommend update-manager-gnome on wheezy
  doh -- missed Pre-Depends -> Depends for -guest-additions
  popcon: cleanup **only** when upgrading from older version of the neurodebian-popcon
  Use longer key id everywhere
  minor typo in nd_login doc
  condition calls to update-* tools on their existence
  longer key id, unified env variables
  fix ups for -guest-additions
  more TODOs reflecting Ansgar's comments
  minor typo