From aecee8b4b84759e0cc0c2cffc3844ab455cdbec6 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 24 Nov 2019 12:31:16 -0500
Subject: merges

---
 README                     | 2 ++
 README.md                  | 2 +-
 RELNOTES                   | 2 +-
 etc/disable-programs.inc   | 2 ++
 src/firecfg/firecfg.config | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 7e9a690bf..17c915888 100644
--- a/README
+++ b/README
@@ -58,6 +58,8 @@ Firejail Authors (alphabetical order)
 	- fix flameshot raw screenshots
 1dnrr (https://github.com/1dnrr)
 	- add pybitmessage profile
+Adrian L. Shaw (https://github.com/adrianlshaw)
+	- add profanity profile
 Aidan Gauland (https://github.com/aidalgol)
 	- added electron and riot-web profiles
 Akhil Hans Maulloo (https://github.com/kouul)
diff --git a/README.md b/README.md
index 4ae9ef519..e1deba279 100644
--- a/README.md
+++ b/README.md
@@ -122,4 +122,4 @@ gnome-sound-recorder, godot, jerry, keepassxc-cli, keepassxc-proxy, klatexformul
 pandoc, qgis, rhythmbox-client, tcpdump, teams-for-linux, tshark, xlinks, zeal, mpg123, conplay, mpg123.bin, mpg123-alsa, mpg123-id3dump,
 mpg123-jack, mpg123-nas, mpg123-openal, mpg123-oss, mpg123-portaudio, mpg123-pulse, mpg123-strip, out123, pavucontrol-qt,
 gnome-characters, gnome-character-map, rsync, Whalebird, tor-browser (AUR), Zulip, tb-starter-wrapper, bzcat, kiwix-desktop, ar,
-gnome-latex, pngquant, kalgebra, kalgebramobile, signal-cli, amuled, kfind
+gnome-latex, pngquant, kalgebra, kalgebramobile, signal-cli, amuled, kfind, profanity
diff --git a/RELNOTES b/RELNOTES
index f83aa803f..9044ed4d3 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -22,7 +22,7 @@ firejail (0.9.61) baseline; urgency=low
   * new profiles: tor-browser (AUR), Zulip, tb-starter-wrapper, bzcat,
   * new profiles: kiwix-desktop, bzcat, zstd, pzstd, zstdcat, zstdgrep, zstdless
   * new profiles: zstdmt, unzstd, i2p, ar, gnome-latex, pngquant, kalgebra
-  * new profiles: kalgebramobile, signal-cli, amuled, kfind
+  * new profiles: kalgebramobile, signal-cli, amuled, kfind, profanity
  -- netblue30 <netblue30@yahoo.com>  Sat, 1 Jun 2019 08:00:00 -0500
 
 firejail (0.9.60) baseline; urgency=low
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 4db110af7..8b08d6051 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -272,6 +272,7 @@ blacklist ${HOME}/.config/pix
 blacklist ${HOME}/.config/pluma
 blacklist ${HOME}/.config/ppsspp
 blacklist ${HOME}/.config/pragha
+blacklist ${HOME}/.config/profanity
 blacklist ${HOME}/.config/psi+
 blacklist ${HOME}/.config/qBittorrent
 blacklist ${HOME}/.config/qBittorrentrc
@@ -558,6 +559,7 @@ blacklist ${HOME}/.local/share/orage
 blacklist ${HOME}/.local/share/org.kde.gwenview
 blacklist ${HOME}/.local/share/pix
 blacklist ${HOME}/.local/share/plasma_notes
+blacklist ${HOME}/.local/share/profanity
 blacklist ${HOME}/.local/share/psi+
 blacklist ${HOME}/.local/share/qpdfview
 blacklist ${HOME}/.local/share/qutebrowser
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index b4a425356..8694ffa90 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -483,6 +483,7 @@ pngquant
 polari
 ppsspp
 pragha
+profanity
 psi-plus
 pybitmessage
 # pycharm-community - FB note: may enable later
-- 
cgit v1.2.3-54-g00ecf