solve package file conflict

QubesOS/qubes-issues#1885 (comment)
Kicksecure · Jun 9, 2019 · 49873e8 · 49873e8
1 parent d5127e7
commit 49873e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/debian/security-misc.maintscript b/debian/security-misc.maintscript
@@ -2,4 +2,6 @@
 ## See the file COPYING for copying conditions.
 
 ## Was moved to /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
-rm_conffile /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
+## Reverted due to package file conflict.
+## https://github.com/QubesOS/qubes-issues/issues/1885#issuecomment-500200375
+#rm_conffile /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
diff --git a/...ce4/xfconf/xfce-perchannel-xml/thunar.xml → ...ce4/xfconf/xfce-perchannel-xml/thunar.xml b/...ce4/xfconf/xfce-perchannel-xml/thunar.xml → ...ce4/xfconf/xfce-perchannel-xml/thunar.xml