From: Sven Hoexter <sven@stormbind.net>
Date: Fri, 3 May 2024 19:30:56 +0000 (+0200)
Subject: patch cmake instructions to avoid some hacks
X-Git-Tag: debian/2.9.27-1~15
X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=2b007ca08b99b2910406f219ee760a38c124d8a7;p=sven%2Fvym.git

patch cmake instructions to avoid some hacks
---

diff --git a/debian/changelog b/debian/changelog
index 8ad79c5..6e9c386 100644
--- 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 e55245a..208b41b 100644
--- 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
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 be322c0..a54b9ed 100644
--- 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 5d34205..df0df7e 100755
--- 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: