summaryrefslogtreecommitdiff
path: root/freefilesync/debian
diff options
context:
space:
mode:
Diffstat (limited to 'freefilesync/debian')
-rw-r--r--freefilesync/debian/_service2
-rw-r--r--freefilesync/debian/changelog13
-rw-r--r--freefilesync/debian/freefilesync+stackrpms.dsc2
-rw-r--r--freefilesync/debian/patches/ffs_no_check_updates.patch23
4 files changed, 27 insertions, 13 deletions
diff --git a/freefilesync/debian/_service b/freefilesync/debian/_service
index ffad214..1f8f514 100644
--- a/freefilesync/debian/_service
+++ b/freefilesync/debian/_service
@@ -14,7 +14,7 @@
<service name="tar_scm">
<param name="scm">git</param>
<param name="url">https://gitlab.com/opensource-tracking/FreeFileSync.git</param>
- <param name="revision">13.8</param>
+ <param name="revision">13.9</param>
<param name="version">_none_</param>
</service>
<service name="recompress">
diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog
index 9572414..148ef03 100644
--- a/freefilesync/debian/changelog
+++ b/freefilesync/debian/changelog
@@ -1,3 +1,16 @@
+freefilesync (13.9-100+stackrpms) obs; urgency=low
+
+ * Upstream updates
+ * Fixed CURLE_SEND_ERROR: OpenSSL SSL_write: SSL_ERROR_SYSCALL, errno 0
+ * Added comparison and sync context menu options for multiple folder
+ pairs
+ * Show file include/exclude filter directly in tooltip
+ * Fixed file not found error when cancelling file up-/download
+ * Fixed showing cancelled config log status after nothing to sync
+ * Updated translation files
+
+ -- B. Stack <bgstack15@gmail.com> Sun, 08 Dec 2024 08:09:07 -0500
+
freefilesync (13.8-100+stackrpms) obs; urgency=low
* Upstream updates
diff --git a/freefilesync/debian/freefilesync+stackrpms.dsc b/freefilesync/debian/freefilesync+stackrpms.dsc
index bf3cb5f..b76b364 100644
--- a/freefilesync/debian/freefilesync+stackrpms.dsc
+++ b/freefilesync/debian/freefilesync+stackrpms.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
Source: freefilesync
Binary: freefilesync
Architecture: any
-Version: 13.8-100+stackrpms
+Version: 13.9-100+stackrpms
Maintainer: B. Stack <bgstack15@gmail.com>
Homepage: https://freefilesync.org/
Standards-Version: 4.1.4
diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch
index 3fc79ca..f312a97 100644
--- a/freefilesync/debian/patches/ffs_no_check_updates.patch
+++ b/freefilesync/debian/patches/ffs_no_check_updates.patch
@@ -62,7 +62,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
#include "gui_status_handler.h"
#include "small_dlgs.h"
#include "rename_dlg.h"
-@@ -619,7 +618,7 @@ void MainDialog::create(const Zstring& g
+@@ -598,7 +597,7 @@ void MainDialog::create(const Zstring& g
//showAboutDialog(mainDlg); => dialog centered incorrectly (Centos)
//mainDlg->CallAfter([mainDlg] { showAboutDialog(mainDlg); }); => dialog centered incorrectly (Windows, Centos)
@@ -71,7 +71,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
}
-@@ -1012,7 +1011,6 @@ imgFileManagerSmall_([]
+@@ -991,7 +990,6 @@ imgFileManagerSmall_([]
setImage(*m_menuItemHelp, loadImage("help", dipToScreen(getMenuIconDipSize())));
setImage(*m_menuItemAbout, loadImage("about", dipToScreen(getMenuIconDipSize())));
@@ -79,7 +79,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
fixMenuIcons(*m_menuFile);
fixMenuIcons(*m_menuActions);
-@@ -1112,9 +1110,6 @@ imgFileManagerSmall_([]
+@@ -1091,9 +1089,6 @@ imgFileManagerSmall_([]
//mainly to update row label sizes...
updateGui();
@@ -89,10 +89,11 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
//asynchronous call to wxWindow::Dimensions(): fix superfluous frame on right and bottom when FFS is started in fullscreen mode
Bind(wxEVT_IDLE, &MainDialog::onLayoutWindowAsync, this);
wxCommandEvent evtDummy; //call once before onLayoutWindowAsync()
-@@ -6343,56 +6338,6 @@ void MainDialog::onMenuExportFileList(wx
+@@ -6335,57 +6330,6 @@ void MainDialog::onMenuExportFileList(wx
+ }
}
-
+-
-void MainDialog::onMenuCheckVersion(wxCommandEvent& event)
-{
- checkForUpdateNow(*this, globalCfg_.lastOnlineVersion);
@@ -122,7 +123,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
-
- if (automaticUpdateCheckDue(globalCfg_.lastUpdateCheck))
- {
-- flashStatusInfo(_("Searching for program updates..."));
+- flashStatusInfo(_("Searching for software updates..."));
-
- guiQueue_.processAsync([resultPrep = automaticUpdateCheckPrepare(*this) /*prepare on main thread*/]
- { return automaticUpdateCheckRunAsync(resultPrep.ref()); }, //run on worker thread: (long-running part of the check)
@@ -135,7 +136,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
- showNewVersionReminder();
-
- if (globalCfg_.lastUpdateCheck == lastUpdateCheckOld)
-- flashStatusInfo(_("Update check failed!"));
+- flashStatusInfo(_("Software update check failed!"));
- });
- }
- else
@@ -192,7 +193,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
+ return trimCpy(response);
if (response.empty() ||
- !std::all_of(response.begin(), response.end(), [](char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) ||
+ !std::all_of(response.begin(), response.end(), [](const char c) { return isDigit(c) || c == FFS_VERSION_SEPARATOR; }) ||
@@ -205,58 +197,6 @@ bool fff::haveNewerVersionOnline(const s
}
@@ -209,7 +210,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
- else
- showNotificationDialog(&parent, DialogInfoType::info, PopupDialogCfg().
- setIcon(loadImage("update_check")).
-- setTitle(_("Check for Program Updates")).
+- setTitle(_("Check for Software Updates")).
- setMainInstructions(_("FreeFileSync is up-to-date.")));
- }
- catch (const SysError& e)
@@ -219,7 +220,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
- lastOnlineVersion = getUnknownVersionTag();
-
- switch (showConfirmationDialog(&parent, DialogInfoType::error, PopupDialogCfg().
-- setTitle(_("Check for Program Updates")).
+- setTitle(_("Check for Software Updates")).
- setMainInstructions(_("Cannot find current FreeFileSync version number online. A newer version is likely available. Check manually now?")).
- setDetailInstructions(e.toString()), _("&Check"), _("&Retry")))
- {
@@ -235,7 +236,7 @@ Message: This is a major rewrite of the ffs_no_check_updates patch from before 1
- }
- else
- switch (showConfirmationDialog(&parent, DialogInfoType::error, PopupDialogCfg().
-- setTitle(_("Check for Program Updates")).
+- setTitle(_("Check for Software Updates")).
- setMainInstructions(replaceCpy(_("Unable to connect to %x."), L"%x", L"freefilesync.org")).
- setDetailInstructions(e.toString()), _("&Retry")))
- {
bgstack15