From 7ce79a6d91ff1247a2ad20f268d84050a06d79dd Mon Sep 17 00:00:00 2001
From: "Francois B. (Makoto)" <francois@makotonoblog.be>
Date: Wed, 17 Jun 2020 18:45:27 +0200
Subject: [PATCH] entangle 2->3 for both branches

---
 repo_functions_ub1804.sh |  3 +--
 repo_functions_ub2004.sh | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index 30fe3c7..d12a67c 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -102,7 +102,7 @@ simplescreenrecorder-lib:i386;apt;multimedia;simplescreenrecorder-lib:i386
 cuetools;apt;multimedia;cuetools
 shntool;apt;multimedia;shntool
 flac;apt;multimedia;flac
-entangle;apt;multimedia;entangle
+org.entangle_photo.Manager;flatpak;multimedia;entangle
 krita;apt;multimedia;krita
 soundconverter;apt;multimedia;soundconverter
 gimp;apt;multimedia;gimp
@@ -497,7 +497,6 @@ rhythmbox-plugin-suspend;addRepo_Rhythmbox
 rhythmbox-plugin-wikipedia;addRepo_Rhythmbox
 rhythmbox-plugins;addRepo_Rhythmbox
 rawtherapee;addRepo_DhorMyWay
-entangle;addRepo_DhorMyWay
 mkvtoolnix-gui;addRepo_MKVToolnix
 purple-facebook;addRepo_Jgeboski
 audacious;addRepo_Webupd8
diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh
index 18e4c10..a8b81b6 100644
--- a/repo_functions_ub2004.sh
+++ b/repo_functions_ub2004.sh
@@ -92,7 +92,7 @@ webp;apt;multimedia;webp
 cuetools;apt;multimedia;cuetools
 shntool;apt;multimedia;shntool
 flac;apt;multimedia;flac
-entangle;apt;multimedia;entangle
+org.entangle_photo.Manager;flatpak;multimedia;entangle
 krita;apt;multimedia;krita
 soundconverter;apt;multimedia;soundconverter
 gimp;apt;multimedia;gimp
@@ -427,8 +427,6 @@ rhythmbox-plugin-spectrum;addRepo_Rhythmbox
 rhythmbox-plugin-suspend;addRepo_Rhythmbox
 rhythmbox-plugin-wikipedia;addRepo_Rhythmbox
 rhythmbox-plugins;addRepo_Rhythmbox
-rawtherapee;addRepo_DhorMyWay
-entangle;addRepo_DhorMyWay
 audacious;addRepo_Webupd8
 qt5ct;addRepo_Webupd8
 screenkey;addRepo_Webupd8
@@ -466,6 +464,8 @@ audacity;addRepo_Audacity
 ubuntu-make;addRepo_UbuntuMake"
 
 #TODO : no focal support yet / or not needed yet
+#rawtherapee;addRepo_DhorMyWay
+#entangle;addRepo_DhorMyWay
 #woeusb;addRepo_Webupd8
 #selene;addRepo_Teejee2008
 #youtube-dlg;addRepo_Webupd8
@@ -635,11 +635,11 @@ function addRepo_MKVToolnix () {
 }
 
 #
-# Entangle, Rawtherapee
+# Entangle, Rawtherapee #TODO : no focal support yet ?
 #
-function addRepo_DhorMyWay () {
-  addPPA ppa:dhor/myway
-}
+# function addRepo_DhorMyWay () {
+#   addPPA ppa:dhor/myway
+# }
 
 #
 # Rhythmbox