From 3b7772a834964ad9f527587da87940e621c7ea63 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Sun, 19 Mar 2017 14:12:41 -0400
Subject: profile merges

---
 README                     | 13 +++++++------
 README.md                  |  2 +-
 RELNOTES                   |  1 +
 platform/debian/conffiles  |  1 +
 src/firecfg/firecfg.config |  1 +
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 17d5f1b3e..15696d9d7 100644
--- a/README
+++ b/README
@@ -99,6 +99,13 @@ Fred-Barclay (https://github.com/Fred-Barclay)
 	- compile/install scripts for --git-install/--git-uninstall commands
 	- tighten keepassx
 	- added Thunar profile
+SYN-cook (https://github.com/SYN-cook)
+	- keepass/keepassx browser fixes
+	- disable-common.inc fixes
+	- blacklist GNOME keyring and Konqueror
+	- fixed Keepass(x) profiles
+	- Engrampa profile
+	- Scribus profile
 valoq (https://github.com/valoq)
 	- lots of profile fixes
 	- added support for /srv in --whitelist feature
@@ -150,12 +157,6 @@ eventyrer (https://github.com/eventyrer)
 thewisenerd (https://github.com/thewisenerd)
 	- allow multiple private-home commands
 	- use $SHELL variable if the shell is not specified
-SYN-cook (https://github.com/SYN-cook)
-	- keepass/keepassx browser fixes
-	- disable-common.inc fixes
-	- blacklist GNOME keyring and Konqueror
-	- fixed Keepass(x) profiles
-	- Engrampa profile
 thewisenerd (https://github.com/thewisenerd)
 	- appimage: pass commandline arguments
 KOLANICH (https://github.com/KOLANICH)
diff --git a/README.md b/README.md
index 62cb0daaf..0c4b7173a 100644
--- a/README.md
+++ b/README.md
@@ -195,4 +195,4 @@ goobox, gpa, gpg, gpg-agent, highlight, img2txt, k3b, kate, lynx, mediainfo, nau
 simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget,
 xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5,
 PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser, xmms, iridium browser,
-Kino, Thunar, Geeqie, Engrampa
+Kino, Thunar, Geeqie, Engrampa, Scribus
diff --git a/RELNOTES b/RELNOTES
index 122d5cfbe..ba8298a3b 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -43,6 +43,7 @@ firejail (0.9.45) baseline; urgency=low
   * new profiles: Gnome Contacts, JD-GUI, Lollypop, MultiMC5, PDFSam, Pithos,
   * new profies: Xonotic, wireshark, keepassx2, QupZilla, FossaMail,
   * new profiles: Uzbl browser, iridium browser, Thunar, Geeqie, Engrampa
+  * new profiles: Scribus
   * bugfixes
  -- netblue30 <netblue30@yahoo.com>  Sun, 23 Oct 2016 08:00:00 -0500
 
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index c4868981b..c68852f26 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -251,3 +251,4 @@
 /etc/firejail/thunar.profile
 /etc/firejail/geeqie.profile
 /etc/firejail/engrampa.profile
+/etc/firejail/scribus.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 3c1ecc573..656e3b14a 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -168,6 +168,7 @@ lowriter
 luminance-hdr
 mupdf
 qpdfview
+scribus
 soffice
 synfigstudio
 Mathematica
-- 
cgit v1.2.3-70-g09d2