From c03c6cb875b25a202e4c902ee0bcb32c8c31dd71 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Thu, 22 Jan 2026 12:07:53 +0100 Subject: [PATCH] Refresh all patches. --- debian/changelog | 1 + debian/patches/cmake-installs.patch | 10 +++++----- debian/patches/do-not-phone-home.patch | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d49de3..d3995d5 100644 --- 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 Thu, 22 Jan 2026 11:57:55 +0100 diff --git a/debian/patches/cmake-installs.patch b/debian/patches/cmake-installs.patch index 90961a1..54a6100 100644 --- 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 bfc3d8b..39c27bb 100644 --- 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) { -- 2.47.3