Fix Bug 374756 - Help docbook not found

FIXED-IN: 5.5.0 BUG: 374756 Thanks Burkhard Lueck to give me some potential patch
9 years ago · fa60adffbd
parent 2844fdfa3f
commit fa60adffbd
37 changed files with 4 additions and 4 deletions
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@ -1,4 +1,4 @@
-add_subdirectory(kmail)
+add_subdirectory(kmail2)
 add_subdirectory(akonadi_archivemail_agent)
 add_subdirectory(akonadi_sendlater_agent)
 add_subdirectory(akonadi_followupreminder_agent)
--- a/doc/kmail2/CMakeLists.txt
+++ b/doc/kmail2/CMakeLists.txt
@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kmail)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kmail2)
--- a/doc/kmail2/accountwizard.png
+++ b/doc/kmail2/accountwizard.png
--- a/doc/kmail2/aggregationtheme.png
+++ b/doc/kmail2/aggregationtheme.png
--- a/doc/kmail2/configure.docbook
+++ b/doc/kmail2/configure.docbook
--- a/doc/kmail2/configure.png
+++ b/doc/kmail2/configure.png
--- a/doc/kmail2/credits-and-licenses.docbook
+++ b/doc/kmail2/credits-and-licenses.docbook
--- a/doc/kmail2/faq.docbook
+++ b/doc/kmail2/faq.docbook
--- a/doc/kmail2/folder-example.png
+++ b/doc/kmail2/folder-example.png
--- a/doc/kmail2/folder-properties.png
+++ b/doc/kmail2/folder-properties.png
--- a/doc/kmail2/folderarchiveagent.png
+++ b/doc/kmail2/folderarchiveagent.png
--- a/doc/kmail2/getting-started.docbook
+++ b/doc/kmail2/getting-started.docbook
--- a/doc/kmail2/identitiesadvanced.png
+++ b/doc/kmail2/identitiesadvanced.png
--- a/doc/kmail2/identity.png
+++ b/doc/kmail2/identity.png
--- a/doc/kmail2/identitycryptography.png
+++ b/doc/kmail2/identitycryptography.png
--- a/doc/kmail2/identitygeneral.png
+++ b/doc/kmail2/identitygeneral.png
--- a/doc/kmail2/identitypicture.png
+++ b/doc/kmail2/identitypicture.png
--- a/doc/kmail2/identitysignature.png
+++ b/doc/kmail2/identitysignature.png
--- a/doc/kmail2/identitytemplate.png
+++ b/doc/kmail2/identitytemplate.png
--- a/doc/kmail2/index.docbook
+++ b/doc/kmail2/index.docbook
--- a/doc/kmail2/intro.docbook
+++ b/doc/kmail2/intro.docbook
--- a/doc/kmail2/kmailwelcome.png
+++ b/doc/kmail2/kmailwelcome.png
--- a/doc/kmail2/layout.png
+++ b/doc/kmail2/layout.png
--- a/doc/kmail2/mail-mark-important.png
+++ b/doc/kmail2/mail-mark-important.png
--- a/doc/kmail2/mail-mark-read.png
+++ b/doc/kmail2/mail-mark-read.png
--- a/doc/kmail2/mail-mark-task.png
+++ b/doc/kmail2/mail-mark-task.png
--- a/doc/kmail2/mail-mark-unread.png
+++ b/doc/kmail2/mail-mark-unread.png
--- a/doc/kmail2/mail-thread-ignored.png
+++ b/doc/kmail2/mail-thread-ignored.png
--- a/doc/kmail2/mail-thread-watch.png
+++ b/doc/kmail2/mail-thread-watch.png
--- a/doc/kmail2/menus.docbook
+++ b/doc/kmail2/menus.docbook
--- a/doc/kmail2/message.png
+++ b/doc/kmail2/message.png
--- a/doc/kmail2/messagelisttheme.png
+++ b/doc/kmail2/messagelisttheme.png
--- a/doc/kmail2/smile.png
+++ b/doc/kmail2/smile.png
--- a/doc/kmail2/troubleshooting.docbook
+++ b/doc/kmail2/troubleshooting.docbook
--- a/doc/kmail2/using-kmail.docbook
+++ b/doc/kmail2/using-kmail.docbook
--- a/src/data/org.kde.kmail.appdata.xml
+++ b/src/data/org.kde.kmail.appdata.xml
@ -851,7 +851,7 @@
    </ul>
  </description>
  <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=kmail</url>
-  <url type="help">http://docs.kde.org/stable/en/kdepim/kmail/index.html</url>
+  <url type="help">http://docs.kde.org/stable/en/kdepim/kmail2/index.html</url>
  <screenshots>
    <screenshot type="default">
      <image>http://kde.org/images/screenshots/kmail.png</image>
--- a/src/data/org.kde.kmail.desktop
+++ b/src/data/org.kde.kmail.desktop
@ -76,7 +76,7 @@ Name[zh_TW]=郵件管理_KMail
 Type=Application
 Exec=kmail -qwindowtitle %c %u
 Icon=kmail
-X-DocPath=kmail/index.html
+X-DocPath=kmail2/index.html
 GenericName=Mail Client
 GenericName[af]=E-pos kliënt
 GenericName[ar]=عميل البريد