1 files changed, 14 insertions, 10 deletions

diff --git a/etc/meld.profile b/etc/meld.profile
index 14e0f238d..4a9f64421 100644
--- a/etc/meld.profile
+++ b/etc/meld.profile
@@ -6,22 +6,24 @@ include meld.local
 # Persistent global definitions
 include globals.local
 
-noblacklist ${HOME}/.local/share/meld
-
-# Allow python (blacklisted by disable-interpreters.inc)
-noblacklist ${PATH}/python2*
-noblacklist ${PATH}/python3*
-noblacklist /usr/lib/python2*
-noblacklist /usr/lib/python3*
-noblacklist /usr/local/lib/python2*
-noblacklist /usr/local/lib/python3*
+# If you want to use meld as git-mergetool (and maybe some other VCS integrations) you need
+# to bypass firejail, you can do this by removing the symlink or calling it by its absolute path
+# Removing the symlink:
+#  sudo rm /usr/local/bin/meld
+# Calling by its absolute path (example for git-mergetool):
+#  git config --global mergetool.meld.cmd /usr/bin/meld
 
 noblacklist ${HOME}/.config/git
 noblacklist ${HOME}/.gitconfig
 noblacklist ${HOME}/.git-credentials
+noblacklist ${HOME}/.local/share/meld
 noblacklist ${HOME}/.ssh
 noblacklist ${HOME}/.subversion
 
+# Allow python (blacklisted by disable-interpreters.inc)
+include allow-python2.inc
+include allow-python3.inc
+
 # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc.
 #include disable-common.inc
 include disable-devel.inc
@@ -31,7 +33,8 @@ include disable-passwdmgr.inc
 # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-programs.inc.
 #include disable-programs.inc
 
-include whitelist-var-common.inc
+# Uncomment the next line (or put it into your meld.local) if you don't need to compare files in /var.
+#include whitelist-var-common.inc
 
 apparmor
 caps.drop all
@@ -59,3 +62,4 @@ private-dev
 #private-etc alternatives,ca-certificates,crypto-policies,fonts,hostname,hosts,pki,resolv.conf,ssl,subversion
 private-tmp
 
+read-only ${HOME}/.ssh