Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

6 files changed, 21 insertions, 19 deletions

diff --git a/ubuntu/precise/applications/konversation/debian/control b/ubuntu/precise/applications/konversation/debian/control
index 9728d2f8e..7d96a609e 100644
--- a/ubuntu/precise/applications/konversation/debian/control
+++ b/ubuntu/precise/applications/konversation/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Modestas Vainius <modestas@vainius.eu>
-Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), tdelibs4-trinity-dev, xsltproc, docbook-xsl, docbook-xml, libxi-dev, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 DM-Upload-Allowed: yes
 Homepage: http://konversation.kde.org/
diff --git a/ubuntu/precise/applications/konversation/debian/konversation-trinity.manpages b/ubuntu/precise/applications/konversation/debian/konversation-trinity.manpages
index 13cdaf4b2..8b3496a3d 100644
--- a/ubuntu/precise/applications/konversation/debian/konversation-trinity.manpages
+++ b/ubuntu/precise/applications/konversation/debian/konversation-trinity.manpages
@@ -1 +1 @@
-debian/man/*.1
+#debian/man/*.1
diff --git a/ubuntu/precise/applications/konversation/debian/konversation-trinity.menu b/ubuntu/precise/applications/konversation/debian/konversation-trinity.menu
index 0fbd13937..5adcdf7fc 100644
--- a/ubuntu/precise/applications/konversation/debian/konversation-trinity.menu
+++ b/ubuntu/precise/applications/konversation/debian/konversation-trinity.menu
@@ -2,8 +2,8 @@
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	title="Konversation IRC Client"\
-	hints="KDE,IRC Clients"\
-        icon="/usr/share/pixmaps/konversation32x32.xpm"\
-        icon16x16="/usr/share/pixmaps/konversation16x16.xpm"\
-        icon32x32="/usr/share/pixmaps/konversation32x32.xpm"\
+	hints="TDE,IRC Clients"\
+	icon="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/konversation16x16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/konversation32x32.xpm"\
 	command="/opt/trinity/bin/konversation"
diff --git a/ubuntu/precise/applications/konversation/debian/man/konversation.1.docbook b/ubuntu/precise/applications/konversation/debian/man/konversation.1.docbook
index f48e27b95..719d6e158 100644
--- a/ubuntu/precise/applications/konversation/debian/man/konversation.1.docbook
+++ b/ubuntu/precise/applications/konversation/debian/man/konversation.1.docbook
@@ -25,7 +25,7 @@
   </refmeta>
   <refnamediv>
     <refname>konversation</refname>
-    <refpurpose>user friendly IRC client for KDE</refpurpose>
+    <refpurpose>user friendly IRC client for TDE</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -34,7 +34,7 @@
         <option><replaceable>Qt-options</replaceable></option>
       </arg>
       <arg choice="opt">
-        <option><replaceable>KDE-options</replaceable></option>
+        <option><replaceable>TDE-options</replaceable></option>
       </arg>
       <arg choice="opt">
         <option><replaceable>options</replaceable></option>
@@ -57,7 +57,7 @@
   <refsect1>
     <title>OPTIONS</title>
     <para>
-      All <productname>KDE</productname> and <productname>Qt</productname>
+      All <productname>TDE</productname> and <productname>Qt</productname>
       programs accept a some common command-line options.
     </para>
     <para>
@@ -72,8 +72,8 @@
           <listitem> <para>Show Qt specific options</para> </listitem>
         </varlistentry>
         <varlistentry>
-          <term> <option>--help-kde</option> </term>
-          <listitem> <para>Show KDE specific options</para> </listitem>
+          <term> <option>--help-tde</option> </term>
+          <listitem> <para>Show TDE specific options</para> </listitem>
         </varlistentry>
         <varlistentry>
           <term> <option>--help-all</option> </term>
@@ -138,9 +138,9 @@
   <refsect1>
     <title>SCRIPTING</title>
     <para>Konversation looks for scripts in <filename
-        class="directory">/usr/share/apps/konversation/scripts</filename> and
+        class="directory">/opt/trinity/share/apps/konversation/scripts</filename> and
       in <filename
-        class="directory">~/.kde/share/apps/konversation/scripts</filename>.
+        class="directory">~/.trinity/share/apps/konversation/scripts</filename>.
       To execute a script, use the <command>exec</command> command:</para>
     <cmdsynopsis>
       <command>/exec</command> 
@@ -157,19 +157,19 @@
     <para>
       <variablelist>
         <varlistentry>
-          <term><filename>~/.kde/share/config/konversationrc</filename></term>
+          <term><filename>~/.trinity/share/config/konversationrc</filename></term>
           <listitem><para>Main configuration</para></listitem>
         </varlistentry>
         <varlistentry>
           <term>
-            <filename>~/.kde/share/config/konversation.eventsrc</filename>
+            <filename>~/.trinity/share/config/konversation.eventsrc</filename>
           </term>
           <listitem><para>Notification settings</para></listitem>
         </varlistentry>
         <varlistentry>
           <term>
             <filename
-              class="directory">~/.kde/share/apps/konversation/logs</filename>
+              class="directory">~/.trinity/share/apps/konversation/logs</filename>
           </term>
           <listitem><para>Directory containing channel log
               files</para></listitem>
diff --git a/ubuntu/precise/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook b/ubuntu/precise/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
index 1752d7b2c..3a82060c1 100644
--- a/ubuntu/precise/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
+++ b/ubuntu/precise/applications/konversation/debian/man/konversationircprotocolhandler.1.docbook
@@ -44,8 +44,8 @@
       connection to the specified IRC server in a running Konversation client.
     </para>
     <para>
-      This program is registered with KDE as a handler for the irc URI scheme,
-      and KDE applications will use this program to handle such URI.
+      This program is registered with TDE as a handler for the irc URI scheme,
+      and TDE applications will use this program to handle such URI.
       (For example, it will be called if a user clicks on an irc:// link on a
       web page in Konqueror.)
     </para>
diff --git a/ubuntu/precise/applications/konversation/debian/rules b/ubuntu/precise/applications/konversation/debian/rules
index 0e973a150..a547b5e8a 100755
--- a/ubuntu/precise/applications/konversation/debian/rules
+++ b/ubuntu/precise/applications/konversation/debian/rules
@@ -38,7 +38,7 @@ DB2MAN = /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
 	$(XP) $(DB2MAN) $<
 
 GENERATED_MANPAGES := $(patsubst %.docbook,%,$(wildcard debian/man/*.docbook))
-build/konversation:: $(GENERATED_MANPAGES)
+build/konversation-trinity:: $(GENERATED_MANPAGES)
 clean::
 	-rm -f $(GENERATED_MANPAGES)
 	-rm -f po/*/konversation.gmo
@@ -47,3 +47,5 @@ clean::
 install/konversation-trinity::
 	install -D -m 644 konversation/scripts/README \
 	  debian/konversation-trinity/opt/trinity/share/doc/konversation/README.scripts
+	dh_installman debian/man/*.1
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/