patch cmake instructions to avoid some hacks

diff --git a/debian/changelog b/debian/changelog
index 8ad79c547d00ca4c8091e576ee877c5eb1ed7af1..6e9c38615bbbd0019e3c7e10f576708d2a32ec55 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ vym (2.9.22-1) UNRELEASED; urgency=medium
   * Delete old desktop file shipped in debian/.
   * Add desktop.patch to pass %f in the Exec setting and add keywords.
   * Add doc-base registration for the user manual.
+  * Add cmake-installs.patch to adjust documentation install folder.
 
  -- Sven Hoexter <hoexter@debian.org>  Fri, 03 May 2024 13:58:54 +0200
 

diff --git a/debian/doc-base.vym b/debian/doc-base.vym
index e55245ae9d1300b4d6bab9dd836fd63df1c43502..208b41b9fa88cb1cc06a4714a8c9a346c4ddf6fc 100644 (file)
--- a/debian/doc-base.vym
+++ b/debian/doc-base.vym
@@ -4,4 +4,4 @@ Author: Uwe Drechsel <vym@insilmaril.de>
 Section: Help
 
 Format: PDF
-Files: /usr/share/doc/vym/doc/vym.pdf
+Files: /usr/share/doc/vym/vym.pdf

diff --git a/debian/patches/cmake-installs.patch b/debian/patches/cmake-installs.patch
new file mode 100644 (file)
index 0000000..7526f60
--- /dev/null
+++ b/debian/patches/cmake-installs.patch
@@ -0,0 +1,21 @@
+Description: Install doc folder content selectively and do not install
+ the superflous license file.
+Author: Sven Hoexter <hoexter@debian.org>
+Last-Update: 2024-05-03
+Forwarded: not-needed
+Index: vym/CMakeLists.txt
+===================================================================
+--- vym.orig/CMakeLists.txt
++++ vym/CMakeLists.txt
+@@ -160,9 +160,9 @@ add_custom_target(make-translations-dire
+ add_dependencies(vym make-translations-directory)
+ 
+ install(DIRECTORY demos DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
+-install(DIRECTORY doc DESTINATION ${CMAKE_INSTALL_DOCDIR})
++install(FILES doc/vym.pdf doc/vym_fr.pdf doc/vym_es.pdf DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ 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})
+ 
+ if(UNIX)

diff --git a/debian/patches/series b/debian/patches/series
index be322c08c23acc034bb63091ae882a96e491ee4c..a54b9eda4334add75a64a1e1d79655a2a2083afb 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+cmake-installs.patch
 desktop.patch
 do-not-phone-home.patch

diff --git a/debian/rules b/debian/rules
index 5d3420530873106200703b96e1ced09a1f1b81ad..df0df7e238ccb8df74afd0ca10afd9352f1d2c76 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,10 +15,6 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
        dh_auto_install --destdir=debian/vym/
-       # remove wrongly placed manpage
-       rm debian/vym/usr/share/doc/vym/doc/vym.1.gz
-       # remove installed lincense file
-       rm debian/vym/usr/share/doc/vym/LICENSE.txt
 
 # prevent compression of pdf documentation
 override_dh_compress: