From a62900240efaa87ce30dc85714971b4c54960664 Mon Sep 17 00:00:00 2001
From: Joerg Schirottke <master@kanotix.com>
Date: Mon, 29 Oct 2018 20:25:01 +0100
Subject: remove skype and add skypeforlinux list
---
auto/config | 1 +
config/chroot_local-hooks/00-sources.list | 4 +++
config/chroot_local-hooks/skype-4.3 | 8 ------
.../lib/live/config/9010-hotfixes | 7 +++++
config/lists/desktop | 1 -
config/lists/kanotix-kde-master | 3 ---
config/lists/kanotix-lxde-master | 3 ---
config/lists/kanotix-trinity-master | 4 ---
config/lists/skype | 11 --------
config/lists/skypeforlinux | 5 ++++
config/repositories/skype-stable | 1 +
config/repositories/skype-stable.gpg | 31 ++++++++++++++++++++++
12 files changed, 49 insertions(+), 30 deletions(-)
delete mode 100755 config/chroot_local-hooks/skype-4.3
delete mode 100644 config/lists/skype
create mode 100644 config/lists/skypeforlinux
create mode 100644 config/repositories/skype-stable
create mode 100644 config/repositories/skype-stable.gpg
diff --git a/auto/config b/auto/config
index d05541f..cac4fb5 100755
--- a/auto/config
+++ b/auto/config
@@ -111,6 +111,7 @@ grep -wq firefox <<<"$LB_PACKAGES_LISTS"
grep -wq silverlight <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" silverlight"
grep -wq spotify <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" spotify"
grep -wq dropbox <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" dropbox"
+grep -wq skypeforlinux <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" skype-stable"
# special hack
if grep -wq gfxdetect <<<"$LB_PACKAGES_LISTS"; then
diff --git a/config/chroot_local-hooks/00-sources.list b/config/chroot_local-hooks/00-sources.list
index 88609e8..e3affbd 100755
--- a/config/chroot_local-hooks/00-sources.list
+++ b/config/chroot_local-hooks/00-sources.list
@@ -11,4 +11,8 @@ if [ -f /etc/apt/sources.list.d/steam.list ]; then
rm -f /etc/apt/sources.list.d/steam.list
fi
+if [ -f /etc/apt/sources.list.d/skype-stable.list ]; then
+ rm -f /etc/apt/sources.list.d/skype-stable.list
+fi
+
sed -i -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" /etc/apt/sources.list
diff --git a/config/chroot_local-hooks/skype-4.3 b/config/chroot_local-hooks/skype-4.3
deleted file mode 100755
index 134fe86..0000000
--- a/config/chroot_local-hooks/skype-4.3
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-for file in /root/config/*; do [ -r $file ] && . $file; done
-
-dpkg -l | grep -qw skype | grep -qw 4.3 && exit 0
-
-if [ -x /usr/bin/skype ]; then
- sed -i 's/4\(\.3\.0\.3\)/8\1/' /usr/bin/skype
-fi
diff --git a/config/chroot_local-includes/lib/live/config/9010-hotfixes b/config/chroot_local-includes/lib/live/config/9010-hotfixes
index 02b6a8f..9b738cc 100755
--- a/config/chroot_local-includes/lib/live/config/9010-hotfixes
+++ b/config/chroot_local-includes/lib/live/config/9010-hotfixes
@@ -87,6 +87,13 @@ deb http://repo.vivaldi.com/stable/deb/ stable main
EOT
fi
+# skype hack
+if [ -x /opt/skypeforlinux/skypeforlinux ]; then
+cat <<EOT >/etc/apt/sources.list.d/skype-stable.list
+deb [arch=amd64] https://repo.skype.com/deb stable main
+EOT
+fi
+
# reconfigure console-setup
rm -f /etc/default/console-setup
. /etc/default/locale
diff --git a/config/lists/desktop b/config/lists/desktop
index 2d1e7fd..e50dea8 100644
--- a/config/lists/desktop
+++ b/config/lists/desktop
@@ -4,4 +4,3 @@
# chat, irc
pidgin
-pidgin-skype
diff --git a/config/lists/kanotix-kde-master b/config/lists/kanotix-kde-master
index f10c179..a316023 100644
--- a/config/lists/kanotix-kde-master
+++ b/config/lists/kanotix-kde-master
@@ -25,9 +25,6 @@ openvpn
network-manager-openvpn
network-manager-vpnc
-# skype
-#include <skype>
-
# kde
#if DISTRIBUTION squeeze wheezy jessie
khelpcenter4
diff --git a/config/lists/kanotix-lxde-master b/config/lists/kanotix-lxde-master
index f36c85d..3230ff0 100644
--- a/config/lists/kanotix-lxde-master
+++ b/config/lists/kanotix-lxde-master
@@ -57,9 +57,6 @@ simple-scan
ncdu
xzdec
-# skype
-#include <skype>
-
# games
#if DISTRIBUTION squeeze wheezy jessie
mahjongg
diff --git a/config/lists/kanotix-trinity-master b/config/lists/kanotix-trinity-master
index 4be293f..632b5a3 100644
--- a/config/lists/kanotix-trinity-master
+++ b/config/lists/kanotix-trinity-master
@@ -16,10 +16,6 @@ amarok-trinity
gecko-mediaplayer
#endif
-# skype
-skype
-pidgin-skype
-
# trinity
khelpcenter-trinity
diff --git a/config/lists/skype b/config/lists/skype
deleted file mode 100644
index ad46522..0000000
--- a/config/lists/skype
+++ /dev/null
@@ -1,11 +0,0 @@
-# skype for wheezy (multiarch)
-
-
-#if ARCHITECTURE i386
-skype
-#endif
-
-#if ARCHITECTURE amd64
-skype:i386
-#endif
-
diff --git a/config/lists/skypeforlinux b/config/lists/skypeforlinux
new file mode 100644
index 0000000..1c86964
--- /dev/null
+++ b/config/lists/skypeforlinux
@@ -0,0 +1,5 @@
+# skype (64 bit)
+
+#if ARCHITECTURE amd64
+skypeforlinux
+#endif
diff --git a/config/repositories/skype-stable b/config/repositories/skype-stable
new file mode 100644
index 0000000..119d8f8
--- /dev/null
+++ b/config/repositories/skype-stable
@@ -0,0 +1 @@
+deb [arch=amd64] https://repo.skype.com/deb stable main
diff --git a/config/repositories/skype-stable.gpg b/config/repositories/skype-stable.gpg
new file mode 100644
index 0000000..40b5f6f
--- /dev/null
+++ b/config/repositories/skype-stable.gpg
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBFdqXCMBCADo6FW/k96vykC6E7GOC3MWcso1suj4dCWwqoYetyIExxFlUapV
++Hy/xTnLKFR6O3EugT//AuaTLcaztFIs8hBmyUHOpH5oRfVRqrE0QpsmQLL191W6
+k815VuXyOIz5BkKTOHbv0hRSur57ksanvk/NcLI5qUjA2On0L62B1N5aWiEAT+m+
+PjBDONkCknWO1BxZI1nXFPUR7yPaVXy59MhKDNrgMSuIv95Holhg0/D2RPLQVQdd
+e4TF3W5A8/PWO7n3B+N1bwJREWaCaRicu5RjOTuY0zt0ZxDwknJrXkK8eoaFBfaJ
+pBlnJKdUjGyDuMQhDE1yN/oxF2wnVi+YifaNABEBAAG0M1NreXBlIExpbnV4IENs
+aWVudCBSZXBvc2l0b3J5IDxzZS11bUBtaWNyb3NvZnQuY29tPokBPgQTAQIAKAUC
+V2pcIwIbAwUJCWYBgAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQHzBFpd91
+h8OOKwf/esIZtdW6D7jMTQJfsJD+NMPeA6MINwjZVpoII6l6/B60yI6sSxr9+K3U
+v9Fnh1Ok25rFeZy0FHCzrU74k302haWLoc31wE4vxy8BI6ftEL/B028RHYrgFR1O
+yQxEReQ6GyjcDmZuEaTXmeugJBMc5JEuoXxvZqx+afBpcRzMrDKk/p7XJUJ9L7wG
+zWRyQPlwoy7f4+2F47nht+hzYb28BxKoDxdp9ZdXqzQ6Gos4EvR1TMjx98XZS3uq
+lJNIxPm20X7y2Ne+gAlmRG5KZQNgETMgKLLx8l4SrnbUZ86poBNHF2KahRRCvNqs
+Qqv0ZNJSBmmUKmPNUoIEWmqxdKiVZLkBDQRXalwjAQgAzo7/2vrjXmWnh5PALZLC
+zyCt/7/8SLaFtfzoQXz3UEsLmsOFhUgIKKCYYByWh6vyK4ewBY2EgnWDdhh85D+V
+AcFn0pqGx3MavgmvilrML5gISa0IIdCozk8tVChYqx5SAXvXpD9gv5bV9HvlJhuQ
+4mMaGRX5Wcca7RATiuVZ9i2jFtTA929GLc2FQSdpFJ7/tOfjP7hiQ/I8lvPwnAdO
+af+ELeYxA8nXEKfBvKOfQyr7vgGWp8XHa3KbhmKc0mumu1c4e2ynUnYarlocoo2p
+gQAGFJ1fUeWShCUNjJ15EdytuOgHV4MlW6yBDFKSmfdX4Tr2Hmh5Z8hdVvP8HNFN
+GwARAQABiQElBBgBAgAPBQJXalwjAhsMBQkJZgGAAAoJEB8wRaXfdYfDI+oIAJku
+XUi3PdhE/azq4PqxsHlhOA5HJ5grWg3hUua802yW9680ZVIwTIOzBWxSDq07p4gc
+U83oYRZx1DAm+WUUcELYZbV4TYCWrc/P1QlwaEtJZteqkibaA8EzJBAEq/FmmOgK
+NmmHnEcmLkNWmy5VXhENachehq1fUxVl6w+NW1xQS6owOVsTeNOJiGIs9EcATy6v
+83aCUtDSQc0RYLGsPJVyRpWjrEL4mLJErfC1Z1wHe77AB849a+0aBN3WBtreqVGe
+z1rI5N4pSiFG0tLcG0uExJCjDUU/we1SmrcoOE/cGsBB2te15PPfSlJo7QQ93tRL
+2505FUvIAsM9jK1iocw=
+=SD/W
+-----END PGP PUBLIC KEY BLOCK-----
--
cgit v1.0