Update patch hunks.

diff --git a/debian/patches/0003-Use-release-version-for-Debian.patch b/debian/patches/0003-Use-release-version-for-Debian.patch
index bb614f27ced29957c0455ce418cb415b3f9f9ef1..d985e42e2ec4f1345d115adeee6b4ca3304c2f6f 100644 (file)
--- a/debian/patches/0003-Use-release-version-for-Debian.patch
+++ b/debian/patches/0003-Use-release-version-for-Debian.patch
@@ -8,12 +8,12 @@ Forwarded: not-needed
  1 file changed, 5 insertions(+)
 
 diff --git a/VERSION.cmake b/VERSION.cmake
-index b504186..68ee551 100644
+index 3fe5f77..1600bcd 100644
 --- a/VERSION.cmake
 +++ b/VERSION.cmake
-@@ -45,3 +45,8 @@ endif( MIRALL_VERSION_BUILD )
- 
- # not used anymore. For brander, please maintain craftmaster.ini
+@@ -64,3 +64,8 @@ endif()
+ # ------------------------------------
+ # Not used anymore. For brander, please maintain craftmaster.ini
  set(QT_MAJOR_VERSION 6)
 +
 +# Version from Debian changelog

diff --git a/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch b/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
index 80a8b1e78926b700c296923e49bc7ed6bf4609a9..cfdeafbc8df375cff5d53505072da14ab0d13db3 100644 (file)
--- a/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
+++ b/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
@@ -49,10 +49,10 @@ index 8f319a3..b68eb31 100644
    return 0;
  }
 diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
-index 1ada8a5..c882c9c 100644
+index ce8ef8d..e55edfa 100644
 --- a/src/libsync/discovery.cpp
 +++ b/src/libsync/discovery.cpp
-@@ -1104,10 +1104,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
+@@ -1116,10 +1116,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
          if (_queryLocal != NormalQuery && _queryServer != NormalQuery)
              recurse = false;
  
@@ -63,7 +63,7 @@ index 1ada8a5..c882c9c 100644
          if ((item->_direction == SyncFileItem::Down || item->_instruction == CSYNC_INSTRUCTION_CONFLICT || item->_instruction == CSYNC_INSTRUCTION_NEW || item->_instruction == CSYNC_INSTRUCTION_SYNC) &&
                  (item->_modtime <= 0 || item->_modtime >= 0xFFFFFFFF)) {
              item->_instruction = CSYNC_INSTRUCTION_ERROR;
-@@ -1135,13 +1131,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
+@@ -1147,13 +1143,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
              }
          }