From c391357cf7aa94b71f9348e7d0387ca6fea1ced2 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 27 Feb 2015 10:10:58 +0200 Subject: [PATCH] sources.list: add security.ubuntu.com & rm MATE For some reason I had thought that the default installation uses local mirror instead of the main repo so I used that. I also removed MATE now as it causes dupliate warnings with Ubuntu MATE and it's not needed starting from 15.04. It's also not difficult to find. --- etc/apt/sources.list/12.04 | 8 ++------ etc/apt/sources.list/14.04 | 10 ++-------- etc/apt/sources.list/14.10 | 6 ++---- etc/apt/sources.list/15.04 | 2 ++ etc/apt/sources.list/ubuntu | 10 ++++------ 5 files changed, 12 insertions(+), 24 deletions(-) diff --git a/etc/apt/sources.list/12.04 b/etc/apt/sources.list/12.04 index ddeb2b84..7a23a23d 100644 --- a/etc/apt/sources.list/12.04 +++ b/etc/apt/sources.list/12.04 @@ -13,10 +13,12 @@ deb mirror://mirrors.ubuntu.com/mirrors.txt precise-updates main restricted univ ## or updates from the Ubuntu security team. deb mirror://mirrors.ubuntu.com/mirrors.txt precise-backports main restricted universe multiverse deb mirror://mirrors.ubuntu.com/mirrors.txt precise-security main restricted universe multiverse +deb http://security.ubuntu.com/ubuntu precise-security main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt precise main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt precise-updates main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt precise-backports main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt precise-security main restricted universe multiverse +deb-src http://security.ubuntu.com/ubuntu precise-security main restricted universe multiverse ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository. @@ -29,9 +31,3 @@ deb-src http://archive.canonical.com/ubuntu precise partner ## developers who want to ship their latest software. deb http://extras.ubuntu.com/ubuntu precise main deb-src http://extras.ubuntu.com/ubuntu precise main - -## Ubuntu MATE https://ubuntu-mate.org/ -deb http://ppa.launchpad.net/ubuntu-mate-dev/ppa/ubuntu precise main -deb http://ppa.launchpad.net/ubuntu-mate-dev/precise-mate/ubuntu precise main -deb-src http://ppa.launchpad.net/ubuntu-mate-dev/ppa/ubuntu precise main -deb-src http://ppa.launchpad.net/ubuntu-mate-dev/precise-mate/ubuntu precise main diff --git a/etc/apt/sources.list/14.04 b/etc/apt/sources.list/14.04 index 49cbac88..13bce8af 100644 --- a/etc/apt/sources.list/14.04 +++ b/etc/apt/sources.list/14.04 @@ -13,10 +13,12 @@ deb mirror://mirrors.ubuntu.com/mirrors.txt trusty-updates main restricted unive ## or updates from the Ubuntu security team. deb mirror://mirrors.ubuntu.com/mirrors.txt trusty-backports main restricted universe multiverse deb mirror://mirrors.ubuntu.com/mirrors.txt trusty-security main restricted universe multiverse +deb http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt trusty main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt trusty-updates main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt trusty-backports main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt trusty-security main restricted universe multiverse +deb-src http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository. @@ -29,11 +31,3 @@ deb-src http://archive.canonical.com/ubuntu trusty partner ## developers who want to ship their latest software. deb http://extras.ubuntu.com/ubuntu trusty main deb-src http://extras.ubuntu.com/ubuntu trusty main - -## Ubuntu MATE https://ubuntu-mate.org/ -deb http://ppa.launchpad.net/ubuntu-mate-dev/ppa/ubuntu trusty main -deb http://ppa.launchpad.net/ubuntu-mate-dev/trusty-mate/ubuntu trusty main -deb http://ppa.launchpad.net/accessibility-dev/ppa/ubuntu trusty main -deb-src http://ppa.launchpad.net/ubuntu-mate-dev/ppa/ubuntu trusty main -deb-src http://ppa.launchpad.net/ubuntu-mate-dev/trusty-mate/ubuntu trusty main -deb-src http://ppa.launchpad.net/accessibility-dev/ppa/ubuntu trusty main diff --git a/etc/apt/sources.list/14.10 b/etc/apt/sources.list/14.10 index 4e841773..cb4c22e9 100644 --- a/etc/apt/sources.list/14.10 +++ b/etc/apt/sources.list/14.10 @@ -13,10 +13,12 @@ deb mirror://mirrors.ubuntu.com/mirrors.txt utopic-updates main restricted unive ## or updates from the Ubuntu security team. deb mirror://mirrors.ubuntu.com/mirrors.txt utopic-backports main restricted universe multiverse deb mirror://mirrors.ubuntu.com/mirrors.txt utopic-security main restricted universe multiverse +deb http://security.ubuntu.com/ubuntu utopic-security main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt utopic main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt utopic-updates main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt utopic-backports main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt utopic-security main restricted universe multiverse +deb-src http://security.ubuntu.com/ubuntu utopic-security main restricted universe multiverse ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository. @@ -29,7 +31,3 @@ deb-src http://archive.canonical.com/ubuntu utopic partner ## developers who want to ship their latest software. deb http://extras.ubuntu.com/ubuntu utopic main deb-src http://extras.ubuntu.com/ubuntu utopic main - -## Ubuntu MATE https://ubuntu-mate.org/ -deb http://ppa.launchpad.net/ubuntu-mate-dev/ppa/ubuntu utopic main -deb-src http://ppa.launchpad.net/ubuntu-mate-dev/ppa/ubuntu utopic main diff --git a/etc/apt/sources.list/15.04 b/etc/apt/sources.list/15.04 index 42132236..02e3be47 100644 --- a/etc/apt/sources.list/15.04 +++ b/etc/apt/sources.list/15.04 @@ -13,10 +13,12 @@ deb mirror://mirrors.ubuntu.com/mirrors.txt vivid-updates main restricted univer ## or updates from the Ubuntu security team. deb mirror://mirrors.ubuntu.com/mirrors.txt vivid-backports main restricted universe multiverse deb mirror://mirrors.ubuntu.com/mirrors.txt vivid-security main restricted universe multiverse +deb http://security.ubuntu.com/ubuntu vivid-security main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt vivid main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt vivid-updates main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt vivid-backports main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt vivid-security main restricted universe multiverse +deb-src http://security.ubuntu.com/ubuntu vivid-security main restricted universe multiverse ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository. diff --git a/etc/apt/sources.list/ubuntu b/etc/apt/sources.list/ubuntu index 480ad4f3..0168a4f7 100644 --- a/etc/apt/sources.list/ubuntu +++ b/etc/apt/sources.list/ubuntu @@ -1,26 +1,24 @@ - -## Replace RELEASE on every line with your Ubuntu RELEASE which you can find out by running -# lsb_release -c - # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to # newer versions of the distribution. deb mirror://mirrors.ubuntu.com/mirrors.txt RELEASE main restricted universe multiverse -## Major bug fix updates produced after the final release of the +## Major bug fix updates produced after the final RELEASE of the ## distribution. deb mirror://mirrors.ubuntu.com/mirrors.txt RELEASE-updates main restricted universe multiverse ## N.B. software from this repository may not have been tested as -## extensively as that contained in the main release, although it includes +## extensively as that contained in the main RELEASE, although it includes ## newer versions of some applications which may provide useful features. ## Also, please note that software in backports WILL NOT receive any review ## or updates from the Ubuntu security team. deb mirror://mirrors.ubuntu.com/mirrors.txt RELEASE-backports main restricted universe multiverse deb mirror://mirrors.ubuntu.com/mirrors.txt RELEASE-security main restricted universe multiverse +deb http://security.ubuntu.com/ubuntu RELEASE-security main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt RELEASE main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt RELEASE-updates main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt RELEASE-backports main restricted universe multiverse deb-src mirror://mirrors.ubuntu.com/mirrors.txt RELEASE-security main restricted universe multiverse +deb-src http://security.ubuntu.com/ubuntu RELEASE-security main restricted universe multiverse ## Uncomment the following two lines to add software from Canonical's ## 'partner' repository.