Commit 58b66a81 authored by Yaroslav Halchenko's avatar Yaroslav Halchenko

Rename neurodebian-keyring to neurodebian-archive-keyring to be closer to what it actually is

parent 7fc022c3
......@@ -3,6 +3,6 @@
/neurodebian-desktop
/neurodebian-dev
/neurodebian-guest-additions
/neurodebian-keyring
/neurodebian-archive-keyring
/*.log
/*.substvars
......@@ -19,14 +19,14 @@ set -ex
apt_file=/etc/apt/sources.list.d/local.list
# clean up from a previous test
dpkg --purge neurodebian neurodebian-keyring || :
dpkg --purge neurodebian neurodebian-archive-keyring || :
echo PURGE | debconf-communicate neurodebian || :
rm -rf /tmp/apt $apt_file;
mkdir -p /tmp/apt; cd /tmp/apt;
rm -f neurodebian-*deb; apt-get update -y; apt-get install -y wget;
wget http://www.onerussian.com/tmp/neurodebian_0.33~a1_all.deb;
wget http://www.onerussian.com/tmp/neurodebian-keyring_0.33~a1_all.deb;
wget http://www.onerussian.com/tmp/neurodebian-archive-keyring_0.33~a1_all.deb;
# generate APT repo
apt-get install -y dpkg-dev ; dpkg-scanpackages . /dev/null > Packages
......
......@@ -12,7 +12,7 @@ Vcs-Git: git://git.debian.org/git/pkg-exppsy/neurodebian.git
Package: neurodebian
Architecture: all
Pre-depends: python, wget
Depends: neurodebian-keyring, ${misc:Depends}
Depends: neurodebian-archive-keyring, ${misc:Depends}
Recommends: netselect
Suggests: neurodebian-desktop, neurodebian-popularity-contest
Description: turnkey platform for the neuroscience
......@@ -27,7 +27,7 @@ Description: turnkey platform for the neuroscience
Package: neurodebian-dev
Architecture: all
Depends: ${misc:Depends}, devscripts, cowbuilder, neurodebian-keyring
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
......@@ -47,9 +47,11 @@ Description: neuroscience research environment
automatically installed upon initial invocation.
Package: neurodebian-keyring
Package: neurodebian-archive-keyring
Architecture: all
Depends: ${misc:Depends}
Replaces: neurodebian-keyring (<< 0.34~)
Breaks: neurodebian-keyring (<< 0.34~)
Description: GnuPG archive keys of the NeuroDebian archive
The NeuroDebian project digitally signs its Release files. This package
contains the archive keys used for that.
......
......@@ -34,7 +34,7 @@ lb config noauto \
--iso-preparer "NeuroDebian ${nd_version}; http://neuro.debian.net" \
--iso-publisher "NeuroDebian project; http://neuro.debian.net" \
--iso-volume "NeuroDebian Live ${nd_version} $nd_arch" \
--keyring-packages "debian-archive-keyring neurodebian-keyring" \
--keyring-packages "debian-archive-keyring neurodebian-archive-keyring" \
--memtest memtest86+ \
--mirror-bootstrap "${deb_mirror}/debian/" \
--mirror-chroot "${deb_mirror}/debian/" \
......
......@@ -107,7 +107,7 @@ Frequently Asked Questions
This is because your APT installation initially does not know the GPG
key that is used to sign the release files of this repository. It is easy to
make APT happy again. The simplest way is to install the ``neurodebian-keyring``
make APT happy again. The simplest way is to install the ``neurodebian-archive-keyring``
package that is available from the NeuroDebian repository. Alternatively:
1. Get the key. Either download the `repository key from here
......
......@@ -543,7 +543,7 @@ fi
#
# Figure out if key needs to be imported (if ran within package,
# should already be there due to neurodebian-keyring package)
# should already be there due to neurodebian-archive-keyring package)
if LANG=C eval $ae_sudo apt-key export $nd_key_id 2>&1 1>/dev/null | grep -qe "nothing exported"; then
print_verbose 1 "Fetching the key from the server"
eval_dry apt-key adv --recv-keys --keyserver pgp.mit.edu $nd_key_id
......
......@@ -6,14 +6,14 @@ apt_file=/etc/apt/sources.list.d/local.list
apt_nd_file=/etc/apt/sources.list.d/neurodebian.sources.list
# clean up from a previous test
dpkg --purge neurodebian neurodebian-keyring || :
dpkg --purge neurodebian neurodebian-archive-keyring || :
echo PURGE | debconf-communicate neurodebian || :
rm -rf /tmp/apt $apt_file;
mkdir -p /tmp/apt; cd /tmp/apt;
rm -f neurodebian-*deb; apt-get update -y; apt-get install -y wget;
wget http://www.onerussian.com/tmp/neurodebian_0.33~a1_all.deb;
wget http://www.onerussian.com/tmp/neurodebian-keyring_0.33~a1_all.deb;
wget http://www.onerussian.com/tmp/neurodebian_0.34_all.deb;
wget http://www.onerussian.com/tmp/neurodebian-archive-keyring_0.34_all.deb;
# generate APT repo
apt-get install -y dpkg-dev ; dpkg-scanpackages . /dev/null > Packages
......
......@@ -63,7 +63,7 @@ apt-get update -y
gpg --keyserver hkp://subkeys.pgp.net --recv-keys 16BA136C && \
gpg --export 16BA136C | apt-key add - || :
apt-get install -y --allow-unauthenticated neurodebian-keyring
apt-get install -y --allow-unauthenticated neurodebian-archive-keyring
apt-get update -y
# to cheat the VM check
......
......@@ -68,7 +68,7 @@ apt-get update -y
gpg --keyserver hkp://subkeys.pgp.net --recv-keys 16BA136C && \
gpg --export 16BA136C | apt-key add - || :
apt-get install -y --allow-unauthenticated neurodebian-keyring
apt-get install -y --allow-unauthenticated neurodebian-archive-keyring
apt-get update -y
# to cheat the VM check
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment