DEB koffice: man pages moved to main repository

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

72 files changed, 28 insertions, 1530 deletions

diff --git a/debian/_base/applications/office/koffice/debian/karbon-trinity.install b/debian/_base/applications/office/koffice/debian/karbon-trinity.install
index a03e53a02..8b0b8b25c 100644
--- a/debian/_base/applications/office/koffice/debian/karbon-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/karbon-trinity.install
@@ -57,6 +57,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/karbon.svgz
+debian/tmp/opt/trinity/share/man/man1/karbon.1
 debian/tmp/opt/trinity/share/services/karbon_ai_import.desktop
 debian/tmp/opt/trinity/share/services/karbondefaulttools.desktop
 debian/tmp/opt/trinity/share/services/karbon_eps_export.desktop
diff --git a/debian/_base/applications/office/koffice/debian/karbon-trinity.manpages b/debian/_base/applications/office/koffice/debian/karbon-trinity.manpages
deleted file mode 100644
index 8a212a2b2..000000000
--- a/debian/_base/applications/office/koffice/debian/karbon-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/karbon.1
diff --git a/debian/_base/applications/office/koffice/debian/karbon.1 b/debian/_base/applications/office/koffice/debian/karbon.1
deleted file mode 100644
index 6a4cbb8ef..000000000
--- a/debian/_base/applications/office/koffice/debian/karbon.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KARBON 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-karbon \- a vector graphics application for the Trinity Office Suite
-.SH SYNOPSIS
-.B karbon
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKarbon\fP is a vector graphics application.
-.PP
-Note that the Trinity Office Suite comes with two graphics applications \-
-Kontour (which is vector-based) and Chalk (which is raster-based).
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the karbon-specific options.
-For a full summary of options, run \fIkarbon \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH AUTHOR
-Karbon was written by Rob Buis <buis@kde.org>, Lennart Kudling
-<kudling@kde.org>, Tomislav Lukman <tomislav.lukman@ck.hinet.hr> and
-Benoit Vautrin <benoit.vautrin@free.fr>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kchart-trinity.install b/debian/_base/applications/office/koffice/debian/kchart-trinity.install
index c5d3596c2..a6a595a2b 100644
--- a/debian/_base/applications/office/koffice/debian/kchart-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kchart-trinity.install
@@ -32,6 +32,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kchart.png
+debian/tmp/opt/trinity/share/man/man1/kchart.1
 debian/tmp/opt/trinity/share/services/kchart_bmp_export.desktop
 debian/tmp/opt/trinity/share/services/kchart_jpeg_export.desktop
 debian/tmp/opt/trinity/share/services/kchart_mng_export.desktop
diff --git a/debian/_base/applications/office/koffice/debian/kchart-trinity.manpages b/debian/_base/applications/office/koffice/debian/kchart-trinity.manpages
deleted file mode 100644
index 38c864763..000000000
--- a/debian/_base/applications/office/koffice/debian/kchart-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kchart.1
diff --git a/debian/_base/applications/office/koffice/debian/kchart.1 b/debian/_base/applications/office/koffice/debian/kchart.1
deleted file mode 100644
index 367f2e7ab..000000000
--- a/debian/_base/applications/office/koffice/debian/kchart.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KCHART 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kchart \- a chart drawing program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kchart
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKChart\fP is a chart drawing application.  It can be used to embed charts
-into KOffice documents.  KChart is easy to use and highly configurable.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kchart-specific options.
-For a full summary of options, run \fIkchart \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kchart/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kchart/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kchart/\fP.
-.SH AUTHOR
-KChart was written by Kalle Dalheimer <kalle@kde.org>,
-Laurent Montel <lmontel@mandrakesoft.com>, Karl-Heinz Zimmer <khz@kde.org> and
-Reginald Stadlbauer <reggie@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kformula-trinity.install b/debian/_base/applications/office/koffice/debian/kformula-trinity.install
index c97a73fa5..c73fd674a 100644
--- a/debian/_base/applications/office/koffice/debian/kformula-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kformula-trinity.install
@@ -18,5 +18,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kformula.png
+debian/tmp/opt/trinity/share/man/man1/kformula.1
 debian/tmp/opt/trinity/share/services/kformulapart.desktop
 debian/tmp/opt/trinity/share/services/kformula_svg_export.desktop
diff --git a/debian/_base/applications/office/koffice/debian/kformula-trinity.manpages b/debian/_base/applications/office/koffice/debian/kformula-trinity.manpages
deleted file mode 100644
index 35c78eaa9..000000000
--- a/debian/_base/applications/office/koffice/debian/kformula-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kformula.1
diff --git a/debian/_base/applications/office/koffice/debian/kformula.1 b/debian/_base/applications/office/koffice/debian/kformula.1
deleted file mode 100644
index ebbd55afb..000000000
--- a/debian/_base/applications/office/koffice/debian/kformula.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFORMULA 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kformula \- a formula editor for the Trinity Office Suite
-.SH SYNOPSIS
-.B kformula
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKFormula\fP is an easy to use formula editor. It provides the basic
-input facilities and the support functionality you come to expect of a
-KOffice application. But there is more. Some of its most exciting
-features are:
-.PP
-.RS
-Easy Greek letter insertion
-.PP
-Intelligent cursor movement
-.PP
-Advanced syntax highlighting
-.PP
-Multi-level undo support
-.PP
-LaTeX export (copy and paste into a text editor)
-.RE
-.PP
-KFormula uses the KOffice formula drawing library. If you have to deal
-with many formulae you may wish to use a KFormula object embedded in
-KWord or KSpread.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kformula-specific options.
-For a full summary of options, run \fIkformula \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kword (1),
-.BR kspread (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kformula/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kformula/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kformula/\fP.
-.SH AUTHOR
-KFormula was written by Andrea Rizzi <rizzi@kde.org>,
-Stephan Kulow <coolo@kde.org>, Ulrich Kuettler <ulrich.kuettler@gmx.de>,
-Heinrich Kuettler <heinrich.kuettler@gmx.de> and
-Claus O. Wilke <wilke@caltech.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kivio-trinity.install b/debian/_base/applications/office/koffice/debian/kivio-trinity.install
index 289580d09..b1fa9d81d 100644
--- a/debian/_base/applications/office/koffice/debian/kivio-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kivio-trinity.install
@@ -19,3 +19,4 @@ debian/tmp/opt/trinity/lib/trinity/straight_connector.la
 debian/tmp/opt/trinity/lib/trinity/straight_connector.so
 debian/tmp/opt/trinity/lib/libtdeinit_kivio.so
 debian/tmp/opt/trinity/lib/libkiviocommon.so.*
+debian/tmp/opt/trinity/share/man/man1/kivio.1
diff --git a/debian/_base/applications/office/koffice/debian/kivio-trinity.manpages b/debian/_base/applications/office/koffice/debian/kivio-trinity.manpages
deleted file mode 100644
index 1f348c0ca..000000000
--- a/debian/_base/applications/office/koffice/debian/kivio-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kivio.1
diff --git a/debian/_base/applications/office/koffice/debian/kivio.1 b/debian/_base/applications/office/koffice/debian/kivio.1
deleted file mode 100644
index b6557f54f..000000000
--- a/debian/_base/applications/office/koffice/debian/kivio.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KIVIO 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kivio \- a flowcharting program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kivio
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKivio\fP is a flowcharting program that offers basic flowcharting
-abilities, but with a twist.  Objects are scriptable, and a backend plugin
-system offers the ability to make objects do just about anything.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kivio-specific options.
-For a full summary of options, run \fIkivio \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Some documentation from the program author
-is available in \fI/usr/share/doc/kivio/\fP.
-.SH AUTHOR
-Kivio was written by Dave Marotti <lndshark@speakeasy.net>,
-Max Judin <max@thekompany.com>, Dmitry Poplavsky <dima@kde.org>,
-Peter Simonsson <psn@linux.se>, Ian Reinhart Geiser <geiseri@kde.org>,
-Laurent Montel <montel@kde.org> and theKompany.com <info@thekompany.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/koconverter.1 b/debian/_base/applications/office/koffice/debian/koconverter.1
deleted file mode 100644
index 07529ada9..000000000
--- a/debian/_base/applications/office/koffice/debian/koconverter.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOCONVERTER 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-koconverter \- convert between office suite file formats
-.SH SYNOPSIS
-.B koconverter
-[ \fIgeneric-options\fP ]
-[ \fB\-\-mimetype\fP \fImime\fP ]
-\fIinput\fP \fIoutput\fP
-.SH DESCRIPTION
-\fBKOConverter\fP is the KOffice file format converter.  It uses the
-KOffice import and export filters to convert from any file format
-that is understood by KOffice to any other.
-.PP
-This tool is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the koconverter-specific options.  For a full summary of options,
-run \fIkoconverter \-\-help\fP.
-.TP
-\fB\-\-mimetype\fP \fImime\fP
-Use \fImime\fP as the mime type for the output file.  This option should be
-used when the desired type of output file cannot be determined from its
-name alone.
-.SH EXAMPLES
-The following line will convert an Excel spreadsheet to a native KSpread
-file.
-.PP
-.RS
-\fIexample$\fP koconverter file.xls file.ksp
-.RE
-.PP
-The following line will convert an Excel spreadsheet to a plain text
-file.  Note that this conversion is done internally by first importing
-to a KSpread spreadsheet and then exporting as plain text.
-.PP
-.RS
-\fIexample$\fP koconverter file.xls file.txt
-.RE
-.SH AUTHOR
-KOConverter was written by David Faure <faure@kde.org>.
-.br
-This manual page was written by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.install b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.install
index 4be4f26eb..317098e2f 100644
--- a/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.install
@@ -51,3 +51,5 @@ debian/tmp/opt/trinity/lib/libkstore.so.*
 debian/tmp/opt/trinity/lib/libkwmailmerge_interface.so.*
 debian/tmp/opt/trinity/lib/libkwmf.so.*
 debian/tmp/opt/trinity/lib/libkwordexportfilters.so.*
+debian/tmp/opt/trinity/share/man/man1/koconverter.1
+debian/tmp/opt/trinity/share/man/man1/koscript.1
diff --git a/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages b/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
deleted file mode 100644
index 52c63b5d7..000000000
--- a/debian/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/koconverter.1
-debian/koscript.1
diff --git a/debian/_base/applications/office/koffice/debian/koscript.1 b/debian/_base/applications/office/koffice/debian/koscript.1
deleted file mode 100644
index 419c52df0..000000000
--- a/debian/_base/applications/office/koffice/debian/koscript.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOSCRIPT 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-koscript \- a script interpreter for the Trinity Office Suite
-.SH SYNOPSIS
-.B koscript
-[ \fIgeneric-options\fP ]
-\fIscript\fP [ \fB\-\-\fP \fIscript-options\fP ]
-.SH DESCRIPTION
-\fBKOScript\fP is the KOffice script interpreter.  It is used to run the
-given KOffice script.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the koscript-specific options.  For a full summary of options,
-run \fIkoscript \-\-help\fP.
-.TP
-\fB\-\-\fP \fIscript-options\fP
-Pass \fIscript-options\fP as options to the script.
-.SH AUTHOR
-KOScript was written by Torben Weis <weis@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/koshell-trinity.install b/debian/_base/applications/office/koffice/debian/koshell-trinity.install
index 4b63bd352..dd3561570 100644
--- a/debian/_base/applications/office/koffice/debian/koshell-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/koshell-trinity.install
@@ -17,3 +17,4 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/koshell.svgz
+debian/tmp/opt/trinity/share/man/man1/koshell.1
diff --git a/debian/_base/applications/office/koffice/debian/koshell-trinity.manpages b/debian/_base/applications/office/koffice/debian/koshell-trinity.manpages
deleted file mode 100644
index fc332a5cc..000000000
--- a/debian/_base/applications/office/koffice/debian/koshell-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/koshell.1
diff --git a/debian/_base/applications/office/koffice/debian/koshell.1 b/debian/_base/applications/office/koffice/debian/koshell.1
deleted file mode 100644
index d1dc76870..000000000
--- a/debian/_base/applications/office/koffice/debian/koshell.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOSHELL 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-koshell \- the Trinity Office Suite workspace
-.SH SYNOPSIS
-.B koshell
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBKOShell\fP (the KOffice workspace) is a desktop with easy one-click
-launchers for KOffice applications.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-For a full summary of options, run \fIkoshell \-\-help\fP.
-.SH AUTHOR
-KOShell was written by Torben Weis <weis@kde.org>, Simon Hausmann
-<hausmann@kde.org>, David Faure <faure@kde.org> and Sven Lüppken
-<sven@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kprconverter.pl.1 b/debian/_base/applications/office/koffice/debian/kprconverter.pl.1
deleted file mode 100644
index 635cc9556..000000000
--- a/debian/_base/applications/office/koffice/debian/kprconverter.pl.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPRCONVERTER.PL 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kprconverter.pl \- converts a KPresenter document from old to new format
-.SH SYNOPSIS
-.B kprconverter.pl
-.I old-XML new-XML
-.SH DESCRIPTION
-This Perl script converts the XML data within a KPresenter document from the
-old format (v1) to the new format (v2), which is necessary due to the new
-text object.  It reads the old XML data from \fIold-XML\fP and writes new
-converted XML data to \fInew-XML\fP.
-.PP
-The XML data stored in a KPresenter document can be accessed by passing
-the \fB.kpr\fP document through gunzip.
-.PP
-This utility is part of the Trinity Office Suite.
-.SH NOTES
-Be aware that \fIold-XML\fP should not be the
-original \fB.kpr\fP document, but should
-instead be just the extracted XML data.
-.PP
-This script is automatically called by KPresenter when an old format
-document is opened.  Ordinary users should not need to run this script
-themselves.
-.SH SEE ALSO
-.BR kpresenter (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kpresenter-trinity.install b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.install
index 5aada1cab..44d61cc4c 100644
--- a/debian/_base/applications/office/koffice/debian/kpresenter-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.install
@@ -27,3 +27,5 @@ debian/tmp/opt/trinity/lib/trinity/libooimpressimport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.so
 debian/tmp/opt/trinity/lib/libkpresenterimageexport.so.*
 debian/tmp/opt/trinity/lib/libkpresenterprivate.so.*
+debian/tmp/opt/trinity/share/man/man1/kpresenter.1
+debian/tmp/opt/trinity/share/man/man1/kprconverter.pl.1
diff --git a/debian/_base/applications/office/koffice/debian/kpresenter-trinity.manpages b/debian/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
deleted file mode 100644
index 3357e6954..000000000
--- a/debian/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kpresenter.1
-debian/kprconverter.pl.1
diff --git a/debian/_base/applications/office/koffice/debian/kpresenter.1 b/debian/_base/applications/office/koffice/debian/kpresenter.1
deleted file mode 100644
index 08eddd41e..000000000
--- a/debian/_base/applications/office/koffice/debian/kpresenter.1
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPRESENTER 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kpresenter \- a presentation program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kpresenter
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKPresenter\fP is a fully-featured presentation program.  Presentations can
-be edited directly within KPresenter, and many advanced features for
-screen presentations are available.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kpresenter-specific options.
-For a full summary of options, run \fIkpresenter \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kpresenter/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kpresenter/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kpresenter/\fP.
-.SH AUTHOR
-KPresenter was written by Reginald Stadlbauer <reggie@kde.org>,
-Werner Trobin <trobin@kde.org>, David Faure <dfaure@kde.org>,
-Toshitaka Fujioka <fujioka@kde.org>, Lukas Tinkl <lukas@kde.org>,
-Laurent Montel <montel@kde.org>, Thorsten Zachmann <t.zachmann@zagge.de> and
-Ariya Hidayat <ariya@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kspread-trinity.install b/debian/_base/applications/office/koffice/debian/kspread-trinity.install
index ee708351b..915f71c19 100644
--- a/debian/_base/applications/office/koffice/debian/kspread-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kspread-trinity.install
@@ -49,6 +49,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kspread.png
+debian/tmp/opt/trinity/share/man/man1/kspread.1
 debian/tmp/opt/trinity/share/services/kspread_applixspread_import.desktop
 debian/tmp/opt/trinity/share/services/kspread_csv_export.desktop
 debian/tmp/opt/trinity/share/services/kspread_csv_import.desktop
diff --git a/debian/_base/applications/office/koffice/debian/kspread-trinity.manpages b/debian/_base/applications/office/koffice/debian/kspread-trinity.manpages
deleted file mode 100644
index 833228aec..000000000
--- a/debian/_base/applications/office/koffice/debian/kspread-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kspread.1
diff --git a/debian/_base/applications/office/koffice/debian/kspread.1 b/debian/_base/applications/office/koffice/debian/kspread.1
deleted file mode 100644
index 0cf7e8861..000000000
--- a/debian/_base/applications/office/koffice/debian/kspread.1
+++ /dev/null
@@ -1,55 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSPREAD 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kspread \- a spreadsheet for the Trinity Office Suite
-.SH SYNOPSIS
-.B kspread
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKSpread\fP is a powerful spreadsheet application.  It is scriptable and
-provides both table-oriented sheets and support for complex mathematical
-formulae and statistics.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kspread-specific options.
-For a full summary of options, run \fIkspread \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kformula (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kspread/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kspread/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kspread/\fP.
-.SH AUTHOR
-KSpread was written by Torben Weis <weis@kde.org>, Laurent Montel
-<montell@club-internet.fr>, David Faure <faure@kde.org> and many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.install b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.install
index 1ce19b21c..4fb9550bd 100644
--- a/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.install
@@ -8,5 +8,6 @@ debian/tmp/opt/trinity/share/apps/thesaurus
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.docbook
+debian/tmp/opt/trinity/share/man/man1/kthesaurus.1
 debian/tmp/opt/trinity/share/services/thesaurustool.desktop
 debian/kthesaurus.xpm opt/trinity/share/pixmaps
diff --git a/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages b/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
deleted file mode 100644
index 4fb6feb79..000000000
--- a/debian/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kthesaurus.1
diff --git a/debian/_base/applications/office/koffice/debian/kthesaurus.1 b/debian/_base/applications/office/koffice/debian/kthesaurus.1
deleted file mode 100644
index 32f929bb8..000000000
--- a/debian/_base/applications/office/koffice/debian/kthesaurus.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KTHESAURUS 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kthesaurus \- a thesaurus for the Trinity Office Suite
-.SH SYNOPSIS
-.B kthesaurus
-[ \fIgeneric-options\fP ] [ \fIterm\fP ]
-.SH DESCRIPTION
-\fBKThesaurus\fP is a thesaurus tool.  It lists words related to a search
-term and offers a user interface to WordNet, an online lexical reference
-system.
-.PP
-Only the English language is supported.
-.PP
-A term to search for may be optionally specified on the command-line.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-For a full summary of options, run \fIkthesaurus \-\-help\fP.
-.SH SEE ALSO
-.BR kword (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/thesaurus/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/thesaurus/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/thesaurus/\fP.
-.SH AUTHOR
-KThesaurus was written by Daniel Naber <daniel.naber@t-online.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kudesigner.1 b/debian/_base/applications/office/koffice/debian/kudesigner.1
deleted file mode 100644
index bb08bb355..000000000
--- a/debian/_base/applications/office/koffice/debian/kudesigner.1
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KUDESIGNER 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kudesigner \- a report template designer for Kugar
-.SH SYNOPSIS
-.B kudesigner
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKuDesigner\fP is a tool for creating report templates to use with
-Kugar, the business report maker for KOffice.  Templates (which describe
-the layout of the data within a report) can be created in a visual
-drag-and-drop manner and then saved to file.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kudesigner-specific options.
-For a full summary of options, run \fIkudesigner \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kugar (1).
-.PP
-Full user documentation for Kugar is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kugar/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kugar/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
-.SH AUTHOR
-KuDesigner was written by Alexander Dymo <cloudtemple@mksat.net> and
-Joseph Wenninger <jowenn@jowenn.at>.
-.br
-Kugar was written by Keith Davis (Mutiny Bay Software)
-<info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>,
-Alexander Dymo <cloudtemple@mksat.net>, Joseph Wenninger <jowenn@jowenn.at>
-and Joris Marcillac <joris@marcillac.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kugar-trinity.install b/debian/_base/applications/office/koffice/debian/kugar-trinity.install
index 0cda2bece..b1b014203 100644
--- a/debian/_base/applications/office/koffice/debian/kugar-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kugar-trinity.install
@@ -32,5 +32,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kugar.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kugar.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kudesigner.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kudesigner.png
+debian/tmp/opt/trinity/share/man/man1/kugar.1
+debian/tmp/opt/trinity/share/man/man1/kudesigner.1
 debian/tmp/opt/trinity/share/services/kugar_kugar_import.desktop
 debian/tmp/opt/trinity/share/services/kugarpart.desktop
diff --git a/debian/_base/applications/office/koffice/debian/kugar-trinity.manpages b/debian/_base/applications/office/koffice/debian/kugar-trinity.manpages
deleted file mode 100644
index 2a72a7d1b..000000000
--- a/debian/_base/applications/office/koffice/debian/kugar-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kugar.1
-debian/kudesigner.1
diff --git a/debian/_base/applications/office/koffice/debian/kugar.1 b/debian/_base/applications/office/koffice/debian/kugar.1
deleted file mode 100644
index 134747aa2..000000000
--- a/debian/_base/applications/office/koffice/debian/kugar.1
+++ /dev/null
@@ -1,70 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KUGAR 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kugar \- a business report maker for the Trinity Office Suite
-.SH SYNOPSIS
-.B kugar
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIxml-data-file\fP ... ]
-.SH DESCRIPTION
-\fBKugar\fP is a tool for generating business quality reports that can
-be viewed and printed.  It includes a standalone report viewer and a
-KPart report viewer.  The latter means that any TDE application can
-embed the report viewing functionality and that reports can be viewed
-using the Konqueror browser.
-.PP
-Kugar will create a report for the data stored in the data file
-\fIxml-data-file\fP.  Data files typically end in \fB.kud\fP.
-Note that simply clicking on a data file in Konqueror will cause Kugar
-to create a report.
-.PP
-The data will be displayed according to the layout described in a template
-file.  This template file is generally named in the data file.
-Template files typically end in \fB.kut\fP.  See
-.BR kudesigner (1)
-for a tool for creating template files.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kugar-specific options.
-For a full summary of options, run \fIkugar \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kudesigner (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kugar/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kugar/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
-.SH AUTHOR
-Kugar was written by Keith Davis (Mutiny Bay Software)
-<info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>,
-Alexander Dymo <cloudtemple@mksat.net>, Joseph Wenninger <jowenn@jowenn.at>
-and Joris Marcillac <joris@marcillac.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/_base/applications/office/koffice/debian/kword-trinity.install b/debian/_base/applications/office/koffice/debian/kword-trinity.install
index dfeb77b97..29ea06866 100644
--- a/debian/_base/applications/office/koffice/debian/kword-trinity.install
+++ b/debian/_base/applications/office/koffice/debian/kword-trinity.install
@@ -69,3 +69,4 @@ debian/tmp/opt/trinity/lib/trinity/libwpimport.la
 debian/tmp/opt/trinity/lib/trinity/libwpimport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kword.so
 debian/tmp/opt/trinity/lib/libkwordprivate.so.*
+debian/tmp/opt/trinity/share/man/man1/kword.1
diff --git a/debian/_base/applications/office/koffice/debian/kword-trinity.manpages b/debian/_base/applications/office/koffice/debian/kword-trinity.manpages
deleted file mode 100644
index a9bf36729..000000000
--- a/debian/_base/applications/office/koffice/debian/kword-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kword.1
diff --git a/debian/_base/applications/office/koffice/debian/kword.1 b/debian/_base/applications/office/koffice/debian/kword.1
deleted file mode 100644
index e55e7f5f3..000000000
--- a/debian/_base/applications/office/koffice/debian/kword.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KWORD 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kword \- a word processor for the Trinity Office Suite
-.SH SYNOPSIS
-.B kword
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKWord\fP is a FrameMaker-like word processing and desktop publishing
-application.  KWord is capable of creating demanding and professional
-looking documents.  It can be used for desktop publishing, but also for
-"normal" word processing, like writing letters, reports and so on.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kword-specific options.
-For a full summary of options, run \fIkword \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kformula (1),
-.BR kthesaurus (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kword/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kword/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kword/\fP.
-.SH AUTHOR
-KWord was written by Reginald Stadlbauer <reggie@kde.org>, Torben Weis
-<weis@kde.org>, David Faure <dfaure@kde.org>, Thomas Zander
-<zander@kde.org>, Shaheed Haque <srhaque@iee.org>,
-Laurent Montel <lmontel@mandrakesoft.com>, Sven Lüppken <sven@kde.org>
-and many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
index a03e53a02..8b0b8b25c 100644
--- a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.install
@@ -57,6 +57,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/karbon.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/karbon.svgz
+debian/tmp/opt/trinity/share/man/man1/karbon.1
 debian/tmp/opt/trinity/share/services/karbon_ai_import.desktop
 debian/tmp/opt/trinity/share/services/karbondefaulttools.desktop
 debian/tmp/opt/trinity/share/services/karbon_eps_export.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages
deleted file mode 100644
index 8a212a2b2..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/karbon-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/karbon.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/karbon.1 b/ubuntu/_base/applications/office/koffice/debian/karbon.1
deleted file mode 100644
index 6a4cbb8ef..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/karbon.1
+++ /dev/null
@@ -1,44 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KARBON 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-karbon \- a vector graphics application for the Trinity Office Suite
-.SH SYNOPSIS
-.B karbon
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKarbon\fP is a vector graphics application.
-.PP
-Note that the Trinity Office Suite comes with two graphics applications \-
-Kontour (which is vector-based) and Chalk (which is raster-based).
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the karbon-specific options.
-For a full summary of options, run \fIkarbon \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH AUTHOR
-Karbon was written by Rob Buis <buis@kde.org>, Lennart Kudling
-<kudling@kde.org>, Tomislav Lukman <tomislav.lukman@ck.hinet.hr> and
-Benoit Vautrin <benoit.vautrin@free.fr>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
index c5d3596c2..a6a595a2b 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.install
@@ -32,6 +32,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kchart/*.png
 debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kchart.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kchart.png
+debian/tmp/opt/trinity/share/man/man1/kchart.1
 debian/tmp/opt/trinity/share/services/kchart_bmp_export.desktop
 debian/tmp/opt/trinity/share/services/kchart_jpeg_export.desktop
 debian/tmp/opt/trinity/share/services/kchart_mng_export.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages
deleted file mode 100644
index 38c864763..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kchart-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kchart.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kchart.1 b/ubuntu/_base/applications/office/koffice/debian/kchart.1
deleted file mode 100644
index 367f2e7ab..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kchart.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KCHART 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kchart \- a chart drawing program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kchart
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKChart\fP is a chart drawing application.  It can be used to embed charts
-into KOffice documents.  KChart is easy to use and highly configurable.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kchart-specific options.
-For a full summary of options, run \fIkchart \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kchart/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kchart/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kchart/\fP.
-.SH AUTHOR
-KChart was written by Kalle Dalheimer <kalle@kde.org>,
-Laurent Montel <lmontel@mandrakesoft.com>, Karl-Heinz Zimmer <khz@kde.org> and
-Reginald Stadlbauer <reggie@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
index c97a73fa5..c73fd674a 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.install
@@ -18,5 +18,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kformula.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kformula.png
+debian/tmp/opt/trinity/share/man/man1/kformula.1
 debian/tmp/opt/trinity/share/services/kformulapart.desktop
 debian/tmp/opt/trinity/share/services/kformula_svg_export.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages
deleted file mode 100644
index 35c78eaa9..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kformula-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kformula.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kformula.1 b/ubuntu/_base/applications/office/koffice/debian/kformula.1
deleted file mode 100644
index ebbd55afb..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kformula.1
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KFORMULA 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kformula \- a formula editor for the Trinity Office Suite
-.SH SYNOPSIS
-.B kformula
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKFormula\fP is an easy to use formula editor. It provides the basic
-input facilities and the support functionality you come to expect of a
-KOffice application. But there is more. Some of its most exciting
-features are:
-.PP
-.RS
-Easy Greek letter insertion
-.PP
-Intelligent cursor movement
-.PP
-Advanced syntax highlighting
-.PP
-Multi-level undo support
-.PP
-LaTeX export (copy and paste into a text editor)
-.RE
-.PP
-KFormula uses the KOffice formula drawing library. If you have to deal
-with many formulae you may wish to use a KFormula object embedded in
-KWord or KSpread.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kformula-specific options.
-For a full summary of options, run \fIkformula \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kword (1),
-.BR kspread (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kformula/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kformula/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kformula/\fP.
-.SH AUTHOR
-KFormula was written by Andrea Rizzi <rizzi@kde.org>,
-Stephan Kulow <coolo@kde.org>, Ulrich Kuettler <ulrich.kuettler@gmx.de>,
-Heinrich Kuettler <heinrich.kuettler@gmx.de> and
-Claus O. Wilke <wilke@caltech.edu>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
index 289580d09..b1fa9d81d 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.install
@@ -19,3 +19,4 @@ debian/tmp/opt/trinity/lib/trinity/straight_connector.la
 debian/tmp/opt/trinity/lib/trinity/straight_connector.so
 debian/tmp/opt/trinity/lib/libtdeinit_kivio.so
 debian/tmp/opt/trinity/lib/libkiviocommon.so.*
+debian/tmp/opt/trinity/share/man/man1/kivio.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages
deleted file mode 100644
index 1f348c0ca..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kivio-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kivio.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kivio.1 b/ubuntu/_base/applications/office/koffice/debian/kivio.1
deleted file mode 100644
index b6557f54f..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kivio.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KIVIO 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kivio \- a flowcharting program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kivio
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKivio\fP is a flowcharting program that offers basic flowcharting
-abilities, but with a twist.  Objects are scriptable, and a backend plugin
-system offers the ability to make objects do just about anything.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kivio-specific options.
-For a full summary of options, run \fIkivio \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Some documentation from the program author
-is available in \fI/usr/share/doc/kivio/\fP.
-.SH AUTHOR
-Kivio was written by Dave Marotti <lndshark@speakeasy.net>,
-Max Judin <max@thekompany.com>, Dmitry Poplavsky <dima@kde.org>,
-Peter Simonsson <psn@linux.se>, Ian Reinhart Geiser <geiseri@kde.org>,
-Laurent Montel <montel@kde.org> and theKompany.com <info@thekompany.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/koconverter.1 b/ubuntu/_base/applications/office/koffice/debian/koconverter.1
deleted file mode 100644
index 07529ada9..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koconverter.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOCONVERTER 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-koconverter \- convert between office suite file formats
-.SH SYNOPSIS
-.B koconverter
-[ \fIgeneric-options\fP ]
-[ \fB\-\-mimetype\fP \fImime\fP ]
-\fIinput\fP \fIoutput\fP
-.SH DESCRIPTION
-\fBKOConverter\fP is the KOffice file format converter.  It uses the
-KOffice import and export filters to convert from any file format
-that is understood by KOffice to any other.
-.PP
-This tool is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the koconverter-specific options.  For a full summary of options,
-run \fIkoconverter \-\-help\fP.
-.TP
-\fB\-\-mimetype\fP \fImime\fP
-Use \fImime\fP as the mime type for the output file.  This option should be
-used when the desired type of output file cannot be determined from its
-name alone.
-.SH EXAMPLES
-The following line will convert an Excel spreadsheet to a native KSpread
-file.
-.PP
-.RS
-\fIexample$\fP koconverter file.xls file.ksp
-.RE
-.PP
-The following line will convert an Excel spreadsheet to a plain text
-file.  Note that this conversion is done internally by first importing
-to a KSpread spreadsheet and then exporting as plain text.
-.PP
-.RS
-\fIexample$\fP koconverter file.xls file.txt
-.RE
-.SH AUTHOR
-KOConverter was written by David Faure <faure@kde.org>.
-.br
-This manual page was written by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
index 4be4f26eb..317098e2f 100644
--- a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.install
@@ -51,3 +51,5 @@ debian/tmp/opt/trinity/lib/libkstore.so.*
 debian/tmp/opt/trinity/lib/libkwmailmerge_interface.so.*
 debian/tmp/opt/trinity/lib/libkwmf.so.*
 debian/tmp/opt/trinity/lib/libkwordexportfilters.so.*
+debian/tmp/opt/trinity/share/man/man1/koconverter.1
+debian/tmp/opt/trinity/share/man/man1/koscript.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
deleted file mode 100644
index 52c63b5d7..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koffice-libs-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/koconverter.1
-debian/koscript.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/koscript.1 b/ubuntu/_base/applications/office/koffice/debian/koscript.1
deleted file mode 100644
index 419c52df0..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koscript.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOSCRIPT 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-koscript \- a script interpreter for the Trinity Office Suite
-.SH SYNOPSIS
-.B koscript
-[ \fIgeneric-options\fP ]
-\fIscript\fP [ \fB\-\-\fP \fIscript-options\fP ]
-.SH DESCRIPTION
-\fBKOScript\fP is the KOffice script interpreter.  It is used to run the
-given KOffice script.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the koscript-specific options.  For a full summary of options,
-run \fIkoscript \-\-help\fP.
-.TP
-\fB\-\-\fP \fIscript-options\fP
-Pass \fIscript-options\fP as options to the script.
-.SH AUTHOR
-KOScript was written by Torben Weis <weis@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
index 4b63bd352..dd3561570 100644
--- a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.install
@@ -17,3 +17,4 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/koshell.png
 debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/koshell.svgz
+debian/tmp/opt/trinity/share/man/man1/koshell.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages
deleted file mode 100644
index fc332a5cc..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koshell-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/koshell.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/koshell.1 b/ubuntu/_base/applications/office/koffice/debian/koshell.1
deleted file mode 100644
index d1dc76870..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/koshell.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KOSHELL 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-koshell \- the Trinity Office Suite workspace
-.SH SYNOPSIS
-.B koshell
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBKOShell\fP (the KOffice workspace) is a desktop with easy one-click
-launchers for KOffice applications.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-For a full summary of options, run \fIkoshell \-\-help\fP.
-.SH AUTHOR
-KOShell was written by Torben Weis <weis@kde.org>, Simon Hausmann
-<hausmann@kde.org>, David Faure <faure@kde.org> and Sven Lüppken
-<sven@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1 b/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1
deleted file mode 100644
index 635cc9556..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kprconverter.pl.1
+++ /dev/null
@@ -1,45 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPRCONVERTER.PL 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kprconverter.pl \- converts a KPresenter document from old to new format
-.SH SYNOPSIS
-.B kprconverter.pl
-.I old-XML new-XML
-.SH DESCRIPTION
-This Perl script converts the XML data within a KPresenter document from the
-old format (v1) to the new format (v2), which is necessary due to the new
-text object.  It reads the old XML data from \fIold-XML\fP and writes new
-converted XML data to \fInew-XML\fP.
-.PP
-The XML data stored in a KPresenter document can be accessed by passing
-the \fB.kpr\fP document through gunzip.
-.PP
-This utility is part of the Trinity Office Suite.
-.SH NOTES
-Be aware that \fIold-XML\fP should not be the
-original \fB.kpr\fP document, but should
-instead be just the extracted XML data.
-.PP
-This script is automatically called by KPresenter when an old format
-document is opened.  Ordinary users should not need to run this script
-themselves.
-.SH SEE ALSO
-.BR kpresenter (1).
-.SH AUTHOR
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
index 5aada1cab..44d61cc4c 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.install
@@ -27,3 +27,5 @@ debian/tmp/opt/trinity/lib/trinity/libooimpressimport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kpresenter.so
 debian/tmp/opt/trinity/lib/libkpresenterimageexport.so.*
 debian/tmp/opt/trinity/lib/libkpresenterprivate.so.*
+debian/tmp/opt/trinity/share/man/man1/kpresenter.1
+debian/tmp/opt/trinity/share/man/man1/kprconverter.pl.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
deleted file mode 100644
index 3357e6954..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kpresenter-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kpresenter.1
-debian/kprconverter.pl.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kpresenter.1 b/ubuntu/_base/applications/office/koffice/debian/kpresenter.1
deleted file mode 100644
index 08eddd41e..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kpresenter.1
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KPRESENTER 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kpresenter \- a presentation program for the Trinity Office Suite
-.SH SYNOPSIS
-.B kpresenter
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKPresenter\fP is a fully-featured presentation program.  Presentations can
-be edited directly within KPresenter, and many advanced features for
-screen presentations are available.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kpresenter-specific options.
-For a full summary of options, run \fIkpresenter \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kpresenter/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kpresenter/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kpresenter/\fP.
-.SH AUTHOR
-KPresenter was written by Reginald Stadlbauer <reggie@kde.org>,
-Werner Trobin <trobin@kde.org>, David Faure <dfaure@kde.org>,
-Toshitaka Fujioka <fujioka@kde.org>, Lukas Tinkl <lukas@kde.org>,
-Laurent Montel <montel@kde.org>, Thorsten Zachmann <t.zachmann@zagge.de> and
-Ariya Hidayat <ariya@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
index ee708351b..915f71c19 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.install
@@ -49,6 +49,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kspread.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kspread.png
+debian/tmp/opt/trinity/share/man/man1/kspread.1
 debian/tmp/opt/trinity/share/services/kspread_applixspread_import.desktop
 debian/tmp/opt/trinity/share/services/kspread_csv_export.desktop
 debian/tmp/opt/trinity/share/services/kspread_csv_import.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages
deleted file mode 100644
index 833228aec..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kspread-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kspread.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kspread.1 b/ubuntu/_base/applications/office/koffice/debian/kspread.1
deleted file mode 100644
index 0cf7e8861..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kspread.1
+++ /dev/null
@@ -1,55 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSPREAD 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kspread \- a spreadsheet for the Trinity Office Suite
-.SH SYNOPSIS
-.B kspread
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKSpread\fP is a powerful spreadsheet application.  It is scriptable and
-provides both table-oriented sheets and support for complex mathematical
-formulae and statistics.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kspread-specific options.
-For a full summary of options, run \fIkspread \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kformula (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kspread/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kspread/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kspread/\fP.
-.SH AUTHOR
-KSpread was written by Torben Weis <weis@kde.org>, Laurent Montel
-<montell@club-internet.fr>, David Faure <faure@kde.org> and many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
index 1ce19b21c..4fb9550bd 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.install
@@ -8,5 +8,6 @@ debian/tmp/opt/trinity/share/apps/thesaurus
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/thesaurus/*.docbook
+debian/tmp/opt/trinity/share/man/man1/kthesaurus.1
 debian/tmp/opt/trinity/share/services/thesaurustool.desktop
 debian/kthesaurus.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
deleted file mode 100644
index 4fb6feb79..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kthesaurus.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1 b/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1
deleted file mode 100644
index 32f929bb8..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kthesaurus.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KTHESAURUS 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kthesaurus \- a thesaurus for the Trinity Office Suite
-.SH SYNOPSIS
-.B kthesaurus
-[ \fIgeneric-options\fP ] [ \fIterm\fP ]
-.SH DESCRIPTION
-\fBKThesaurus\fP is a thesaurus tool.  It lists words related to a search
-term and offers a user interface to WordNet, an online lexical reference
-system.
-.PP
-Only the English language is supported.
-.PP
-A term to search for may be optionally specified on the command-line.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-For a full summary of options, run \fIkthesaurus \-\-help\fP.
-.SH SEE ALSO
-.BR kword (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/thesaurus/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/thesaurus/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/thesaurus/\fP.
-.SH AUTHOR
-KThesaurus was written by Daniel Naber <daniel.naber@t-online.de>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kudesigner.1 b/ubuntu/_base/applications/office/koffice/debian/kudesigner.1
deleted file mode 100644
index bb08bb355..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kudesigner.1
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KUDESIGNER 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kudesigner \- a report template designer for Kugar
-.SH SYNOPSIS
-.B kudesigner
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKuDesigner\fP is a tool for creating report templates to use with
-Kugar, the business report maker for KOffice.  Templates (which describe
-the layout of the data within a report) can be created in a visual
-drag-and-drop manner and then saved to file.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kudesigner-specific options.
-For a full summary of options, run \fIkudesigner \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kugar (1).
-.PP
-Full user documentation for Kugar is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kugar/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kugar/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
-.SH AUTHOR
-KuDesigner was written by Alexander Dymo <cloudtemple@mksat.net> and
-Joseph Wenninger <jowenn@jowenn.at>.
-.br
-Kugar was written by Keith Davis (Mutiny Bay Software)
-<info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>,
-Alexander Dymo <cloudtemple@mksat.net>, Joseph Wenninger <jowenn@jowenn.at>
-and Joris Marcillac <joris@marcillac.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
index 0cda2bece..b1b014203 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.install
@@ -32,5 +32,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kugar.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kugar.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kudesigner.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kudesigner.png
+debian/tmp/opt/trinity/share/man/man1/kugar.1
+debian/tmp/opt/trinity/share/man/man1/kudesigner.1
 debian/tmp/opt/trinity/share/services/kugar_kugar_import.desktop
 debian/tmp/opt/trinity/share/services/kugarpart.desktop
diff --git a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages
deleted file mode 100644
index 2a72a7d1b..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kugar-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kugar.1
-debian/kudesigner.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kugar.1 b/ubuntu/_base/applications/office/koffice/debian/kugar.1
deleted file mode 100644
index 134747aa2..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kugar.1
+++ /dev/null
@@ -1,70 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KUGAR 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kugar \- a business report maker for the Trinity Office Suite
-.SH SYNOPSIS
-.B kugar
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIxml-data-file\fP ... ]
-.SH DESCRIPTION
-\fBKugar\fP is a tool for generating business quality reports that can
-be viewed and printed.  It includes a standalone report viewer and a
-KPart report viewer.  The latter means that any TDE application can
-embed the report viewing functionality and that reports can be viewed
-using the Konqueror browser.
-.PP
-Kugar will create a report for the data stored in the data file
-\fIxml-data-file\fP.  Data files typically end in \fB.kud\fP.
-Note that simply clicking on a data file in Konqueror will cause Kugar
-to create a report.
-.PP
-The data will be displayed according to the layout described in a template
-file.  This template file is generally named in the data file.
-Template files typically end in \fB.kut\fP.  See
-.BR kudesigner (1)
-for a tool for creating template files.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kugar-specific options.
-For a full summary of options, run \fIkugar \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kudesigner (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kugar/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kugar/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kugar/\fP.
-.SH AUTHOR
-Kugar was written by Keith Davis (Mutiny Bay Software)
-<info@mutinybaysoftware.com>, Phil Thompson <phil@river-bank.demon.co.uk>,
-Alexander Dymo <cloudtemple@mksat.net>, Joseph Wenninger <jowenn@jowenn.at>
-and Joris Marcillac <joris@marcillac.com>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
index dfeb77b97..29ea06866 100644
--- a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
+++ b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.install
@@ -69,3 +69,4 @@ debian/tmp/opt/trinity/lib/trinity/libwpimport.la
 debian/tmp/opt/trinity/lib/trinity/libwpimport.so
 debian/tmp/opt/trinity/lib/libtdeinit_kword.so
 debian/tmp/opt/trinity/lib/libkwordprivate.so.*
+debian/tmp/opt/trinity/share/man/man1/kword.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages b/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages
deleted file mode 100644
index a9bf36729..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kword-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kword.1
diff --git a/ubuntu/_base/applications/office/koffice/debian/kword.1 b/ubuntu/_base/applications/office/koffice/debian/kword.1
deleted file mode 100644
index e55e7f5f3..000000000
--- a/ubuntu/_base/applications/office/koffice/debian/kword.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KWORD 1 "May 9, 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kword \- a word processor for the Trinity Office Suite
-.SH SYNOPSIS
-.B kword
-[ \fIgeneric-options\fP ]
-[ \fB\-\-print\fP ]
-[ \fIfile\fP ... ]
-.SH DESCRIPTION
-\fBKWord\fP is a FrameMaker-like word processing and desktop publishing
-application.  KWord is capable of creating demanding and professional
-looking documents.  It can be used for desktop publishing, but also for
-"normal" word processing, like writing letters, reports and so on.
-.PP
-This application is part of the Trinity Office Suite.
-.SH OPTIONS
-Below are the kword-specific options.
-For a full summary of options, run \fIkword \-\-help\fP.
-.TP
-\fB\-\-print\fP
-Print the given file(s) and exit.
-.SH SEE ALSO
-.BR kformula (1),
-.BR kthesaurus (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kword/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kword/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fIkoffice-doc-html\fP and read this documentation in HTML format from
-\fI/usr/share/doc/tde/HTML/en/kword/\fP.
-.SH AUTHOR
-KWord was written by Reginald Stadlbauer <reggie@kde.org>, Torben Weis
-<weis@kde.org>, David Faure <dfaure@kde.org>, Thomas Zander
-<zander@kde.org>, Shaheed Haque <srhaque@iee.org>,
-Laurent Montel <lmontel@mandrakesoft.com>, Sven Lüppken <sven@kde.org>
-and many others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).