aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2018-04-07 08:26:37 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2018-04-07 08:26:37 -0400
commitf4d2a94b3cca09e31370ae203c38f9fff12579e9 (patch)
treee30d6f3ebfe29dd6db7e778ec1b5b5e5316dbf17
parentMerge pull request #1870 from glitsj16/atool (diff)
downloadfirejail-f4d2a94b3cca09e31370ae203c38f9fff12579e9.tar.gz
firejail-f4d2a94b3cca09e31370ae203c38f9fff12579e9.tar.zst
firejail-f4d2a94b3cca09e31370ae203c38f9fff12579e9.zip
merges
-rw-r--r--README3
-rw-r--r--README.md3
-rw-r--r--RELNOTES3
-rw-r--r--etc/bunzip2.profile (renamed from etc/bunzip2)0
-rw-r--r--etc/gunzip.profile (renamed from etc/gunzip)0
5 files changed, 7 insertions, 2 deletions
diff --git a/README b/README
index 4f9bba945..e6f8d935b 100644
--- a/README
+++ b/README
@@ -248,6 +248,9 @@ glitsj16 (https://github.com/glitsj16)
248 - evince-previewer, evince-thumbnailer profiles 248 - evince-previewer, evince-thumbnailer profiles
249 - gnome-recipes, gnome-logs profiles 249 - gnome-recipes, gnome-logs profiles
250 - fixed private-lib for gnome-calculator 250 - fixed private-lib for gnome-calculator
251 - gunzip, bunzip2 profiles
252 - enchant, enchat-2, enchant-lsmod, enchant-lsmod-2 profiles
253 - atool, soundconvertor, mpd, gnome-calculator, makepkg profile fixes
251graywolf (https://github.com/graywolf) 254graywolf (https://github.com/graywolf)
252 - spelling fix 255 - spelling fix
253greigdp (https://github.com/greigdp) 256greigdp (https://github.com/greigdp)
diff --git a/README.md b/README.md
index a464c2c09..57c4a0353 100644
--- a/README.md
+++ b/README.md
@@ -308,4 +308,5 @@ Basilisk browser, Tor Browser language packs, PlayOnLinux, sylpheed, discord-can
308pycharm-community, pycharm-professional, Pitivi, OnionShare, Fritzing, Kaffeine, pdfchain, 308pycharm-community, pycharm-professional, Pitivi, OnionShare, Fritzing, Kaffeine, pdfchain,
309tilp, vivaldi-snapshot, bitcoin-qt, VS Code, falkon, gnome-builder, lobase, asunder, 309tilp, vivaldi-snapshot, bitcoin-qt, VS Code, falkon, gnome-builder, lobase, asunder,
310gnome-recipes, akonadi_control, evince-previewer, evince-thumbnailer, blender-2.8, 310gnome-recipes, akonadi_control, evince-previewer, evince-thumbnailer, blender-2.8,
311thunderbird-beta, ncdu, gnome-logs, gcloud, musixmatch 311thunderbird-beta, ncdu, gnome-logs, gcloud, musixmatch, gunzip, bunzip2,
312enchant, enchant-2, enchant-lsmod, enchant-lsmod-2
diff --git a/RELNOTES b/RELNOTES
index 9f63610e6..c98adcb72 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -36,7 +36,8 @@ firejail (0.9.53) baseline; urgency=low
36 * new profiles: falkon, gnome-builder, asunder, VS Code, gnome-recipes 36 * new profiles: falkon, gnome-builder, asunder, VS Code, gnome-recipes
37 * new profiles: akonadi_controle, evince-previewer, evince-thumbnailer, 37 * new profiles: akonadi_controle, evince-previewer, evince-thumbnailer,
38 * new profiles: blender-2.8, thunderbird-beta, ncdu, gnome-logs, gcloud 38 * new profiles: blender-2.8, thunderbird-beta, ncdu, gnome-logs, gcloud
39 * new profiles: musixmatch 39 * new profiles: musixmatch, gunzip, bunzip2, enchant-lsmod, enchant-lsmod-2
40 * new profiles: enchant, enchant-2
40 -- netblue30 <netblue30@yahoo.com> Thu, 1 Mar 2018 08:00:00 -0500 41 -- netblue30 <netblue30@yahoo.com> Thu, 1 Mar 2018 08:00:00 -0500
41 42
42firejail (0.9.52) baseline; urgency=low 43firejail (0.9.52) baseline; urgency=low
diff --git a/etc/bunzip2 b/etc/bunzip2.profile
index f483a1d3d..f483a1d3d 100644
--- a/etc/bunzip2
+++ b/etc/bunzip2.profile
diff --git a/etc/gunzip b/etc/gunzip.profile
index 8ea523df7..8ea523df7 100644
--- a/etc/gunzip
+++ b/etc/gunzip.profile