saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index d6df58a489ea7c9087bb90b338d29724ee65c627..26888bf5674ed33bba60ada7190d957f8f6ea3ec 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -477,12 +477,11 @@ maybe chmod 0644 'apt/sources.list.d/devolo-updates.list'
 maybe chmod 0644 'apt/sources.list.d/devolo-updates.list.save'
 maybe chmod 0644 'apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/ethereum-ubuntu-ethereum-xenial.list.save'
-maybe chmod 0644 'apt/sources.list.d/google-chrome.list'
-maybe chmod 0644 'apt/sources.list.d/google-chrome.list.save'
 maybe chmod 0644 'apt/sources.list.d/google.list'
 maybe chmod 0644 'apt/sources.list.d/google.list.save'
 maybe chmod 0644 'apt/sources.list.d/graphics-drivers-ubuntu-ppa-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/graphics-drivers-ubuntu-ppa-xenial.list.save'
+maybe chmod 0644 'apt/sources.list.d/linphone-ubuntu-release-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/mozillateam-ubuntu-firefox-next-xenial.list.save'
 maybe chmod 0644 'apt/sources.list.d/nodesource.list'
@@ -505,6 +504,7 @@ maybe chmod 0755 'apt/trusted.gpg.d'
 maybe chmod 0644 'apt/trusted.gpg.d/bumblebee_ubuntu_stable.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/ethereum_ubuntu_ethereum.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/graphics-drivers_ubuntu_ppa.gpg'
+maybe chmod 0644 'apt/trusted.gpg.d/linphone_ubuntu_release.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/mozillateam_ubuntu_firefox-next.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/privacyidea_ubuntu_privacyidea-dev.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/webupd8team_ubuntu_java.gpg'

diff --git a/apt/sources.list.d/google-chrome.list b/apt/sources.list.d/google-chrome.list
deleted file mode 100644 (file)
index b2d572c..0000000
--- a/apt/sources.list.d/google-chrome.list
+++ /dev/null
@@ -1,3 +0,0 @@
-### THIS FILE IS AUTOMATICALLY CONFIGURED ###
-# You may comment out this entry, but any other modifications may be lost.
-deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main

diff --git a/apt/sources.list.d/google-chrome.list.save b/apt/sources.list.d/google-chrome.list.save
deleted file mode 100644 (file)
index b2d572c..0000000
--- a/apt/sources.list.d/google-chrome.list.save
+++ /dev/null
@@ -1,3 +0,0 @@
-### THIS FILE IS AUTOMATICALLY CONFIGURED ###
-# You may comment out this entry, but any other modifications may be lost.
-deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main

diff --git a/apt/sources.list.d/linphone-ubuntu-release-xenial.list b/apt/sources.list.d/linphone-ubuntu-release-xenial.list
new file mode 100644 (file)
index 0000000..7e03df8
--- /dev/null
+++ b/apt/sources.list.d/linphone-ubuntu-release-xenial.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/linphone/release/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/linphone/release/ubuntu xenial main

diff --git a/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save b/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save
index 01fb97a6a6d70678e919fe762b91943ad9bba9cf..36f70497479ab80740dc0638aa773230e4f4d970 100644 (file)
--- a/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save
+++ b/apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save
@@ -1,2 +1,3 @@
 deb http://ppa.launchpad.net/yubico/stable/ubuntu xenial main
 # deb-src http://ppa.launchpad.net/yubico/stable/ubuntu xenial main
+# deb-src http://ppa.launchpad.net/yubico/stable/ubuntu xenial main

diff --git a/apt/trusted.gpg.d/linphone_ubuntu_release.gpg b/apt/trusted.gpg.d/linphone_ubuntu_release.gpg
new file mode 100644 (file)
index 0000000..7d7f640
Binary files /dev/null and b/apt/trusted.gpg.d/linphone_ubuntu_release.gpg differ