Refresh all patches

* Remove pro-file.patch
* Refresh do-not-home-phone.patch

diff --git a/debian/changelog b/debian/changelog
index 728a1a86c6045cf2761549096cfe9372ef3d1135..15a4a6b495455b3e6cfd7c9725658c85e8633e88 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ vym (2.9.22-1) UNRELEASED; urgency=medium
   * New upstream release
   * Add myself as Uploader
   * Replace cdbs by debhelper as the Debian build helper.
+  * Refresh pro-file.patch
+  * Refresh do-not-home-phone.patch
 
  -- Sven Hoexter <hoexter@debian.org>  Fri, 03 May 2024 13:58:54 +0200
 

diff --git a/debian/patches/do-not-phone-home.patch b/debian/patches/do-not-phone-home.patch
index 7cebfe4c619016c731b8d42db46a598ca3bdff1a..3f795754485bb61269779fdca5ac29d6e5f3a4b1 100644 (file)
--- a/debian/patches/do-not-phone-home.patch
+++ b/debian/patches/do-not-phone-home.patch
@@ -1,12 +1,16 @@
-Index: vym/mainwindow.cpp
+Description: Disable build-in auto-updater.
+Author: Sven Hoexter <hoexter@debian.org>
+Last-Update: 2024-05-03
+Forwarded: not-needed
+Index: vym/src/mainwindow.cpp
 ===================================================================
---- vym.orig/mainwindow.cpp
-+++ vym/mainwindow.cpp
-@@ -5995,6 +5995,7 @@ void Main::checkReleaseNotes()
+--- vym.orig/src/mainwindow.cpp
++++ vym/src/mainwindow.cpp
+@@ -7259,6 +7259,7 @@ void Main::checkReleaseNotes ()
  
- bool Main::downloadsEnabled (bool userTriggered)
+ bool Main::downloadsEnabled(bool userTriggered)
  {
 +    return false;
      bool result;
-     if (!userTriggered && settings.value("/downloads/enabled", false).toBool())
-     {
+     if (!userTriggered &&
+         settings.value("/downloads/enabled", false).toBool()) {

diff --git a/debian/patches/pro-file.patch b/debian/patches/pro-file.patch
deleted file mode 100644 (file)
index 217b8f7..0000000
--- a/debian/patches/pro-file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: vym/vym.pro
-===================================================================
---- vym.orig/vym.pro
-+++ vym/vym.pro
-@@ -258,7 +258,7 @@ FORMS = \
-     warningdialog.ui \
- 
- isEmpty( PREFIX ) {
--    PREFIX = /usr/local
-+    PREFIX = /usr
-     count( INSTALLDIR, 1 ) {
-       PREFIX = $${INSTALLDIR}
-       message( "Please use PREFIX instead of INSTALLDIR" )

diff --git a/debian/patches/series b/debian/patches/series
index 884539a1dae4cddfb8759e2bffd98fb6470a9a2d..918912878ed8a374b3469e3c799aec0644a4ac5f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-pro-file.patch
 do-not-phone-home.patch