summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2017-03-13 22:16:17 +0100
committeranonym <anonym@riseup.net>2017-03-13 22:16:17 +0100
commit7dc82144a6ca605b94b23726cffa58bbeaa5f089 (patch)
tree0b5719f452daedbfec8d59fe1ca9a80b626a65c1
parentb79b3246592c572af3c705ebfe1a7c1fe7e16042 (diff)
parentce6b22e72bf8e1f96744bee7655c384c71555ff1 (diff)
Merge remote-tracking branch 'origin/feature/12051-ikiwiki-from-Debian' into devel
Fix-committed: #12051
-rwxr-xr-xvagrant/provision/setup-tails-builder9
-rw-r--r--wiki/src/contribute/build.mdwn4
-rw-r--r--wiki/src/contribute/build/website.mdwn8
3 files changed, 9 insertions, 12 deletions
diff --git a/vagrant/provision/setup-tails-builder b/vagrant/provision/setup-tails-builder
index 2135c1f..d4712dd 100755
--- a/vagrant/provision/setup-tails-builder
+++ b/vagrant/provision/setup-tails-builder
@@ -33,11 +33,6 @@ sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/discount <<EOF
Pin: origin deb.tails.boum.org
Pin-Priority: 500
EOF
-sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/ikiwiki <<EOF
- Package: ikiwiki
- Pin: origin deb.tails.boum.org
- Pin-Priority: 500
-EOF
sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/live-build <<EOF
Package: live-build
Pin: origin deb.tails.boum.org
@@ -48,6 +43,8 @@ sed -e 's/^[[:blank:]]*//' > /etc/apt/preferences.d/syslinux-utils <<EOF
Pin: origin deb.tails.boum.org
Pin-Priority: 500
EOF
+# remove obsolete pinning
+rm -f /etc/apt/preferences.d/ikiwiki
# We don't want to use apt-cacher-ng for gpg
if [ "${TAILS_OFFLINE_MODE}" != 1 ]; then
@@ -87,7 +84,7 @@ apt-get -y install \
eatmydata \
gettext \
git \
- ikiwiki \
+ ikiwiki/jessie-backports \
intltool \
libfile-slurp-perl \
liblist-moreutils-perl \
diff --git a/wiki/src/contribute/build.mdwn b/wiki/src/contribute/build.mdwn
index c46cbae..bf27522 100644
--- a/wiki/src/contribute/build.mdwn
+++ b/wiki/src/contribute/build.mdwn
@@ -313,7 +313,6 @@ The following Debian packages need to be installed:
dpkg-dev \
eatmydata \
gettext \
- ikiwiki \
intltool \
libfile-slurp-perl \
liblist-moreutils-perl \
@@ -331,7 +330,8 @@ The following Debian packages need to be installed:
expected versions):
apt-get install \
- debootstrap/jessie-backports
+ debootstrap/jessie-backports \
+ ikiwiki/jessie-backports
Configure live-build
--------------------
diff --git a/wiki/src/contribute/build/website.mdwn b/wiki/src/contribute/build/website.mdwn
index 39f9830..fdb316a 100644
--- a/wiki/src/contribute/build/website.mdwn
+++ b/wiki/src/contribute/build/website.mdwn
@@ -24,9 +24,9 @@ Build the website in Linux
sudo apt-get install libyaml-perl libyaml-libyaml-perl po4a \
perlmagick libyaml-syck-perl ikiwiki
- Note that in order to enable Ikiwiki with RTL language support,
- you'll need to install ikiwiki version 3.20140227 or newer.
- In Debian this version is currently available in Jessie.
+ You need to install ikiwiki version 3.20170111~bpo8+1 or newer.
+ In Debian this version is currently available in Stretch and
+ jessie-backports.
3. Clone our main [[Git repository|git]]:
@@ -65,7 +65,7 @@ Build the website in Tails
4. Install the required packages:
sudo apt-get install libyaml-perl libyaml-libyaml-perl po4a \
- perlmagick libyaml-syck-perl ikiwiki
+ perlmagick libyaml-syck-perl ikiwiki/jessie-backports
5. Clone our main [[Git repository|git]] in the <span class="filename">Persistent</span> folder: