Fix generation manpage for k9copy on Debian and Ubuntu

(cherry picked from commit 9fff8a635ce921b4c939009a7df3602a6135fd9e)

9 files changed, 33 insertions, 30 deletions

diff --git a/debian/lenny/applications/k9copy/debian/control b/debian/lenny/applications/k9copy/debian/control
index ef2576f9a..3ab1187f6 100644
--- a/debian/lenny/applications/k9copy/debian/control
+++ b/debian/lenny/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, kdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://k9copy.sourceforge.net/
 
diff --git a/debian/lenny/applications/k9copy/debian/k9copy.1.docbook b/debian/lenny/applications/k9copy/debian/k9copy.1.docbook
index ff14d9107..d3fd4d792 100644
--- a/debian/lenny/applications/k9copy/debian/k9copy.1.docbook
+++ b/debian/lenny/applications/k9copy/debian/k9copy.1.docbook
@@ -24,7 +24,7 @@
   </refmeta>
   <refnamediv>
     <refname>k9copy</refname>
-    <refpurpose>DVD copy tool for KDE</refpurpose>
+    <refpurpose>DVD copy tool for TDE</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -33,14 +33,14 @@
         <option><replaceable>Qt-options</replaceable></option>
       </arg>
       <arg choice="opt">
-        <option><replaceable>KDE-options</replaceable></option>
+        <option><replaceable>TDE-options</replaceable></option>
       </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-      DVD copy tool for KDE.
+      DVD copy tool for TDE.
     </para>
     <para>
       k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5.
@@ -49,7 +49,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. k9copy has no
       application-specific options.
     </para>
@@ -66,7 +66,7 @@
         </varlistentry>
         <varlistentry>
           <term> <option>--help-kde</option> </term>
-          <listitem> <para>Show KDE specific options</para> </listitem>
+          <listitem> <para>Show TDE specific options</para> </listitem>
         </varlistentry>
         <varlistentry>
           <term> <option>--help-all</option> </term>
diff --git a/debian/lenny/applications/k9copy/debian/rules b/debian/lenny/applications/k9copy/debian/rules
index 7478396eb..35960c577 100755
--- a/debian/lenny/applications/k9copy/debian/rules
+++ b/debian/lenny/applications/k9copy/debian/rules
@@ -30,11 +30,12 @@ debian/stamp-bootstrap:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-install/k9copy::
-	dh_install src/k9copy.desktop opt/trinity/share/applications/kde
-	dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html
+install/k9copy-trinity::
+	dh_installman k9copy.1
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+	dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html
 
-build/k9copy::
+build/k9copy-trinity::
 	docbook2x-man debian/k9copy.1.docbook
 
 clean::
diff --git a/debian/squeeze/applications/k9copy/debian/control b/debian/squeeze/applications/k9copy/debian/control
index b32757774..80b0aa194 100644
--- a/debian/squeeze/applications/k9copy/debian/control
+++ b/debian/squeeze/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://k9copy.sourceforge.net/
 
diff --git a/debian/squeeze/applications/k9copy/debian/k9copy.1.docbook b/debian/squeeze/applications/k9copy/debian/k9copy.1.docbook
index ff14d9107..d3fd4d792 100644
--- a/debian/squeeze/applications/k9copy/debian/k9copy.1.docbook
+++ b/debian/squeeze/applications/k9copy/debian/k9copy.1.docbook
@@ -24,7 +24,7 @@
   </refmeta>
   <refnamediv>
     <refname>k9copy</refname>
-    <refpurpose>DVD copy tool for KDE</refpurpose>
+    <refpurpose>DVD copy tool for TDE</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -33,14 +33,14 @@
         <option><replaceable>Qt-options</replaceable></option>
       </arg>
       <arg choice="opt">
-        <option><replaceable>KDE-options</replaceable></option>
+        <option><replaceable>TDE-options</replaceable></option>
       </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-      DVD copy tool for KDE.
+      DVD copy tool for TDE.
     </para>
     <para>
       k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5.
@@ -49,7 +49,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. k9copy has no
       application-specific options.
     </para>
@@ -66,7 +66,7 @@
         </varlistentry>
         <varlistentry>
           <term> <option>--help-kde</option> </term>
-          <listitem> <para>Show KDE specific options</para> </listitem>
+          <listitem> <para>Show TDE specific options</para> </listitem>
         </varlistentry>
         <varlistentry>
           <term> <option>--help-all</option> </term>
diff --git a/debian/squeeze/applications/k9copy/debian/rules b/debian/squeeze/applications/k9copy/debian/rules
index 820a75a56..46d6822df 100755
--- a/debian/squeeze/applications/k9copy/debian/rules
+++ b/debian/squeeze/applications/k9copy/debian/rules
@@ -30,11 +30,12 @@ debian/stamp-bootstrap:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-install/k9copy::
-	dh_install src/k9copy.desktop opt/trinity/share/applications/kde
-	dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html
+install/k9copy-trinity::
+	dh_installman k9copy.1
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+	dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html
 
-build/k9copy::
+build/k9copy-trinity::
 	docbook2x-man debian/k9copy.1.docbook
 
 clean::
diff --git a/ubuntu/maverick/applications/k9copy/debian/control b/ubuntu/maverick/applications/k9copy/debian/control
index 1ed5c63aa..b23f6ec4b 100644
--- a/ubuntu/maverick/applications/k9copy/debian/control
+++ b/ubuntu/maverick/applications/k9copy/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), quilt, cdbs, kdelibs4-trinity-dev, docbook2x, docbook-xml, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://k9copy.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/k9copy/debian/k9copy.1.docbook b/ubuntu/maverick/applications/k9copy/debian/k9copy.1.docbook
index ff14d9107..d3fd4d792 100644
--- a/ubuntu/maverick/applications/k9copy/debian/k9copy.1.docbook
+++ b/ubuntu/maverick/applications/k9copy/debian/k9copy.1.docbook
@@ -24,7 +24,7 @@
   </refmeta>
   <refnamediv>
     <refname>k9copy</refname>
-    <refpurpose>DVD copy tool for KDE</refpurpose>
+    <refpurpose>DVD copy tool for TDE</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -33,14 +33,14 @@
         <option><replaceable>Qt-options</replaceable></option>
       </arg>
       <arg choice="opt">
-        <option><replaceable>KDE-options</replaceable></option>
+        <option><replaceable>TDE-options</replaceable></option>
       </arg>
     </cmdsynopsis>
   </refsynopsisdiv>
   <refsect1>
     <title>DESCRIPTION</title>
     <para>
-      DVD copy tool for KDE.
+      DVD copy tool for TDE.
     </para>
     <para>
       k9copy is a DVD backup utility which allow the copy of one or more titles from a DVD9 to a DVD5.
@@ -49,7 +49,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. k9copy has no
       application-specific options.
     </para>
@@ -66,7 +66,7 @@
         </varlistentry>
         <varlistentry>
           <term> <option>--help-kde</option> </term>
-          <listitem> <para>Show KDE specific options</para> </listitem>
+          <listitem> <para>Show TDE specific options</para> </listitem>
         </varlistentry>
         <varlistentry>
           <term> <option>--help-all</option> </term>
diff --git a/ubuntu/maverick/applications/k9copy/debian/rules b/ubuntu/maverick/applications/k9copy/debian/rules
index 820a75a56..46d6822df 100755
--- a/ubuntu/maverick/applications/k9copy/debian/rules
+++ b/ubuntu/maverick/applications/k9copy/debian/rules
@@ -30,11 +30,12 @@ debian/stamp-bootstrap:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-install/k9copy::
-	dh_install src/k9copy.desktop opt/trinity/share/applications/kde
-	dh_link usr/share/doc/tde/HTML/en/k9copy usr/share/doc/k9copy/html
+install/k9copy-trinity::
+	dh_installman k9copy.1
+	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
+	dh_link opt/trinity/share/doc/tde/HTML/en/k9copy usr/share/doc/$(cdbs_curpkg)/html
 
-build/k9copy::
+build/k9copy-trinity::
 	docbook2x-man debian/k9copy.1.docbook
 
 clean::