14 files changed, 119 insertions, 128 deletions
diff --git a/freefilesync/debian/FreeFileSync.desktop b/freefilesync/debian/FreeFileSync.desktop
index d7b508d..6bb4d24 100644
--- a/freefilesync/debian/FreeFileSync.desktop
+++ b/freefilesync/debian/FreeFileSync.desktop
@@ -2,7 +2,7 @@
 Categories=GTK;Utility;FileTools;
 Comment=Backup software to synchronize files and folders
 Comment[pt_BR]=Aplicação de backup para sincronizar arquivos e diretórios
-Exec=FreeFileSync
+Exec=FreeFileSync %f
 GenericName=File synchronization
 GenericName[pt_BR]=Sincronização de arquivos
 Icon=FreeFileSync
diff --git a/freefilesync/debian/README.Debian b/freefilesync/debian/README.Debian
index dee9b13..9d85628 100644
--- a/freefilesync/debian/README.Debian
+++ b/freefilesync/debian/README.Debian
@@ -1,3 +1,9 @@
+freefilesync (10.20-2+devuan)
+
+  * gtk2 build
+
+ -- B Stack <bgstack15@gmail.com>  Sat, 15 Feb 2020 16:30:36 -0500
+
 freefilesync (10.19-2+devuan)
 
   * gtk2 build
diff --git a/freefilesync/debian/RealTimeSync.desktop b/freefilesync/debian/RealTimeSync.desktop
index fa2b1d4..d7d2670 100644
--- a/freefilesync/debian/RealTimeSync.desktop
+++ b/freefilesync/debian/RealTimeSync.desktop
@@ -2,7 +2,7 @@
 Categories=GTK;Utility;FileTools;
 Comment=Real time synchronization
 Comment[pt_BR]=Sincronização em tempo real
-Exec=RealTimeSync
+Exec=RealTimeSync %f
 GenericName=Automated Synchronization
 GenericName[pt_BR]=Sincronização Automatizada
 Icon=RealTimeSync
diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index c57660b..82a070d 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,25 @@
+freefilesync (10.20-2+devuan) albion; urgency=low
+
+  * gtk2 build
+  * Send email notifications after sync (Donation Edition)
+  * Generate log files in HTML format
+  * Detect sync database consistency errors
+  * Start log file with preview of first 50 errors/warnings
+  * Mitigate lock file data corruption
+  * Print Windows error codes in hexadecimal
+  * Fixed missing MTP and network links in folder picker (Linux)
+  * Display versioning and log folder path history
+  * Display and log all config names for merged configurations
+  * Run post-sync command synchronously and log exit code
+  * Fixed crash on Bitvise SFTP servers with zlib delayed compression
+  * Show actual time out used in failure message
+  * Show detailed error message when failing to test sound files
+  * Fixed timeout for long-running FTP uploads by sending keep-alives
+  * Use Donation Edition on unlimited number of virtual machines
+  * Ignore accidental clicks in empty space of configuration panel
+
+ -- B Stack <bgstack15@gmail.com>  Sat, 15 Feb 2020 15:58:33 -0500
+
 freefilesync (10.19-2+devuan) manual; urgency=low
 
   * gtk2 build
diff --git a/freefilesync/debian/control b/freefilesync/debian/control
index 58a71cf..5b2df37 100644
--- a/freefilesync/debian/control
+++ b/freefilesync/debian/control
@@ -3,16 +3,15 @@ Section: utils
 Priority: optional
 Maintainer: B Stack <bgstack15@gmail.com>
 Build-Depends: debhelper (>=12~),
-               autotools-dev,
                imagemagick,
                libcurl4-openssl-dev,
                libssh2-1-dev,
                libssl-dev,
                wx3.0-headers,
                unzip,
-# gtk2 version
+# gtk2 version, now not possible with stock devuan repos
                libgtk2.0-dev,
-               libwxgtk3.0-dev,
+               libwxgtk3.0-dev (=3.0.4+dfsg-14),
 # gtk3 version
 #               libgtk-3-dev,
 #               libwxgtk3.0-gtk3-dev,
@@ -24,7 +23,7 @@ Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends},
          xdg-utils
-Description: 
+Description: cross-platform file sync utility, gpl release
  FreeFileSync is a folder comparison and synchronization software that
  creates and manages backup copies of all your important files. Instead
  of copying every file every time, FreeFileSync determines the
diff --git a/freefilesync/debian/files b/freefilesync/debian/files
deleted file mode 100644
index c26d041..0000000
--- a/freefilesync/debian/files
+++ /dev/null
@@ -1,2 +0,0 @@
-freefilesync_10.9-1devuan_amd64.buildinfo utils optional
-freefilesync_10.9-1devuan_amd64.deb utils optional
diff --git a/freefilesync/debian/freefilesync.manpages b/freefilesync/debian/freefilesync.manpages
new file mode 100644
index 0000000..2fb19fb
--- /dev/null
+++ b/freefilesync/debian/freefilesync.manpages
@@ -0,0 +1 @@
+debian/manpages/*
diff --git a/freefilesync/debian/freefilesync.substvars b/freefilesync/debian/freefilesync.substvars
deleted file mode 100644
index fad364f..0000000
--- a/freefilesync/debian/freefilesync.substvars
+++ /dev/null
@@ -1,3 +0,0 @@
-shlibs:Depends=libatk1.0-0 (>= 1.12.4), libc6 (>= 2.28), libcairo2 (>= 1.2.4), libcurl4 (>= 7.16.2), libfontconfig1 (>= 2.12.6), libfreetype6 (>= 2.2.1), libgcc1 (>= 1:3.0), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.16.0), libgtk2.0-0 (>= 2.14.0), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libpangoft2-1.0-0 (>= 1.14.0), libselinux1 (>= 1.32), libssh2-1 (>= 1.7.0), libssl1.1 (>= 1.1.0), libstdc++6 (>= 7), libwxbase3.0-0v5 (>= 3.0.4+dfsg), libwxgtk3.0-0v5 (>= 3.0.4+dfsg), zlib1g (>= 1:1.2.0)
-misc:Depends=
-misc:Pre-Depends=
diff --git a/freefilesync/debian/manpages/RealtimeSync.1 b/freefilesync/debian/manpages/RealTimeSync.1
index 9b1f992..9b1f992 100644
--- a/freefilesync/debian/manpages/RealtimeSync.1
+++ b/freefilesync/debian/manpages/RealTimeSync.1
diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
new file mode 100644
index 0000000..4ad070c
--- /dev/null
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -0,0 +1,70 @@
+Author: B Stack
+Source: Original research
+Date: 2019-11-21
+Message: Main patch to compile on Devuan.
+diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/base/ffs_paths.cpp 10.18-1/FreeFileSync/Source/base/ffs_paths.cpp
+--- 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp	2019-06-14 20:23:07.615661499 -0400
++++ 10.18-1/FreeFileSync/Source/base/ffs_paths.cpp	2019-11-21 09:41:42.287474472 -0500
+@@ -64,7 +64,8 @@
+ 
+ Zstring fff::getResourceDirPf()
+ {
+-    return getProcessParentFolderPath() + FILE_NAME_SEPARATOR + Zstr("Resources") + FILE_NAME_SEPARATOR;
++    // For Fedora, EL and Devuan, install to /usr/share/freefilesync specificly
++    return Zstr("/usr/share/freefilesync/");
+ }
+ 
+ 
+diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/Makefile 10.18-1/FreeFileSync/Source/Makefile
+--- 10.11-0/FreeFileSync/Source/Makefile	2019-04-12 08:05:57.000000000 -0400
++++ 10.18-2/FreeFileSync/Source/Makefile	2019-11-21 09:42:57.408243242 -0500
+@@ -1,10 +1,10 @@
+-EXENAME = FreeFileSync_$(shell arch)
++EXENAME = FreeFileSync
+ 
+ CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
+            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
+ 
+-LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
++LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
+ 
+ 
+ CXXFLAGS  += `pkg-config --cflags openssl`
+@@ -84,6 +85,7 @@
+ CPP_FILES+=../../zen/file_io.cpp
+ CPP_FILES+=../../zen/file_traverser.cpp
+ CPP_FILES+=../../zen/http.cpp
++CPP_FILES+=../../zen/system.cpp
+ CPP_FILES+=../../zen/zstring.cpp
+ CPP_FILES+=../../zen/format_unit.cpp
+ CPP_FILES+=../../zen/legacy_compiler.cpp
+diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp
+--- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 07:56:06.714625467 -0500
++++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 08:56:49.251467477 -0500
+@@ -95,6 +95,8 @@
+     build += L"64 Bit";
+ #endif
+ 
++    build += L" for Devuan";
++
+     build += SPACED_BULLET;
+     build += formatTime<wxString>(FORMAT_DATE, getCompileTime());
+ 
+diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/RealTimeSync/Makefile 10.18-1/FreeFileSync/Source/RealTimeSync/Makefile
+--- 10.18-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 11:45:58.241515736 -0500
++++ 10.20-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 15:41:50.787195378 -0500
+@@ -1,10 +1,10 @@
+-EXENAME = RealTimeSync_$(shell arch)
++EXENAME = RealTimeSync
+ 
+ CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
+            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
+            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
+ 
+-LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
++LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
+ 
+ #Gtk - support "no button border"
+ CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
+
diff --git a/freefilesync/debian/patches/ffs_devuan_gtk2.patch b/freefilesync/debian/patches/ffs_devuan_gtk2.patch
index 1a79546..f3242b3 100644
--- a/freefilesync/debian/patches/ffs_devuan_gtk2.patch
+++ b/freefilesync/debian/patches/ffs_devuan_gtk2.patch
@@ -1,36 +1,10 @@
 Author: B Stack
 Source: Original research
 Date: 2019-11-21
-Message: Main patch to compile on Devuan.
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/base/ffs_paths.cpp 10.18-1/FreeFileSync/Source/base/ffs_paths.cpp
---- 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp	2019-06-14 20:23:07.615661499 -0400
-+++ 10.18-1/FreeFileSync/Source/base/ffs_paths.cpp	2019-11-21 09:41:42.287474472 -0500
-@@ -64,7 +64,8 @@
- 
- Zstring fff::getResourceDirPf()
- {
--    return getProcessParentFolderPath() + FILE_NAME_SEPARATOR + Zstr("Resources") + FILE_NAME_SEPARATOR;
-+    // For Fedora, EL and Devuan, install to /usr/share/freefilesync specificly
-+    return Zstr("/usr/share/freefilesync/");
- }
- 
- 
+Message: Patches to use gtk2. Depends on ffs_devuan.patch
 diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/Makefile 10.18-1/FreeFileSync/Source/Makefile
 --- 10.11-0/FreeFileSync/Source/Makefile	2019-04-12 08:05:57.000000000 -0400
 +++ 10.18-2/FreeFileSync/Source/Makefile	2019-11-21 09:42:57.408243242 -0500
-@@ -1,10 +1,10 @@
--EXENAME = FreeFileSync_$(shell arch)
-+EXENAME = FreeFileSync
- 
- CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
-            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
-            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
- 
--LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
-+LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
- 
- 
- CXXFLAGS  += `pkg-config --cflags openssl`
 @@ -16,9 +16,10 @@
  CXXFLAGS  += `pkg-config --cflags libssh2`
  LINKFLAGS += `pkg-config --libs   libssh2`
@@ -44,47 +18,14 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou
  
  #support for SELinux (optional)
  SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
-@@ -84,6 +85,7 @@
- CPP_FILES+=../../zen/file_io.cpp
- CPP_FILES+=../../zen/file_traverser.cpp
- CPP_FILES+=../../zen/http.cpp
-+CPP_FILES+=../../zen/system.cpp
- CPP_FILES+=../../zen/zstring.cpp
- CPP_FILES+=../../zen/format_unit.cpp
- CPP_FILES+=../../zen/legacy_compiler.cpp
 diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/RealTimeSync/Makefile 10.18-1/FreeFileSync/Source/RealTimeSync/Makefile
---- 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile	2019-04-12 08:05:57.000000000 -0400
-+++ 10.18-2/FreeFileSync/Source/RealTimeSync/Makefile	2019-11-21 09:46:11.378240094 -0500
-@@ -1,15 +1,16 @@
--EXENAME = RealTimeSync_$(shell arch)
-+EXENAME = RealTimeSync
- 
- CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
-            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
-            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
- 
--LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
-+LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
+--- 10.20-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 11:45:58.241515736 -0500
++++ 10.20-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 15:43:32.852203730 -0500
+@@ -8,6 +8,7 @@
  
  #Gtk - support "no button border"
--CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
-+CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
+ CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
 +LINKFLAGS += `pkg-config --libs   gtk+-2.0`
  #treat as system headers so that warnings are hidden:
--CXXFLAGS  += -isystem/usr/include/gtk-2.0
-+CXXFLAGS  += -isystem/usr/include/gtk-2.0
- 
- CPP_FILES=
- CPP_FILES+=application.cpp
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp
---- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 07:56:06.714625467 -0500
-+++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 08:56:49.251467477 -0500
-@@ -95,6 +95,8 @@
-     build += L"64 Bit";
- #endif
- 
-+    build += L" for Devuan";
-+
-     build += SPACED_BULLET;
-     build += formatTime<wxString>(FORMAT_DATE, getCompileTime());
+ CXXFLAGS  += -isystem/usr/include/gtk-2.0
  
diff --git a/freefilesync/debian/patches/ffs_devuan_gtk3.patch b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
index 787f6d5..0838fbd 100644
--- a/freefilesync/debian/patches/ffs_devuan_gtk3.patch
+++ b/freefilesync/debian/patches/ffs_devuan_gtk3.patch
@@ -3,35 +3,9 @@ Source: Original research
 Date: 2019-11-21
 Message: Main patch to compile on Devuan.
 This reintroduces the gtk-3 usage, because Debian/Devuan stopped packaging libwxgtk3.0-dev (which used gtk2) and only does libwxgtk3.0-gtk3-dev. However, by reintroducing the gtk3, it brings back the old gtk3 instability from my previous packaging effort: https://freefilesync.org/forum/viewtopic.php?t=4918. /mnt/public/packages/old/freefilesync/freefilesync-9.7-1.master.tgz. Upstream never replied, but did note in the source that gtk3 is inherently unstable.
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/base/ffs_paths.cpp 10.18-1/FreeFileSync/Source/base/ffs_paths.cpp
---- 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp	2019-06-14 20:23:07.615661499 -0400
-+++ 10.18-1/FreeFileSync/Source/base/ffs_paths.cpp	2019-11-21 09:41:42.287474472 -0500
-@@ -64,7 +64,8 @@
- 
- Zstring fff::getResourceDirPf()
- {
--    return getProcessParentFolderPath() + FILE_NAME_SEPARATOR + Zstr("Resources") + FILE_NAME_SEPARATOR;
-+    // For Fedora, EL and Devuan, install to /usr/share/freefilesync specificly
-+    return Zstr("/usr/share/freefilesync/");
- }
- 
- 
 diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/Makefile 10.18-1/FreeFileSync/Source/Makefile
 --- 10.11-0/FreeFileSync/Source/Makefile	2019-04-12 08:05:57.000000000 -0400
 +++ 10.18-1/FreeFileSync/Source/Makefile	2019-11-21 09:42:57.408243242 -0500
-@@ -1,10 +1,10 @@
--EXENAME = FreeFileSync_$(shell arch)
-+EXENAME = FreeFileSync
- 
- CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
-            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
-            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
- 
--LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
-+LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
- 
- 
- CXXFLAGS  += `pkg-config --cflags openssl`
 @@ -16,9 +16,10 @@
  CXXFLAGS  += `pkg-config --cflags libssh2`
  LINKFLAGS += `pkg-config --libs   libssh2`
@@ -46,22 +20,12 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou
  #support for SELinux (optional)
  SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
 diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/RealTimeSync/Makefile 10.18-1/FreeFileSync/Source/RealTimeSync/Makefile
---- 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile	2019-04-12 08:05:57.000000000 -0400
-+++ 10.18-1/FreeFileSync/Source/RealTimeSync/Makefile	2019-11-21 09:46:11.378240094 -0500
-@@ -1,15 +1,16 @@
--EXENAME = RealTimeSync_$(shell arch)
-+EXENAME = RealTimeSync
- 
- CXXFLAGS = -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
-            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
-            -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
- 
--LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread
-+LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread
+--- 10.20-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 11:45:58.241515736 -0500
++++ 10.20-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 15:48:17.922847426 -0500
+@@ -8,8 +8,9 @@
  
  #Gtk - support "no button border"
--CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
-+CXXFLAGS  += `pkg-config --cflags gtk+-3.0`
+ CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
 +LINKFLAGS += `pkg-config --libs   gtk+-3.0`
  #treat as system headers so that warnings are hidden:
 -CXXFLAGS  += -isystem/usr/include/gtk-2.0
@@ -69,18 +33,7 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Sou
  
  CPP_FILES=
  CPP_FILES+=application.cpp
-diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp
---- 10.11-0/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 07:56:06.714625467 -0500
-+++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp	2019-12-27 08:56:49.251467477 -0500
-@@ -95,6 +95,8 @@
-     build += L"64 Bit";
- #endif
- 
-+    build += L" for Devuan";
-+
-     build += SPACED_BULLET;
-     build += formatTime<wxString>(FORMAT_DATE, getCompileTime());
- 
+
 diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/wx+/dc.h 10.18-1/wx+/dc.h
 --- 10.18-0/wx+/dc.h	2019-11-21 08:24:23.967769384 -0500
 +++ 10.18-1/wx+/dc.h	2019-11-21 09:42:12.779786504 -0500
diff --git a/freefilesync/debian/patches/series b/freefilesync/debian/patches/series
index 61f9440..f61c180 100644
--- a/freefilesync/debian/patches/series
+++ b/freefilesync/debian/patches/series
@@ -1,4 +1,5 @@
 ffs_allow_parallel_ops.patch
+ffs_devuan.patch
 # can be either gtk2 or gtk3
 ffs_devuan_gtk2.patch
 ffs_no_check_updates.patch
diff --git a/freefilesync/debian/rules b/freefilesync/debian/rules
index 6ebd427..7e182e7 100755
--- a/freefilesync/debian/rules
+++ b/freefilesync/debian/rules
@@ -93,3 +93,6 @@ override_dh_auto_install:
 	convert ${pkgname}/Build/Resources/${prog2name}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes/application-x-freefilesync-real.png
 
 	rm -f file_batch.png file_sync.png
+
+override_dh_fixperms:
+	chmod 0644 ${buildroot}${_datadir}/${appname}/* || :