diff options
author | 2016-11-18 10:07:35 -0500 | |
---|---|---|
committer | 2016-11-18 10:07:35 -0500 | |
commit | 1f99ee5659a0b985f3e481f2a30b08d351aaa3a2 (patch) | |
tree | c07892ae5af4f0ed43490d2692feafdb6b0abe0d /platform | |
parent | cleanup (diff) | |
parent | fixed order and missing profiles (diff) | |
download | firejail-1f99ee5659a0b985f3e481f2a30b08d351aaa3a2.tar.gz firejail-1f99ee5659a0b985f3e481f2a30b08d351aaa3a2.tar.zst firejail-1f99ee5659a0b985f3e481f2a30b08d351aaa3a2.zip |
Merge pull request #916 from valoq/master
fixed missing profiles
Diffstat (limited to 'platform')
-rw-r--r-- | platform/debian/conffiles | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/platform/debian/conffiles b/platform/debian/conffiles index 321a96f80..c6187628c 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles | |||
@@ -1,7 +1,9 @@ | |||
1 | /etc/firejail/0ad.profile | 1 | /etc/firejail/0ad.profile |
2 | /etc/firejail/7z.profile | ||
2 | /etc/firejail/Cyberfox.profile | 3 | /etc/firejail/Cyberfox.profile |
3 | /etc/firejail/Mathematica.profile | 4 | /etc/firejail/Mathematica.profile |
4 | /etc/firejail/Telegram.profile | 5 | /etc/firejail/Telegram.profile |
6 | /etc/firejail/Wire.profile | ||
5 | /etc/firejail/abrowser.profile | 7 | /etc/firejail/abrowser.profile |
6 | /etc/firejail/atom-beta.profile | 8 | /etc/firejail/atom-beta.profile |
7 | /etc/firejail/atom.profile | 9 | /etc/firejail/atom.profile |
@@ -14,6 +16,7 @@ | |||
14 | /etc/firejail/cherrytree.profile | 16 | /etc/firejail/cherrytree.profile |
15 | /etc/firejail/chromium-browser.profile | 17 | /etc/firejail/chromium-browser.profile |
16 | /etc/firejail/chromium.profile | 18 | /etc/firejail/chromium.profile |
19 | /etc/firejail/claws-mail.profile | ||
17 | /etc/firejail/clementine.profile | 20 | /etc/firejail/clementine.profile |
18 | /etc/firejail/cmus.profile | 21 | /etc/firejail/cmus.profile |
19 | /etc/firejail/conkeror.profile | 22 | /etc/firejail/conkeror.profile |
@@ -28,14 +31,18 @@ | |||
28 | /etc/firejail/disable-devel.inc | 31 | /etc/firejail/disable-devel.inc |
29 | /etc/firejail/disable-passwdmgr.inc | 32 | /etc/firejail/disable-passwdmgr.inc |
30 | /etc/firejail/disable-programs.inc | 33 | /etc/firejail/disable-programs.inc |
34 | /etc/firejail/display.profile | ||
31 | /etc/firejail/dnscrypt-proxy.profile | 35 | /etc/firejail/dnscrypt-proxy.profile |
32 | /etc/firejail/dnsmasq.profile | 36 | /etc/firejail/dnsmasq.profile |
33 | /etc/firejail/dosbox.profile | 37 | /etc/firejail/dosbox.profile |
34 | /etc/firejail/dropbox.profile | 38 | /etc/firejail/dropbox.profile |
39 | /etc/firejail/emacs.profile | ||
35 | /etc/firejail/empathy.profile | 40 | /etc/firejail/empathy.profile |
41 | /etc/firejail/eog.profile | ||
36 | /etc/firejail/eom.profile | 42 | /etc/firejail/eom.profile |
37 | /etc/firejail/epiphany.profile | 43 | /etc/firejail/epiphany.profile |
38 | /etc/firejail/evince.profile | 44 | /etc/firejail/evince.profile |
45 | /etc/firejail/evolution.profile | ||
39 | /etc/firejail/fbreader.profile | 46 | /etc/firejail/fbreader.profile |
40 | /etc/firejail/feh.profile | 47 | /etc/firejail/feh.profile |
41 | /etc/firejail/file.profile | 48 | /etc/firejail/file.profile |
@@ -44,9 +51,11 @@ | |||
44 | /etc/firejail/firefox.profile | 51 | /etc/firejail/firefox.profile |
45 | /etc/firejail/firejail.config | 52 | /etc/firejail/firejail.config |
46 | /etc/firejail/flashpeak-slimjet.profile | 53 | /etc/firejail/flashpeak-slimjet.profile |
54 | /etc/firejail/flowblade.profile | ||
47 | /etc/firejail/franz.profile | 55 | /etc/firejail/franz.profile |
48 | /etc/firejail/gajim.profile | 56 | /etc/firejail/gajim.profile |
49 | /etc/firejail/gimp.profile | 57 | /etc/firejail/gimp.profile |
58 | /etc/firejail/git.profile | ||
50 | /etc/firejail/gitter.profile | 59 | /etc/firejail/gitter.profile |
51 | /etc/firejail/gnome-chess.profile | 60 | /etc/firejail/gnome-chess.profile |
52 | /etc/firejail/gnome-mplayer.profile | 61 | /etc/firejail/gnome-mplayer.profile |
@@ -58,6 +67,7 @@ | |||
58 | /etc/firejail/gpredict.profile | 67 | /etc/firejail/gpredict.profile |
59 | /etc/firejail/gtar.profile | 68 | /etc/firejail/gtar.profile |
60 | /etc/firejail/gthumb.profile | 69 | /etc/firejail/gthumb.profile |
70 | /etc/firejail/guayadeque.profile | ||
61 | /etc/firejail/gwenview.profile | 71 | /etc/firejail/gwenview.profile |
62 | /etc/firejail/gzip.profile | 72 | /etc/firejail/gzip.profile |
63 | /etc/firejail/hedgewars.profile | 73 | /etc/firejail/hedgewars.profile |
@@ -68,6 +78,8 @@ | |||
68 | /etc/firejail/inkscape.profile | 78 | /etc/firejail/inkscape.profile |
69 | /etc/firejail/inox.profile | 79 | /etc/firejail/inox.profile |
70 | /etc/firejail/jitsi.profile | 80 | /etc/firejail/jitsi.profile |
81 | /etc/firejail/keepass.profile | ||
82 | /etc/firejail/keepassx.profile | ||
71 | /etc/firejail/kmail.profile | 83 | /etc/firejail/kmail.profile |
72 | /etc/firejail/konversation.profile | 84 | /etc/firejail/konversation.profile |
73 | /etc/firejail/less.profile | 85 | /etc/firejail/less.profile |
@@ -87,12 +99,15 @@ | |||
87 | /etc/firejail/mcabber.profile | 99 | /etc/firejail/mcabber.profile |
88 | /etc/firejail/midori.profile | 100 | /etc/firejail/midori.profile |
89 | /etc/firejail/mpv.profile | 101 | /etc/firejail/mpv.profile |
102 | /etc/firejail/mumble.profile | ||
90 | /etc/firejail/mupdf.profile | 103 | /etc/firejail/mupdf.profile |
91 | /etc/firejail/mupen64plus.profile | 104 | /etc/firejail/mupen64plus.profile |
105 | /etc/firejail/mutt.profile | ||
92 | /etc/firejail/netsurf.profile | 106 | /etc/firejail/netsurf.profile |
93 | /etc/firejail/nolocal.net | 107 | /etc/firejail/nolocal.net |
94 | /etc/firejail/okular.profile | 108 | /etc/firejail/okular.profile |
95 | /etc/firejail/openbox.profile | 109 | /etc/firejail/openbox.profile |
110 | /etc/firejail/openshot.profile | ||
96 | /etc/firejail/opera-beta.profile | 111 | /etc/firejail/opera-beta.profile |
97 | /etc/firejail/opera.profile | 112 | /etc/firejail/opera.profile |
98 | /etc/firejail/palemoon.profile | 113 | /etc/firejail/palemoon.profile |
@@ -120,6 +135,7 @@ | |||
120 | /etc/firejail/soffice.profile | 135 | /etc/firejail/soffice.profile |
121 | /etc/firejail/spotify.profile | 136 | /etc/firejail/spotify.profile |
122 | /etc/firejail/ssh.profile | 137 | /etc/firejail/ssh.profile |
138 | /etc/firejail/start-tor-browser.profile | ||
123 | /etc/firejail/steam.profile | 139 | /etc/firejail/steam.profile |
124 | /etc/firejail/stellarium.profile | 140 | /etc/firejail/stellarium.profile |
125 | /etc/firejail/strings.profile | 141 | /etc/firejail/strings.profile |
@@ -135,6 +151,8 @@ | |||
135 | /etc/firejail/unrar.profile | 151 | /etc/firejail/unrar.profile |
136 | /etc/firejail/unzip.profile | 152 | /etc/firejail/unzip.profile |
137 | /etc/firejail/uudeview.profile | 153 | /etc/firejail/uudeview.profile |
154 | /etc/firejail/vim.profile | ||
155 | /etc/firejail/virtualbox.profile | ||
138 | /etc/firejail/vivaldi-beta.profile | 156 | /etc/firejail/vivaldi-beta.profile |
139 | /etc/firejail/vivaldi.profile | 157 | /etc/firejail/vivaldi.profile |
140 | /etc/firejail/vlc.profile | 158 | /etc/firejail/vlc.profile |
@@ -145,32 +163,14 @@ | |||
145 | /etc/firejail/wesnoth.profile | 163 | /etc/firejail/wesnoth.profile |
146 | /etc/firejail/whitelist-common.inc | 164 | /etc/firejail/whitelist-common.inc |
147 | /etc/firejail/wine.profile | 165 | /etc/firejail/wine.profile |
166 | /etc/firejail/wire.profile | ||
148 | /etc/firejail/xchat.profile | 167 | /etc/firejail/xchat.profile |
168 | /etc/firejail/xiphos.profile | ||
169 | /etc/firejail/xpdf.profile | ||
149 | /etc/firejail/xplayer.profile | 170 | /etc/firejail/xplayer.profile |
150 | /etc/firejail/xreader.profile | 171 | /etc/firejail/xreader.profile |
151 | /etc/firejail/xviewer.profile | 172 | /etc/firejail/xviewer.profile |
152 | /etc/firejail/xz.profile | 173 | /etc/firejail/xz.profile |
153 | /etc/firejail/xzdec.profile | 174 | /etc/firejail/xzdec.profile |
154 | /etc/firejail/zathura.profile | 175 | /etc/firejail/zathura.profile |
155 | /etc/firejail/7z.profile | ||
156 | /etc/firejail/keepass.profile | ||
157 | /etc/firejail/keepassx.profile | ||
158 | /etc/firejail/claws-mail.profile | ||
159 | /etc/firejail/mutt.profile | ||
160 | /etc/firejail/git.profile | ||
161 | /etc/firejail/emacs.profile | ||
162 | /etc/firejail/vim.profile | ||
163 | /etc/firejail/xpdf.profile | ||
164 | /etc/firejail/virtualbox.profile | ||
165 | /etc/firejail/openshot.profile | ||
166 | /etc/firejail/flowblade.profile | ||
167 | /etc/firejail/eog.profile | ||
168 | /etc/firejail/evolution.profile | ||
169 | /etc/firejail/start-tor-browser.profile | ||
170 | /etc/firejail/xiphos.profile | ||
171 | /etc/firejail/display.profile | ||
172 | /etc/firejail/Wire.profile | ||
173 | /etc/firejail/wire.profile | ||
174 | /etc/firejail/mumble.profile | ||
175 | /etc/firejail/zoom.profile | 176 | /etc/firejail/zoom.profile |
176 | /etc/firejail/guayadeque.profile | ||