Refresh all patches.

diff --git a/debian/changelog b/debian/changelog
index 0d49de3b0aa8a81e0cf37baf1fedf4b579cbe3ae..d3995d56eab97db1b5faf2d65b97f281fd66d9a0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ vym (2.9.604-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot of vym 3.
     Upstream commit e00fe254a6ff6db1cface0645cbb1769a302bbef, branch develop.
+  * Refresh all patches.
   * Update to Standards-Version 4.7.3, remove the Priority field.
 
  -- Sven Hoexter <hoexter@debian.org>  Thu, 22 Jan 2026 11:57:55 +0100

diff --git a/debian/patches/cmake-installs.patch b/debian/patches/cmake-installs.patch
index 90961a1eb5fff1d48a08a97840046715b1072cf7..54a6100b5a5b3e791c78371896b275418f1df065 100644 (file)
--- a/debian/patches/cmake-installs.patch
+++ b/debian/patches/cmake-installs.patch
@@ -7,20 +7,20 @@ Index: vym/CMakeLists.txt
 ===================================================================
 --- vym.orig/CMakeLists.txt
 +++ vym/CMakeLists.txt
-@@ -208,16 +208,17 @@ add_custom_target(make-translations-dire
- add_dependencies(vym make-translations-directory)
+@@ -238,16 +238,18 @@ message(STATUS "vym: CMAKE_INSTALL_DATAR
  
- install(DIRECTORY demos DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
+ 
+ install(DIRECTORY demos DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${VYM_SHARE_SUBDIR})
 -install(DIRECTORY doc DESTINATION ${CMAKE_INSTALL_DOCDIR} FILES_MATCHING PATTERN "*.pdf")
 +install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR} FILES_MATCHING PATTERN "*.pdf")
  install(FILES doc/vym.1.gz DESTINATION ${CMAKE_INSTALL_MANDIR})
 -install(FILES README.md LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
 +install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
- install(DIRECTORY exports flags icons macros ${CMAKE_BINARY_DIR}/translations scripts styles DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
+ install(DIRECTORY exports flags icons macros ${CMAKE_BINARY_DIR}/translations scripts styles DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${VYM_SHARE_SUBDIR})
  
  if(UNIX)
      install(FILES icons/vym.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps)
--    # Disabling PR #109 for now:
+     # Disabling PR #109 for now:    # FIXME
 -    # file(CREATE_LINK ../apps/vym.png application-x-vym.png SYMBOLIC)
 -    # install(FILES ${CMAKE_BINARY_DIR}/application-x-vym.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/mimetypes)
 +    # Debian special, install icons and hicolor theme links

diff --git a/debian/patches/do-not-phone-home.patch b/debian/patches/do-not-phone-home.patch
index bfc3d8bca16f66ddab9c7a7ec688400b95bd3b82..39c27bb198cd03d7b15db4dca7a089e85cbd64b3 100644 (file)
--- a/debian/patches/do-not-phone-home.patch
+++ b/debian/patches/do-not-phone-home.patch
@@ -6,7 +6,7 @@ Index: vym/src/mainwindow.cpp
 ===================================================================
 --- vym.orig/src/mainwindow.cpp
 +++ vym/src/mainwindow.cpp
-@@ -7926,6 +7926,7 @@ void Main::checkReleaseNotes ()
+@@ -8096,6 +8096,7 @@ void Main::checkReleaseNotes ()
  
  bool Main::downloadsEnabled(bool userTriggered)
  {