FreeFileSync 10.9 rpm and dpkg

Application changes
* Added FTP, SFTP, Google Drive support for Linux
* FreeFileSync Donation Edition available for Linux
* Compress file stream during Google Drive upload
* Navigate beyond access-denied parents in SFTP folder picker
* Fixed unexpected stream size error during FTP upload
* Support native recursive deletion for Google Drive
* Support native recursive deletion for MTP
* Deterministically save Google Drive state during exit
* Work around missing TMPDIR variable (Linux)
* Support SFTP servers returning large package sizes during folder reading
* Start with home path when using SFTP folder picker
* Aggregate device authentication prompts during comparison
* Clean up temp file after unexpected stream size error
* Work around FTP servers not supporting HELP command
* Support parsing path by volume name when volume is missing
* Parse and streamline Google Drive error messages
* Load next item after deleting from config history
* Avoid redundant Google Drive syncs after file/folder creation
* Avoid duplicate MTP item creation by multiple threads 

Package changes
* Upstream removed Makefile install target, so each package implements basically identical, local install targets
* Added patches for older versions of dependencies which do not alter basic usage of the application

See merge request bgstack15/stackrpms!37

1 files changed, 50 insertions, 42 deletions

diff --git a/freefilesync/debian/rules b/freefilesync/debian/rules
index cc1a493..612e88e 100755
--- a/freefilesync/debian/rules
+++ b/freefilesync/debian/rules
@@ -9,7 +9,10 @@ export appname=freefilesync
 export pkgname=FreeFileSync
 export prog2name=RealTimeSync
 export debuilddir="debian"
-export debuildappdir="${debuilddir}/${appname}"
+export debuildappdir="${pkgname}"
+export buildroot="${debuilddir}/${appname}"
+export _datadir="/usr/share"
+export _bindir="/usr/bin"
 
 %:
 	dh $@
@@ -26,18 +29,23 @@ override_dh_auto_build:
 	dh_auto_build --sourcedirectory=FreeFileSync/Source/RealTimeSync
 
 override_dh_auto_install:
-	dh_auto_install
-	dh_auto_install --sourcedirectory=FreeFileSync/Source
-	dh_auto_install --sourcedirectory=FreeFileSync/Source/RealTimeSync
+	# removed by upstream!
+	#dh_auto_install
+	#dh_auto_install --sourcedirectory=FreeFileSync/Source
+	#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 ${buildroot}${_datadir}/${appname}
+	install -Dm 0644 ${debuildappdir}/Build/ding.wav ${debuildappdir}/Build/gong.wav ${debuildappdir}/Build/harp.wav ${debuildappdir}/Build/Resources.zip ${debuildappdir}/Build/styles.gtk_rc ${buildroot}${_datadir}/${appname}
 
 	# make extra sure the files are not marked with executable
 	find ${debuildappdir}/share/${pkgname} -type f -exec chmod -x '{}' \; || :
 	#find %{buildroot}%{_datadir}/%{pkgname} -type f -exec chmod -x '{}' \; || :
 
 	# desktop files
-	mkdir -p ${debuildappdir}/usr/share/applications
-	desktop-file-install --dir ${debuildappdir}/usr/share/applications ${debuilddir}/freefilesync.desktop
-	desktop-file-install --dir ${debuildappdir}/usr/share/applications ${debuilddir}/realtimesync.desktop
+	mkdir -p ${buildroot}${_datadir}/applications
+	desktop-file-install --dir ${buildroot}${_datadir}/applications ${debuilddir}/freefilesync.desktop
+	desktop-file-install --dir ${buildroot}${_datadir}/applications ${debuilddir}/realtimesync.desktop
 
 	# application start script
 	# none
@@ -50,39 +58,39 @@ override_dh_auto_install:
 
 	# icons
 	unzip ${pkgname}/Build/Resources.zip ${pkgname}.png ${prog2name}.png file_batch.png
-	mkdir -p ${debuildappdir}/usr/share/icons/hicolor/16x16/apps
-	mkdir -p ${debuildappdir}/usr/share/icons/hicolor/32x32/apps
-	mkdir -p ${debuildappdir}/usr/share/icons/hicolor/48x48/apps
-	mkdir -p ${debuildappdir}/usr/share/icons/hicolor/64x64/apps
-	mkdir -p ${debuildappdir}/usr/share/icons/hicolor/128x128/apps
-	mkdir -p ${debuildappdir}/usr/share/icons/hicolor/16x16/mimetypes
-	mkdir -p ${debuildappdir}/usr/share/icons/hicolor/32x32/mimetypes
-	mkdir -p ${debuildappdir}/usr/share/icons/hicolor/48x48/mimetypes
-	mkdir -p ${debuildappdir}/usr/share/icons/hicolor/64x64/mimetypes
-	mkdir -p ${debuildappdir}/usr/share/icons/hicolor/128x128/mimetypes
-	convert ${pkgname}.png -filter Lanczos -resize 16x16 ${debuildappdir}/usr/share/icons/hicolor/16x16/apps/${pkgname}.png
-	convert ${pkgname}.png -filter Lanczos -resize 32x32 ${debuildappdir}/usr/share/icons/hicolor/32x32/apps/${pkgname}.png
-	convert ${pkgname}.png -filter Lanczos -resize 48x48 ${debuildappdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png
-	convert ${pkgname}.png -filter Lanczos -resize 64x64 ${debuildappdir}/usr/share/icons/hicolor/64x64/apps/${pkgname}.png
-	convert ${pkgname}.png -filter Lanczos -resize 128x128 ${debuildappdir}/usr/share/icons/hicolor/128x128/apps/${pkgname}.png
-	convert ${pkgname}.png -filter Lanczos -resize 16x16 ${debuildappdir}/usr/share/icons/hicolor/16x16/mimetypes/application-x-freefilesync-ffs.png
-	convert ${pkgname}.png -filter Lanczos -resize 32x32 ${debuildappdir}/usr/share/icons/hicolor/32x32/mimetypes/application-x-freefilesync-ffs.png
-	convert ${pkgname}.png -filter Lanczos -resize 48x48 ${debuildappdir}/usr/share/icons/hicolor/48x48/mimetypes/application-x-freefilesync-ffs.png
-	convert ${pkgname}.png -filter Lanczos -resize 64x64 ${debuildappdir}/usr/share/icons/hicolor/64x64/mimetypes/application-x-freefilesync-ffs.png
-	convert ${pkgname}.png -filter Lanczos -resize 128x128 ${debuildappdir}/usr/share/icons/hicolor/128x128/mimetypes/application-x-freefilesync-ffs.png
-	convert ${prog2name}.png -filter Lanczos -resize 16x16 ${debuildappdir}/usr/share/icons/hicolor/16x16/apps/${prog2name}.png
-	convert ${prog2name}.png -filter Lanczos -resize 32x32 ${debuildappdir}/usr/share/icons/hicolor/32x32/apps/${prog2name}.png
-	convert ${prog2name}.png -filter Lanczos -resize 48x48 ${debuildappdir}/usr/share/icons/hicolor/48x48/apps/${prog2name}.png
-	convert ${prog2name}.png -filter Lanczos -resize 64x64 ${debuildappdir}/usr/share/icons/hicolor/64x64/apps/${prog2name}.png
-	convert ${prog2name}.png -filter Lanczos -resize 128x128 ${debuildappdir}/usr/share/icons/hicolor/128x128/apps/${prog2name}.png
-	convert ${prog2name}.png -filter Lanczos -resize 16x16 ${debuildappdir}/usr/share/icons/hicolor/16x16/mimetypes/application-x-freefilesync-real.png
-	convert ${prog2name}.png -filter Lanczos -resize 32x32 ${debuildappdir}/usr/share/icons/hicolor/32x32/mimetypes/application-x-freefilesync-real.png
-	convert ${prog2name}.png -filter Lanczos -resize 48x48 ${debuildappdir}/usr/share/icons/hicolor/48x48/mimetypes/application-x-freefilesync-real.png
-	convert ${prog2name}.png -filter Lanczos -resize 64x64 ${debuildappdir}/usr/share/icons/hicolor/64x64/mimetypes/application-x-freefilesync-real.png
-	convert ${prog2name}.png -filter Lanczos -resize 128x128 ${debuildappdir}/usr/share/icons/hicolor/128x128/mimetypes/application-x-freefilesync-real.png
-	convert file_batch.png -filter Lanczos -resize 16x16 ${debuildappdir}/usr/share/icons/hicolor/16x16/mimetypes/application-x-freefilesync-batch.png
-	convert file_batch.png -filter Lanczos -resize 32x32 ${debuildappdir}/usr/share/icons/hicolor/32x32/mimetypes/application-x-freefilesync-batch.png
-	convert file_batch.png -filter Lanczos -resize 48x48 ${debuildappdir}/usr/share/icons/hicolor/48x48/mimetypes/application-x-freefilesync-batch.png
-	convert file_batch.png -filter Lanczos -resize 64x64 ${debuildappdir}/usr/share/icons/hicolor/64x64/mimetypes/application-x-freefilesync-batch.png
-	convert file_batch.png -filter Lanczos -resize 128x128 ${debuildappdir}/usr/share/icons/hicolor/128x128/mimetypes/application-x-freefilesync-batch.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
+	mkdir -p ${buildroot}${_datadir}/icons/hicolor/64x64/apps
+	mkdir -p ${buildroot}${_datadir}/icons/hicolor/128x128/apps
+	mkdir -p ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes
+	mkdir -p ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes
+	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}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/apps/${pkgname}.png
+	convert ${pkgname}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/apps/${pkgname}.png
+	convert ${pkgname}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/apps/${pkgname}.png
+	convert ${pkgname}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/apps/${pkgname}.png
+	convert ${pkgname}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/apps/${pkgname}.png
+	convert ${pkgname}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes/application-x-freefilesync-ffs.png
+	convert ${pkgname}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes/application-x-freefilesync-ffs.png
+	convert ${pkgname}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes/application-x-freefilesync-ffs.png
+	convert ${pkgname}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes/application-x-freefilesync-ffs.png
+	convert ${pkgname}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes/application-x-freefilesync-ffs.png
+	convert ${prog2name}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/apps/${prog2name}.png
+	convert ${prog2name}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/apps/${prog2name}.png
+	convert ${prog2name}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/apps/${prog2name}.png
+	convert ${prog2name}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/apps/${prog2name}.png
+	convert ${prog2name}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/apps/${prog2name}.png
+	convert ${prog2name}.png -filter Lanczos -resize 16x16 ${buildroot}${_datadir}/icons/hicolor/16x16/mimetypes/application-x-freefilesync-real.png
+	convert ${prog2name}.png -filter Lanczos -resize 32x32 ${buildroot}${_datadir}/icons/hicolor/32x32/mimetypes/application-x-freefilesync-real.png
+	convert ${prog2name}.png -filter Lanczos -resize 48x48 ${buildroot}${_datadir}/icons/hicolor/48x48/mimetypes/application-x-freefilesync-real.png
+	convert ${prog2name}.png -filter Lanczos -resize 64x64 ${buildroot}${_datadir}/icons/hicolor/64x64/mimetypes/application-x-freefilesync-real.png
+	convert ${prog2name}.png -filter Lanczos -resize 128x128 ${buildroot}${_datadir}/icons/hicolor/128x128/mimetypes/application-x-freefilesync-real.png
+	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 ${pkgname}.png ${prog2name}.png file_batch.png