merge

4 files changed, 11 insertions, 11 deletions

diff --git a/ubuntu/maverick/applications/tellico/debian/control b/ubuntu/maverick/applications/tellico/debian/control
index 8bbd87f1c..7653fb1d4 100644
--- a/ubuntu/maverick/applications/tellico/debian/control
+++ b/ubuntu/maverick/applications/tellico/debian/control
@@ -13,7 +13,7 @@ Depends: tellico-data-trinity (= ${source:Version}), tellico-scripts-trinity, ${
 Replaces: tellico-kde3 (<< 4:14.0.0~), tellico-trinity (<< 4:14.0.0~)
 Breaks: tellico-kde3 (<< 4:14.0.0~), tellico-trinity (<< 4:14.0.0~)
 Description: collection manager for books, videos, music [Trinity]
- Tellico is a collection manager for KDE. It includes default collections for
+ Tellico is a collection manager for TDE. It includes default collections for
  books, bibliographies, comic books, videos, music, coins, stamps, trading
  cards, and wines, and also allows custom collections; with unlimited
  user-defined fields allowed. Automatically formatted names, sorting by any
@@ -34,7 +34,7 @@ Breaks: tellico-data-kde3 (<< 4:14.0.0~), tellico-data-trinity (<< 4:14.0.0~)
 Recommends: tellico-trinity
 Suggests: python
 Description: collection manager for books, videos, music [data] [Trinity]
- Tellico is a collection manager for KDE. It includes default collections for
+ Tellico is a collection manager for TDE. It includes default collections for
  books, bibliographies, comic books, videos, music, coins, stamps, trading
  cards, and wines, and also allows custom collections; with unlimited
  user-defined fields allowed. Automatically formatted names, sorting by any
@@ -57,7 +57,7 @@ Replaces: tellico-scripts-kde3 (<< 4:14.0.0~), tellico-scripts-trinity (<< 4:14.
 Breaks: tellico-scripts-kde3 (<< 4:14.0.0~), tellico-scripts-trinity (<< 4:14.0.0~)
 Suggests: python, ruby
 Description: collection manager for books, videos, music [scripts] [Trinity]
- Tellico is a collection manager for KDE. It includes default collections for
+ Tellico is a collection manager for TDE. It includes default collections for
  books, bibliographies, comic books, videos, music, coins, stamps, trading
  cards, and wines, and also allows custom collections; with unlimited
  user-defined fields allowed. Automatically formatted names, sorting by any
diff --git a/ubuntu/maverick/applications/tellico/debian/menu b/ubuntu/maverick/applications/tellico/debian/menu
index 430884153..f0572cf58 100644
--- a/ubuntu/maverick/applications/tellico/debian/menu
+++ b/ubuntu/maverick/applications/tellico/debian/menu
@@ -1,4 +1,4 @@
-?package(tellico):needs="X11"\
+?package(tellico-trinity):needs="X11"\
   section="Applications/Office"\
   title="Tellico"\
   icon="/opt/trinity/share/pixmaps/tellico.xpm"\
diff --git a/ubuntu/maverick/applications/tellico/debian/rules b/ubuntu/maverick/applications/tellico/debian/rules
index 9e404eabf..72778a1fd 100755
--- a/ubuntu/maverick/applications/tellico/debian/rules
+++ b/ubuntu/maverick/applications/tellico/debian/rules
@@ -43,7 +43,7 @@ apply-patches:
 	#this will update the config.{sub,guess} and ltmain.sh files
 	libtoolize -c -f
 
-	# then, autoreconf with some kde magic
+	# then, autoreconf with some tde magic
 	autoreconf -v -i
 	perl -w admin/am_edit
 
@@ -147,7 +147,7 @@ binary-indep: build install
 	dh_icons -i
 	dh_installdocs -i
 	dh_link -i
-	dh_compress -i -Xkde
+	dh_compress -i -Xtde
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_gencontrol -i
diff --git a/ubuntu/maverick/applications/tellico/debian/tellico.1x b/ubuntu/maverick/applications/tellico/debian/tellico.1x
index e102af2c5..29a569a0b 100644
--- a/ubuntu/maverick/applications/tellico/debian/tellico.1x
+++ b/ubuntu/maverick/applications/tellico/debian/tellico.1x
@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
 .TH TELLICO: "1x" "March 2008"
 .SH NAME
-Tellico \- a collection manager for KDE
+Tellico \- a collection manager for TDE
 .SH SYNOPSIS
 .B tellico
-[\fIQt-options\fR] [\fIKDE-options\fR] [\fIoptions\fR] [\fIfilename\fR]
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfilename\fR]
 .SH DESCRIPTION
-Tellico \- a collection manager for KDE
+Tellico \- a collection manager for TDE
 .SS "Generic options:"
 .TP
 \fB\-\-help\fR
@@ -15,8 +15,8 @@ Show help about options
 \fB\-\-help\-qt\fR
 Show Qt specific options
 .TP
-\fB\-\-help\-kde\fR
-Show KDE specific options
+\fB\-\-help\-tde\fR
+Show TDE specific options
 .TP
 \fB\-\-help\-all\fR
 Show all options