From a00125666341837a1acc791df3559f7837852d8e Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Thu, 22 Sep 2016 03:05:52 +0200 Subject: [PATCH] Moving LibreOffice PPA to ppa instead of libreoffice-5-0. --- roles/preseed/templates/preseed/client-trusty.seed | 2 +- roles/preseed/templates/preseed/dev/client-trusty.seed | 2 +- roles/preseed/templates/preseed/dev/docenti-trusty.seed | 2 +- roles/preseed/templates/preseed/docenti-trusty.seed | 2 +- roles/preseed/templates/preseed/edubuntu.seed | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/preseed/templates/preseed/client-trusty.seed b/roles/preseed/templates/preseed/client-trusty.seed index b3cf8f1..ff62c06 100644 --- a/roles/preseed/templates/preseed/client-trusty.seed +++ b/roles/preseed/templates/preseed/client-trusty.seed @@ -38,7 +38,7 @@ d-i apt-setup/security_host string {{ mirror_security_host }} d-i apt-setup/security_path string {{ mirror_security_path }} # Setup and enable libreoffice PPA -d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main +d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA d-i apt-setup/local0/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x36E81C9267FD1383FCC4490983FBA1751378B444&op=get diff --git a/roles/preseed/templates/preseed/dev/client-trusty.seed b/roles/preseed/templates/preseed/dev/client-trusty.seed index 8a6763e..f291c12 100644 --- a/roles/preseed/templates/preseed/dev/client-trusty.seed +++ b/roles/preseed/templates/preseed/dev/client-trusty.seed @@ -38,7 +38,7 @@ d-i apt-setup/security_host string {{ mirror_security_host }} d-i apt-setup/security_path string {{ mirror_security_path }} # Setup and enable libreoffice PPA -d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main +d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA d-i apt-setup/local0/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x36E81C9267FD1383FCC4490983FBA1751378B444&op=get diff --git a/roles/preseed/templates/preseed/dev/docenti-trusty.seed b/roles/preseed/templates/preseed/dev/docenti-trusty.seed index a45766a..9994106 100644 --- a/roles/preseed/templates/preseed/dev/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/dev/docenti-trusty.seed @@ -38,7 +38,7 @@ d-i apt-setup/security_host string {{ mirror_security_host }} d-i apt-setup/security_path string {{ mirror_security_path }} # Setup and enable libreoffice PPA -d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main +d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA d-i apt-setup/local0/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x36E81C9267FD1383FCC4490983FBA1751378B444&op=get diff --git a/roles/preseed/templates/preseed/docenti-trusty.seed b/roles/preseed/templates/preseed/docenti-trusty.seed index e80ea99..482d03a 100644 --- a/roles/preseed/templates/preseed/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/docenti-trusty.seed @@ -38,7 +38,7 @@ d-i apt-setup/security_host string {{ mirror_security_host }} d-i apt-setup/security_path string {{ mirror_security_path }} # Setup and enable libreoffice PPA -d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main +d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA d-i apt-setup/local0/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x36E81C9267FD1383FCC4490983FBA1751378B444&op=get diff --git a/roles/preseed/templates/preseed/edubuntu.seed b/roles/preseed/templates/preseed/edubuntu.seed index edf3988..c0dd76c 100644 --- a/roles/preseed/templates/preseed/edubuntu.seed +++ b/roles/preseed/templates/preseed/edubuntu.seed @@ -39,7 +39,7 @@ d-i apt-setup/security_host string {{ mirror_security_host }} d-i apt-setup/security_path string {{ mirror_security_path }} # Setup and enable libreoffice PPA -d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/libreoffice-5-0/ubuntu trusty main +d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA d-i apt-setup/local0/key string http://keyserver.ubuntu.com:11371/pks/lookup?search=0x36E81C9267FD1383FCC4490983FBA1751378B444&op=get