aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-03-19 14:12:41 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2017-03-19 14:12:41 -0400
commit3b7772a834964ad9f527587da87940e621c7ea63 (patch)
tree8413f5fa91a4c122b9e2d9a0138f23271a1a1d69
parentMerge pull request #1147 from SYN-cook/SYN-cook-add-scribus (diff)
downloadfirejail-3b7772a834964ad9f527587da87940e621c7ea63.tar.gz
firejail-3b7772a834964ad9f527587da87940e621c7ea63.tar.zst
firejail-3b7772a834964ad9f527587da87940e621c7ea63.zip
profile merges
-rw-r--r--README13
-rw-r--r--README.md2
-rw-r--r--RELNOTES1
-rw-r--r--platform/debian/conffiles1
-rw-r--r--src/firecfg/firecfg.config1
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)
99 - compile/install scripts for --git-install/--git-uninstall commands 99 - compile/install scripts for --git-install/--git-uninstall commands
100 - tighten keepassx 100 - tighten keepassx
101 - added Thunar profile 101 - added Thunar profile
102SYN-cook (https://github.com/SYN-cook)
103 - keepass/keepassx browser fixes
104 - disable-common.inc fixes
105 - blacklist GNOME keyring and Konqueror
106 - fixed Keepass(x) profiles
107 - Engrampa profile
108 - Scribus profile
102valoq (https://github.com/valoq) 109valoq (https://github.com/valoq)
103 - lots of profile fixes 110 - lots of profile fixes
104 - added support for /srv in --whitelist feature 111 - added support for /srv in --whitelist feature
@@ -150,12 +157,6 @@ eventyrer (https://github.com/eventyrer)
150thewisenerd (https://github.com/thewisenerd) 157thewisenerd (https://github.com/thewisenerd)
151 - allow multiple private-home commands 158 - allow multiple private-home commands
152 - use $SHELL variable if the shell is not specified 159 - use $SHELL variable if the shell is not specified
153SYN-cook (https://github.com/SYN-cook)
154 - keepass/keepassx browser fixes
155 - disable-common.inc fixes
156 - blacklist GNOME keyring and Konqueror
157 - fixed Keepass(x) profiles
158 - Engrampa profile
159thewisenerd (https://github.com/thewisenerd) 160thewisenerd (https://github.com/thewisenerd)
160 - appimage: pass commandline arguments 161 - appimage: pass commandline arguments
161KOLANICH (https://github.com/KOLANICH) 162KOLANICH (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
195simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget, 195simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, w3m, xfburn, xpra, wget,
196xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5, 196xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5,
197PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser, xmms, iridium browser, 197PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser, xmms, iridium browser,
198Kino, Thunar, Geeqie, Engrampa 198Kino, 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
43 * new profiles: Gnome Contacts, JD-GUI, Lollypop, MultiMC5, PDFSam, Pithos, 43 * new profiles: Gnome Contacts, JD-GUI, Lollypop, MultiMC5, PDFSam, Pithos,
44 * new profies: Xonotic, wireshark, keepassx2, QupZilla, FossaMail, 44 * new profies: Xonotic, wireshark, keepassx2, QupZilla, FossaMail,
45 * new profiles: Uzbl browser, iridium browser, Thunar, Geeqie, Engrampa 45 * new profiles: Uzbl browser, iridium browser, Thunar, Geeqie, Engrampa
46 * new profiles: Scribus
46 * bugfixes 47 * bugfixes
47 -- netblue30 <netblue30@yahoo.com> Sun, 23 Oct 2016 08:00:00 -0500 48 -- netblue30 <netblue30@yahoo.com> Sun, 23 Oct 2016 08:00:00 -0500
48 49
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 @@
251/etc/firejail/thunar.profile 251/etc/firejail/thunar.profile
252/etc/firejail/geeqie.profile 252/etc/firejail/geeqie.profile
253/etc/firejail/engrampa.profile 253/etc/firejail/engrampa.profile
254/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
168luminance-hdr 168luminance-hdr
169mupdf 169mupdf
170qpdfview 170qpdfview
171scribus
171soffice 172soffice
172synfigstudio 173synfigstudio
173Mathematica 174Mathematica