From 7ab1c262366d88b5aaa5c23d4418806f1ddc6596 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 6 Sep 2018 23:35:04 -0400 Subject: [PATCH 1/3] Calibre 3.30 -> 3.31 (awaiting .deb's) --- roles/calibre/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index bdf88373f..ea148226f 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -21,9 +21,9 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se calibre_deb_url: http://download.iiab.io/packages # Must contain both packages for the pinned version, formatted as follows: -# calibre_3.30.0+dfsg-1_all (25M, 2018-08-24) -# calibre-bin_3.30.0+dfsg-1_armhf (742K, 2018-08-30) -calibre_deb_pin_version: 3.30.0+dfsg-1 +# calibre_3.31.0+dfsg-1_all (25M, 2018-08-24) +# calibre-bin_3.31.0+dfsg-1_armhf (742K, 2018-08-30) +calibre_deb_pin_version: 3.31.0+dfsg-1 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True From 7ed579ce80a7b7ed47a678111afac384eb2360b5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 10:52:32 -0400 Subject: [PATCH 2/3] Update main.yml --- roles/calibre/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index ea148226f..a807fbfd1 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -21,8 +21,8 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se calibre_deb_url: http://download.iiab.io/packages # Must contain both packages for the pinned version, formatted as follows: -# calibre_3.31.0+dfsg-1_all (25M, 2018-08-24) -# calibre-bin_3.31.0+dfsg-1_armhf (742K, 2018-08-30) +# calibre_3.31.0+dfsg-1_all (25M, 2018-09-07) +# calibre-bin_3.31.0+dfsg-1_armhf (747K, 2018-09-12) calibre_deb_pin_version: 3.31.0+dfsg-1 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) From 6a28055a842f3402851bcbd9a959969a087ecd60 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 10:56:17 -0400 Subject: [PATCH 3/3] Update calibre-install-pinned-rpi.sh --- scripts/calibre-install-pinned-rpi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/calibre-install-pinned-rpi.sh b/scripts/calibre-install-pinned-rpi.sh index c0dc408a5..d27c8b0a9 100755 --- a/scripts/calibre-install-pinned-rpi.sh +++ b/scripts/calibre-install-pinned-rpi.sh @@ -10,7 +10,7 @@ export DEBIAN_FRONTEND=noninteractive # Prepares to update to latest from raspbian testing echo "deb http://raspbian.raspberrypi.org/raspbian/ testing main" > /etc/apt/sources.list.d/rpi-testing.list apt update -# @jvonau explains that stale .deb's should be avoided as: "apt will pick the highest version to install after churning a bit..." +# WARNING: you MUST remove old .deb's from /opt/iiab/downloads if upgrading Calibre in this way, SEE: http://FAQ.IIAB.IO "Can I upgrade or reinstall server apps?" apt -y install /opt/iiab/downloads/calibre*.deb #sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list # Removes last line rm /etc/apt/sources.list.d/rpi-testing.list