freefilesync 10.13 dpkg rc1

7 files changed, 74 insertions, 73 deletions

diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index 8fab084..c3a0c6b 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,23 @@
+freefilesync (10.13-1+devuan) manual; urgency=low
+
+  * Allow to rename configurations via context menu
+  * Work around hang on SMB network with broken FileFullDirectoryInformation
+  * Work around SMB share returning empty item name
+  * Detect and preempt keyman64.dll crash on exit
+  * Manage notification sounds via global options dialog
+  * Support 32-bit Debian Jessie and later releases
+  * Work around silent failure to case-only rename on FAT drives (Windows 10)
+  * Simplified installation folder structure
+  * Update main grid scrollbars when resizing columns on other side
+  * Preserve input focus when clicking on grid column label
+  * Buffer result of process path normalization
+  * Mirror middle grid icons for RTL layout (Linux)
+  * Force LTR layout until wxWidgets supports RTL (macOS)
+  * Fixed pair scrolling mismatch when grid height is exceeded by one row
+  * Fixed startup failure due to missing /etc/machine-id (Linux) 
+
+ -- B Stack <bgstack15@gmail.com>  Sat, 15 Jun 2019 10:40:49 -0400
+
 freefilesync (10.12-1+devuan) manual; urgency=low
 
   * Show sync start time and date in progress dialog title
diff --git a/freefilesync/debian/freefilesync.desktop b/freefilesync/debian/freefilesync.desktop
deleted file mode 100644
index 0f272d1..0000000
--- a/freefilesync/debian/freefilesync.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=FreeFileSync
-Comment=Keep files and folders synchronized
-Exec=FreeFileSync %f
-Terminal=false
-Type=Application
-Icon=FreeFileSync
-MimeType=application/x-freefilesync-ffs;application/x-freefilesync-batch
-Categories=Utility;FileTools;GTK;
-StartupWMClass=FreeFileSync
-StartupNotify=true
diff --git a/freefilesync/debian/freefilesync.install b/freefilesync/debian/freefilesync.install
index 42a8eb1..b857502 100644
--- a/freefilesync/debian/freefilesync.install
+++ b/freefilesync/debian/freefilesync.install
@@ -1,2 +1,2 @@
-debian/freefilesync.desktop /usr/share/applications
-debian/realtimesync.desktop /usr/share/applications
+debian/FreeFileSync.desktop /usr/share/applications
+debian/RealTimeSync.desktop /usr/share/applications
diff --git a/freefilesync/debian/patches/ffs_devuan.patch b/freefilesync/debian/patches/ffs_devuan.patch
index 977fa2b..b757e8b 100644
--- a/freefilesync/debian/patches/ffs_devuan.patch
+++ b/freefilesync/debian/patches/ffs_devuan.patch
@@ -1,15 +1,16 @@
-diff -Naur -x '*.orig' -x '*.rej' 10.11-0/FreeFileSync/Source/base/ffs_paths.cpp 10.11-1/FreeFileSync/Source/base/ffs_paths.cpp
---- 10.11-0/FreeFileSync/Source/base/ffs_paths.cpp	2019-04-12 08:05:57.000000000 -0400
-+++ 10.11-1/FreeFileSync/Source/base/ffs_paths.cpp	2019-04-12 13:58:55.050550183 -0400
-@@ -59,7 +59,7 @@
-     ZEN_ON_SCOPE_EXIT(wxTheApp->SetAppName(appName));
- 
-     //if (isPortableVersion())
--    return appendSeparator(getExeFolderParentPath());
-+    return appendSeparator("/usr") + appendSeparator("share") + appendSeparator("freefilesync");
-     //else //use OS' standard paths
-     //    return appendSeparator(utfTo<Zstring>(wxStandardPathsBase::Get().GetResourcesDir()));
+diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-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.13-1/FreeFileSync/Source/base/ffs_paths.cpp	2019-06-14 20:36:28.178274292 -0400
+@@ -55,7 +55,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 -Naur -x '*.orig' -x '*.rej' 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Makefile
 --- 10.11-0/FreeFileSync/Source/Makefile	2019-04-12 08:05:57.000000000 -0400
 +++ 10.11-1/FreeFileSync/Source/Makefile	2019-04-12 14:00:16.774552362 -0400
diff --git a/freefilesync/debian/patches/ffs_no_wx311.patch b/freefilesync/debian/patches/ffs_no_wx311.patch
index 871e083..a1ff0e4 100644
--- a/freefilesync/debian/patches/ffs_no_wx311.patch
+++ b/freefilesync/debian/patches/ffs_no_wx311.patch
@@ -25,20 +25,18 @@ diff -Naur -x '*.orig' -x '*.rej' 10.3-0/wx+/grid.cpp 10.3-2/wx+/grid.cpp
                      toScroll += scrollSpeed * deltaSecs;
                  }
                  else
-diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp
---- 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp	2018-11-13 06:58:40.771249592 -0500
-+++ 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp	2018-11-14 21:39:14.715702415 -0500
-@@ -85,8 +85,11 @@
-     else //OS standard path (XDG layout): ~/.config/FreeFileSync
-     {
-         //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag
--        wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
--        cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync";
-+
-+        // Fedora 28 does not have wxGTK 3.1.1 yet.
-+        // So subsitute a hard-coded name instead of requesting file layout of XDG
-+        //wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
-+        cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".config")) + "FreeFileSync";
-     }
+diff -Naur 10.13-0/FreeFileSync/Source/base/ffs_paths.cpp 10.13-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.13-1/FreeFileSync/Source/base/ffs_paths.cpp	2019-06-14 20:26:56.794422701 -0400
+@@ -75,8 +75,9 @@
+     Zstring cfgFolderPath;
+     //OS standard path (XDG layout): ~/.config/FreeFileSync
+     //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag
+-    wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
+-    cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync";
++    // Fedora does not have wxGTK 3.1.1 which is the dev branch.
++    //wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
++    cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".config")) + "FreeFileSync";
+ 
  
      std::call_once(onceFlagCreateCfgPath, [&]
diff --git a/freefilesync/debian/realtimesync.desktop b/freefilesync/debian/realtimesync.desktop
deleted file mode 100644
index 4bc586f..0000000
--- a/freefilesync/debian/realtimesync.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=RealtimeSync
-Comment=Start synchronization in real time
-Exec=RealTimeSync %f
-Terminal=false
-Type=Application
-Icon=RealTimeSync
-Categories=Utility;FileTools;GTK;
-MimeType=application/x-freefilesync-real
-StartupNotify=true
diff --git a/freefilesync/debian/rules b/freefilesync/debian/rules
index 6feb0f5..6ebd427 100755
--- a/freefilesync/debian/rules
+++ b/freefilesync/debian/rules
@@ -35,13 +35,13 @@ override_dh_auto_install:
 	#dh_auto_install --sourcedirectory=FreeFileSync/Source/RealTimeSync
 	install -d ${buildroot}${_bindir} ${buildroot}${_datadir}/${appname}
 	install -Dm 0755 -t ${buildroot}${_bindir} ${debuildappdir}/Build/Bin/${pkgname} ${debuildappdir}/Build/Bin/${prog2name}
-	cp -pr ${debuildappdir}/Build/Languages ${debuildappdir}/Build/Misc ${buildroot}${_datadir}/${appname}
+	cp -pr ${debuildappdir}/Build/Resources/* ${buildroot}${_datadir}/${appname}
 
 	# make extra sure the files are not marked with executable
 	find ${debuildappdir}/share/${pkgname} -type f -exec chmod -x '{}' \; || :
 
 	# desktop files
-	:
+	# handled by dpkg already
 
 	# application start script
 	# none
@@ -53,7 +53,7 @@ override_dh_auto_install:
 	# handled by dpkg already
 
 	# icons
-	unzip ${pkgname}/Build/Misc/Icons.zip file_batch.png
+	unzip ${pkgname}/Build/Resources/Icons.zip file_batch.png file_sync.png
 	mkdir -p ${buildroot}${_datadir}/icons/hicolor/16x16/apps
 	mkdir -p ${buildroot}${_datadir}/icons/hicolor/32x32/apps
 	mkdir -p ${buildroot}${_datadir}/icons/hicolor/48x48/apps
@@ -64,29 +64,32 @@ override_dh_auto_install:
 	mkdir -p ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes
 	mkdir -p ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes
 	mkdir -p ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes
-	convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/apps/${pkgname}.png
-	convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/apps/${pkgname}.png
-	convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/apps/${pkgname}.png
-	convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/apps/${pkgname}.png
-	convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/apps/${pkgname}.png
-	convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes/application-x-freefilesync-ffs.png
-	convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes/application-x-freefilesync-ffs.png
-	convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes/application-x-freefilesync-ffs.png
-	convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes/application-x-freefilesync-ffs.png
-	convert ${pkgname}/Build/Misc/${pkgname}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes/application-x-freefilesync-ffs.png
-	convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/apps/${prog2name}.png
-	convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/apps/${prog2name}.png
-	convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/apps/${prog2name}.png
-	convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/apps/${prog2name}.png
-	convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/apps/${prog2name}.png
-	convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes/application-x-freefilesync-real.png
-	convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes/application-x-freefilesync-real.png
-	convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes/application-x-freefilesync-real.png
-	convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes/application-x-freefilesync-real.png
-	convert ${pkgname}/Build/Misc/${prog2name}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes/application-x-freefilesync-real.png
+	# apps
+	convert ${pkgname}/Build/Resources/${pkgname}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/apps/${pkgname}.png
+	convert ${pkgname}/Build/Resources/${pkgname}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/apps/${pkgname}.png
+	convert ${pkgname}/Build/Resources/${pkgname}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/apps/${pkgname}.png
+	convert ${pkgname}/Build/Resources/${pkgname}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/apps/${pkgname}.png
+	convert ${pkgname}/Build/Resources/${pkgname}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/apps/${pkgname}.png
+	convert ${pkgname}/Build/Resources/${prog2name}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/apps/${prog2name}.png
+	convert ${pkgname}/Build/Resources/${prog2name}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/apps/${prog2name}.png
+	convert ${pkgname}/Build/Resources/${prog2name}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/apps/${prog2name}.png
+	convert ${pkgname}/Build/Resources/${prog2name}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/apps/${prog2name}.png
+	convert ${pkgname}/Build/Resources/${prog2name}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/apps/${prog2name}.png
+	# mimetypes
 	convert file_batch.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes/application-x-freefilesync-batch.png
 	convert file_batch.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes/application-x-freefilesync-batch.png
 	convert file_batch.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes/application-x-freefilesync-batch.png
 	convert file_batch.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes/application-x-freefilesync-batch.png
 	convert file_batch.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes/application-x-freefilesync-batch.png
-	rm -f file_batch.png
+	convert file_sync.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes/application-x-freefilesync-ffs.png
+	convert file_sync.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes/application-x-freefilesync-ffs.png
+	convert file_sync.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes/application-x-freefilesync-ffs.png
+	convert file_sync.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes/application-x-freefilesync-ffs.png
+	convert file_sync.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes/application-x-freefilesync-ffs.png
+	convert ${pkgname}/Build/Resources/${prog2name}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes/application-x-freefilesync-real.png
+	convert ${pkgname}/Build/Resources/${prog2name}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes/application-x-freefilesync-real.png
+	convert ${pkgname}/Build/Resources/${prog2name}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes/application-x-freefilesync-real.png
+	convert ${pkgname}/Build/Resources/${prog2name}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes/application-x-freefilesync-real.png
+	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