Branding cleanup on Debian and Ubuntu

4 files changed, 7 insertions, 6 deletions

diff --git a/debian/lenny/applications/kchmviewer/debian/additions/kchmviewer.1 b/debian/lenny/applications/kchmviewer/debian/additions/kchmviewer.1
index 8598644e6..5994f536f 100644
--- a/debian/lenny/applications/kchmviewer/debian/additions/kchmviewer.1
+++ b/debian/lenny/applications/kchmviewer/debian/additions/kchmviewer.1
@@ -16,12 +16,12 @@
 .\" 02111-1307 USA
 .TH kchmviwer "1" "December 2005"
 .SH NAME
-kchmviewer \- Windows CHM viewer for KDE
+kchmviewer \- Windows CHM viewer for TDE
 .SH SYNOPSIS
 kchmviewer
 .SH DESCRIPTION
 .B kchmviewer
-makes it possible to browse native Windows CHM files under KDE.
+makes it possible to browse native Windows CHM files under TDE.
 .PP
 Complete documentation can be found in docbook format in
 /usr/share/doc/tde/HTML/<lang>/kchmviewer/ on this system.
diff --git a/debian/lenny/applications/kchmviewer/debian/control b/debian/lenny/applications/kchmviewer/debian/control
index 234e103e4..4e73be9b6 100644
--- a/debian/lenny/applications/kchmviewer/debian/control
+++ b/debian/lenny/applications/kchmviewer/debian/control
@@ -16,7 +16,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CHM viewer for Trinity
  KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
  Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
- library, and does not depend on KDE or GNOME. However, it may be compiled
+ library, and does not depend on TDE, KDE or GNOME. However, it may be compiled
  with full Trinity support, including Trinity widgets and KIO/TDEHTML. 
  .
  The main advantage of KchmViewer is non-English language support. Unlike
diff --git a/debian/lenny/applications/kchmviewer/debian/menu b/debian/lenny/applications/kchmviewer/debian/menu
index 00508b25c..694dda9e9 100644
--- a/debian/lenny/applications/kchmviewer/debian/menu
+++ b/debian/lenny/applications/kchmviewer/debian/menu
@@ -1,2 +1,2 @@
-?package(kchmviewer):needs="X11" section="Applications/Viewers"\
+?package(kchmviewer-trinity):needs="X11" section="Applications/Viewers"\
   title="kchmviewer" command="/opt/trinity/bin/kchmviewer"
diff --git a/debian/lenny/applications/kchmviewer/debian/rules b/debian/lenny/applications/kchmviewer/debian/rules
index e3fdf7aac..9f09d3cea 100755
--- a/debian/lenny/applications/kchmviewer/debian/rules
+++ b/debian/lenny/applications/kchmviewer/debian/rules
@@ -23,7 +23,7 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 CFLAGS = -Wall -g
 
-CONFIGURE_OPTIONS_KDE = \
+CONFIGURE_OPTIONS_TDE = \
 	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	--prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \
 	--includedir=/opt/trinity/include/tde --mandir=/opt/trinity/share/man \
@@ -57,7 +57,8 @@ debian/build-kde:
 	test -e config.guess -a -L config.guess || \
 		ln -sf /usr/share/misc/config.guess config.guess
 
-	mkdir build-kde && cd build-kde && ../configure CFLAGS="$(CFLAGS)" $(CONFIGURE_OPTIONS_KDE)
+	[ -d build-kde ] || mkdir build-kde
+        cd build-kde && ../configure CFLAGS="$(CFLAGS)" $(CONFIGURE_OPTIONS_TDE)
 	$(MAKE) -C build-kde
 	touch debian/build-kde