[kde-doc-english] [kconfigwidgets] /: Append 5 to preparetips script & manpage

Tue Jan 21 23:36:45 UTC 2014

Git commit 1ea6262185916ae453db15d325bdad0e27b1e0b3 by Hrvoje Senjan.
Committed on 21/01/2014 at 23:39.
Pushed by hrvojes into branch 'master'.

Append 5 to preparetips script & manpage

This is done to make kconfigwidgets not collide with
kdelibs(4) when installed to same prefix.

REVIEW: 115132

M  +1    -1    docs/preparetips/CMakeLists.txt
R  +6    -6    docs/preparetips/man-preparetips5.1.docbook [from: docs/preparetips/man-preparetips.1.docbook - 069% similarity]
M  +1    -1    src/CMakeLists.txt
M  +2    -2    src/ktipdialog.cpp
R  +0    -0    src/preparetips5 [from: src/preparetips - 100% similarity]

http://commits.kde.org/kconfigwidgets/1ea6262185916ae453db15d325bdad0e27b1e0b3

diff --git a/docs/preparetips/CMakeLists.txt b/docs/preparetips/CMakeLists.txt
index 4685089..1ab2dbe 100644
--- a/docs/preparetips/CMakeLists.txt
+++ b/docs/preparetips/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_manpage(man-preparetips.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
+kdoctools_create_manpage(man-preparetips5.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
diff --git a/docs/preparetips/man-preparetips.1.docbook b/docs/preparetips/man-preparetips5.1.docbook
similarity index 69%
rename from docs/preparetips/man-preparetips.1.docbook
rename to docs/preparetips/man-preparetips5.1.docbook
index baf4b6b..e242fa9 100644
--- a/docs/preparetips/man-preparetips.1.docbook
+++ b/docs/preparetips/man-preparetips5.1.docbook
@@ -24,39 +24,39 @@
 
 <refmeta>
 <refentrytitle>
-<command>preparetips</command>
+<command>preparetips5</command>
 </refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
 <refname>
-<command>preparetips</command>
+<command>preparetips5</command>
 </refname>
 <refpurpose>extract text from tips file</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>preparetips</command>
+<command>preparetips5</command>
 </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsect1>
 <title>Description</title>
 <para>
-<command>preparetips</command> is a script to extract the text from a tips file. It outputs the text so <command>xgettext</command> can add the tips to a PO file. PO files provide a human-readable string format used for translations.
+<command>preparetips5</command> is a script to extract the text from a tips file. It outputs the text so <command>xgettext</command> can add the tips to a PO file. PO files provide a human-readable string format used for translations.
 </para>
 
 <para>
-<command>preparetips</command> looks for <emphasis role="underline">data/tips-en</emphasis> as tips file.
+<command>preparetips5</command> looks for <emphasis role="underline">data/tips-en</emphasis> as tips file.
 </para>
 </refsect1>
 
 <refsect1>
 <title>See Also</title>
 <para>
-<command>kdeoptions</command>(7)
+<command>kf5options</command>(7)
 </para>
 </refsect1>
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index baf5295..d8d31ee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -71,5 +71,5 @@ install(FILES
  DESTINATION  ${DATA_INSTALL_DIR}/kconfigwidgets/pics
 )
 
-install(PROGRAMS preparetips DESTINATION ${BIN_INSTALL_DIR} )
+install(PROGRAMS preparetips5 DESTINATION ${BIN_INSTALL_DIR} )
 
diff --git a/src/ktipdialog.cpp b/src/ktipdialog.cpp
index 1b74f55..0161470 100644
--- a/src/ktipdialog.cpp
+++ b/src/ktipdialog.cpp
@@ -63,7 +63,7 @@ void KTipDatabase::Private::loadTips(const QString &tipFile)
 
 /**
  * If you change something here, please update the script
- * preparetips, which depends on extracting exactly the same
+ * preparetips5, which depends on extracting exactly the same
  * text as done here.
  */
 void KTipDatabase::Private::addTips(const QString &tipFile)
@@ -89,7 +89,7 @@ void KTipDatabase::Private::addTips(const QString &tipFile)
     while ((pos = content.indexOf("<html>", pos + 1, Qt::CaseInsensitive)) != -1) {
         /**
          * To make translations work, tip extraction here must exactly
-         * match what is done by the preparetips script.
+         * match what is done by the preparetips5 script.
          */
         QString tip = content
                       .mid(pos + 6, content.indexOf("</html>", pos, Qt::CaseInsensitive) - pos - 6)
diff --git a/src/preparetips b/src/preparetips5
similarity index 100%
rename from src/preparetips
rename to src/preparetips5
