Git commit 392e73841d2e108ed8d995271c54a42c6c397de1 by Montel Laurent. Committed on 06/05/2014 at 06:10. Pushed by mlaurent into branch 'frameworks'.
Move to DocBookXML 4.5 M +1 -1 CMakeLists.txt M +2 -2 doc/akonadi_archivemail_agent/index.docbook M +2 -2 doc/akonadi_notes_agent/index.docbook M +2 -2 doc/akonadi_sendlater_agent/index.docbook M +1 -1 doc/akregator/index.docbook M +2 -2 doc/blogilo/index.docbook M +2 -2 doc/contactthemeeditor/index.docbook M +2 -2 doc/headerthemeeditor/index.docbook M +2 -2 doc/importwizard/index.docbook M +2 -2 doc/kabcclient/index.docbook M +1 -1 doc/kabcclient/man-kabcclient.1.docbook M +1 -1 doc/kalarm/index.docbook M +2 -2 doc/kioslave/news/index.docbook M +1 -1 doc/kjots/index.docbook M +1 -1 doc/kleopatra/index.docbook M +1 -1 doc/kmail/index.docbook M +2 -2 doc/kmailcvt/index.docbook M +1 -1 doc/knotes/index.docbook M +2 -2 doc/konsolekalendar/index.docbook M +2 -2 doc/kontact-admin/index.docbook M +2 -2 doc/kontact/index.docbook M +2 -2 doc/korganizer/index.docbook M +1 -1 doc/ktnef/index.docbook M +1 -1 doc/kwatchgnupg/index.docbook M +2 -2 doc/pimsettingexporter/index.docbook M +2 -2 doc/sieveeditor/index.docbook http://commits.kde.org/kdepim/392e73841d2e108ed8d995271c54a42c6c397de1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 438978e..f11df90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -265,7 +265,7 @@ if(KDEPIM_BUILD_DESKTOP) add_subdirectory(kjots) - add_subdirectory(kontact) # must be the last one. + add_subdirectory(kontact) endif() add_subdirectory(akonadiconsole) diff --git a/doc/akonadi_archivemail_agent/index.docbook b/doc/akonadi_archivemail_agent/index.docbook index f9c3da8..2cb270d 100644 --- a/doc/akonadi_archivemail_agent/index.docbook +++ b/doc/akonadi_archivemail_agent/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!ENTITY i18n-archivemailagent "<application>Archive Mail Agent</application>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> diff --git a/doc/akonadi_notes_agent/index.docbook b/doc/akonadi_notes_agent/index.docbook index d02954f..d610ea4 100644 --- a/doc/akonadi_notes_agent/index.docbook +++ b/doc/akonadi_notes_agent/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!ENTITY i18n-notesagent "<application>Notes Agent</application>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> diff --git a/doc/akonadi_sendlater_agent/index.docbook b/doc/akonadi_sendlater_agent/index.docbook index 6b489e6..e0f8447 100644 --- a/doc/akonadi_sendlater_agent/index.docbook +++ b/doc/akonadi_sendlater_agent/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!ENTITY i18n-sendlateragent "<application>Send Later Agent</application>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> diff --git a/doc/akregator/index.docbook b/doc/akregator/index.docbook index 65862c4..f34a8ce 100644 --- a/doc/akregator/index.docbook +++ b/doc/akregator/index.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY akregator "<application>Akregator</application>"> <!ENTITY kappname "&akregator;"> <!ENTITY package "kdepim"> diff --git a/doc/blogilo/index.docbook b/doc/blogilo/index.docbook index 3f50517..e85a78b 100644 --- a/doc/blogilo/index.docbook +++ b/doc/blogilo/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!-- Define an entity for your application if it is not part of KDE CVS --> <!ENTITY kapplication "<application>Blogilo</application>"> diff --git a/doc/contactthemeeditor/index.docbook b/doc/contactthemeeditor/index.docbook index 98360ba..2fd822d 100644 --- a/doc/contactthemeeditor/index.docbook +++ b/doc/contactthemeeditor/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!-- Define an entity for your application if it is not part of KDE CVS --> <!ENTITY kapplication "<application>contactthemeeditor</application>"> diff --git a/doc/headerthemeeditor/index.docbook b/doc/headerthemeeditor/index.docbook index 187e014..ee430bb 100644 --- a/doc/headerthemeeditor/index.docbook +++ b/doc/headerthemeeditor/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!-- Define an entity for your application if it is not part of KDE CVS --> <!ENTITY kapplication "<application>headerthemeeditor</application>"> diff --git a/doc/importwizard/index.docbook b/doc/importwizard/index.docbook index 5316e6d..9d11a6d 100644 --- a/doc/importwizard/index.docbook +++ b/doc/importwizard/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!ENTITY i18n-importwizard "<application>Import Wizard</application>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"> diff --git a/doc/kabcclient/index.docbook b/doc/kabcclient/index.docbook index b3370e5..9f486d6 100644 --- a/doc/kabcclient/index.docbook +++ b/doc/kabcclient/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!ENTITY kabcclient "<application>KABC-Client</application>"> <!ENTITY kappname "KABCClient"> diff --git a/doc/kabcclient/man-kabcclient.1.docbook b/doc/kabcclient/man-kabcclient.1.docbook index eb6faa5..295e819 100644 --- a/doc/kabcclient/man-kabcclient.1.docbook +++ b/doc/kabcclient/man-kabcclient.1.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"><!-- change language only here --> ]> diff --git a/doc/kalarm/index.docbook b/doc/kalarm/index.docbook index 97f9d9f..6ba6c47 100644 --- a/doc/kalarm/index.docbook +++ b/doc/kalarm/index.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&kalarm;"> <!ENTITY package "kdepim"> <!ENTITY % addindex "IGNORE"> diff --git a/doc/kioslave/news/index.docbook b/doc/kioslave/news/index.docbook index 92ca9cf..8f0a54d 100644 --- a/doc/kioslave/news/index.docbook +++ b/doc/kioslave/news/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> ]> diff --git a/doc/kjots/index.docbook b/doc/kjots/index.docbook index 30f0949..ab70a45 100644 --- a/doc/kjots/index.docbook +++ b/doc/kjots/index.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!-- nothing below must be removed --> <!ENTITY kappname "&kjots;"> <!ENTITY package "kdepim"> diff --git a/doc/kleopatra/index.docbook b/doc/kleopatra/index.docbook index 95d93fa..09c9314 100644 --- a/doc/kleopatra/index.docbook +++ b/doc/kleopatra/index.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kleopatra "<application>Kleopatra</application>"> <!ENTITY uiserver "UiServer"> <!ENTITY kwatchgnupg "<application>KWatchGnuPG</application>"> diff --git a/doc/kmail/index.docbook b/doc/kmail/index.docbook index 9a40c73..a12b2aa 100644 --- a/doc/kmail/index.docbook +++ b/doc/kmail/index.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&kmail;"> <!ENTITY package "kdepim"> <!ENTITY kmail-intro SYSTEM "intro.docbook"> diff --git a/doc/kmailcvt/index.docbook b/doc/kmailcvt/index.docbook index 780c025..4334212 100644 --- a/doc/kmailcvt/index.docbook +++ b/doc/kmailcvt/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!ENTITY i18n-kmailcvt "<application>KMailCVT</application>"> <!ENTITY % addindex "IGNORE"> diff --git a/doc/knotes/index.docbook b/doc/knotes/index.docbook index c5c1607..a9e9130 100644 --- a/doc/knotes/index.docbook +++ b/doc/knotes/index.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&knotes;"> <!ENTITY package "kdepim"> <!ENTITY % addindex "IGNORE"> diff --git a/doc/konsolekalendar/index.docbook b/doc/konsolekalendar/index.docbook index 443b291..56d7734 100644 --- a/doc/konsolekalendar/index.docbook +++ b/doc/konsolekalendar/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!ENTITY konsolekalendar "<application>KonsoleKalendar</application>"> <!ENTITY kappname "KonsoleKalendar"> diff --git a/doc/kontact-admin/index.docbook b/doc/kontact-admin/index.docbook index 1eee773..dd21a2c 100644 --- a/doc/kontact-admin/index.docbook +++ b/doc/kontact-admin/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" - "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" + "dtd/kdedbx45.dtd" [ <!ENTITY PIM "<acronym>PIM</acronym>"> <!ENTITY kappname "&kontact;"> <!ENTITY package "kdepim"> diff --git a/doc/kontact/index.docbook b/doc/kontact/index.docbook index 2faaa8c..843d7c2 100644 --- a/doc/kontact/index.docbook +++ b/doc/kontact/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" - "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" + "dtd/kdedbx45.dtd" [ <!ENTITY PIM "<acronym>PIM</acronym>"> <!ENTITY kappname "&kontact;"> <!ENTITY package "kdepim"> diff --git a/doc/korganizer/index.docbook b/doc/korganizer/index.docbook index 300c4d6..7dcf2ce 100644 --- a/doc/korganizer/index.docbook +++ b/doc/korganizer/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" - "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" + "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&korganizer;"> <!ENTITY package "kdepim"> <!ENTITY % addindex "IGNORE"> diff --git a/doc/ktnef/index.docbook b/doc/ktnef/index.docbook index 4aaec52..008e8ed 100644 --- a/doc/ktnef/index.docbook +++ b/doc/ktnef/index.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&ktnef;"> <!ENTITY package "kdepim"> <!ENTITY % addindex "IGNORE"> diff --git a/doc/kwatchgnupg/index.docbook b/doc/kwatchgnupg/index.docbook index 3a670b9..6e7986a 100644 --- a/doc/kwatchgnupg/index.docbook +++ b/doc/kwatchgnupg/index.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY gnupg "<acronym>GnuPG</acronym>"> <!ENTITY gpgconf "<application>GPGConf</application>"> <!ENTITY watchgnupg "<application>WatchGnuPG</application>"> diff --git a/doc/pimsettingexporter/index.docbook b/doc/pimsettingexporter/index.docbook index 9b3c075..a52159a 100644 --- a/doc/pimsettingexporter/index.docbook +++ b/doc/pimsettingexporter/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!-- Define an entity for your application if it is not part of KDE CVS --> <!ENTITY i18n-pimsettingexporter "<application>pimsettingexporter</application>"> diff --git a/doc/sieveeditor/index.docbook b/doc/sieveeditor/index.docbook index e02a364..691ea9e 100644 --- a/doc/sieveeditor/index.docbook +++ b/doc/sieveeditor/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!-- Define an entity for your application if it is not part of KDE CVS --> <!ENTITY kapplication "<application>sieveeditor</application>">
