merge

7 files changed, 21 insertions, 21 deletions

diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/versions.pl b/ubuntu/maverick/applications/digikam/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/digikam/debian/cdbs/versions.pl
@@ -13,7 +13,7 @@ my ($version2, $version2_next);
 ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
 ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
 
-print "KDE-Version3=$version3\n";
-print "KDE-Version2=$version2\n";
-print "KDE-Next-Version3=$version3_next\n";
-print "KDE-Next-Version2=$version2_next\n";
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/maverick/applications/digikam/debian/control b/ubuntu/maverick/applications/digikam/debian/control
index 092f3e7a8..bc98847c3 100644
--- a/ubuntu/maverick/applications/digikam/debian/control
+++ b/ubuntu/maverick/applications/digikam/debian/control
@@ -20,7 +20,7 @@ Replaces: digikam-kde3 (<< 4:14.0.0~), digikam-trinity (<< 4:14.0.0~)
 Breaks: digikam-kde3 (<< 4:14.0.0~), digikam-trinity (<< 4:14.0.0~)
 Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Suggests: digikam-trinity-doc
-Description: digital photo management application for KDE [Trinity]
+Description: digital photo management application for TDE [Trinity]
  An easy to use and powerful digital photo management
  application, which makes importing, organizing and manipulating
  digital photos a "snap".  An interface is provided to connect to
@@ -47,7 +47,7 @@ Replaces: showfoto-kde3 (<< 4:14.0.0~), showfoto-trinity (<< 4:14.0.0~)
 Breaks: showfoto-kde3 (<< 4:14.0.0~), showfoto-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, digikam-trinity
 Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
-Description: image viewer/editor for KDE [Trinity]
+Description: image viewer/editor for TDE [Trinity]
  Showphoto is part of the Digikam project.
  It allows to browse your photo collection and edit them with ease.
 
diff --git a/ubuntu/maverick/applications/digikam/debian/control.in b/ubuntu/maverick/applications/digikam/debian/control.in
index 98165e514..a53450f30 100644
--- a/ubuntu/maverick/applications/digikam/debian/control.in
+++ b/ubuntu/maverick/applications/digikam/debian/control.in
@@ -18,7 +18,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
 Suggests: digikam-trinity-doc
-Description: digital photo management application for KDE [Trinity]
+Description: digital photo management application for TDE [Trinity]
  An easy to use and powerful digital photo management
  application, which makes importing, organizing and manipulating
  digital photos a "snap".  An interface is provided to connect to
@@ -43,7 +43,7 @@ Architecture: any
 Section: graphics
 Depends: ${shlibs:Depends}, digikam-trinity
 Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
-Description: image viewer/editor for KDE [Trinity]
+Description: image viewer/editor for TDE [Trinity]
  Showphoto is part of the Digikam project.
  It allows to browse your photo collection and edit them with ease.
 
diff --git a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.menu b/ubuntu/maverick/applications/digikam/debian/digikam-trinity.menu
index e4f9ec786..ceb80fcee 100644
--- a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.menu
+++ b/ubuntu/maverick/applications/digikam/debian/digikam-trinity.menu
@@ -1,4 +1,4 @@
-?package(digikam):\
+?package(digikam-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	title="digikam"\
diff --git a/ubuntu/maverick/applications/digikam/debian/digikam.manpage b/ubuntu/maverick/applications/digikam/debian/digikam.manpage
index ed8c640c1..539fd026a 100644
--- a/ubuntu/maverick/applications/digikam/debian/digikam.manpage
+++ b/ubuntu/maverick/applications/digikam/debian/digikam.manpage
@@ -1,9 +1,9 @@
 .TH digikam "1" "Feb 2005" "digikam 0.7.4" "User Commands"
 .SH NAME
-digikam \- digital photo management application for KDE
+digikam \- digital photo management application for TDE
 .SH SYNOPSIS
 .B digikam
-[\fIQt\-options\fR] [\fIKDE\-options\fR]
+[\fIQt\-options\fR] [\fITDE\-options\fR]
 [\fB\-\-detect\-camera\fR]
 .SH DESCRIPTION
 Digikam is an easy to use and powerful digital photo management
@@ -30,7 +30,7 @@ USB mass storage devices.
 .TP
 \fB\-\-download\-from  <path>\fR
 Open camera dialog at <path>. Use this with cameras that export
-their pictures as USB mass storage.  KDE automounts the camera
+their pictures as USB mass storage.  TDE automounts the camera
 storage, if the path given as, e.g., \fIsystem:/media/<dir>\fR or \fImedia:/<dir>\fR
 .SS "Generic options:"
 .TP
@@ -40,8 +40,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
diff --git a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.manpage b/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.manpage
index 2c5a6ad20..d8fce4f22 100644
--- a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.manpage
+++ b/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.manpage
@@ -1,10 +1,10 @@
 .\" This file was generated by kdemangen.pl
-.TH SHOWFOTO 1 "Feb 2005" "K Desktop Environment" "digiKam Photo Viewer"
+.TH SHOWFOTO 1 "Feb 2005" "Trinity Desktop Environment" "digiKam Photo Viewer"
 .SH NAME
 showfoto
 \- digiKam Photo Viewer
 .SH SYNOPSIS
-showfoto [Qt\-options] [KDE\-options] [file(s)] 
+showfoto [Qt\-options] [TDE\-options] [file(s)] 
 .SH DESCRIPTION
 digiKam Photo Viewer
 .SH OPTIONS
@@ -19,8 +19,8 @@ Show help about options
 .B  \-\-help\-qt  
 Show Qt specific options
 .TP
-.B  \-\-help\-kde  
-Show KDE specific options
+.B  \-\-help\-tde  
+Show TDE specific options
 .TP
 .B  \-\-help\-all  
 Show all options
@@ -37,7 +37,7 @@ Show license information
 .B  \-\-  
 End of options
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -134,7 +134,7 @@ mirrors the whole layout of widgets
 .SS 
 
 .SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
+Full user documentation is available through the TDE Help Center.  You can also enter the URL
 .BR help:/showfoto/
 directly into konqueror or you can run 
 .BR "`khelpcenter help:/showfoto/'"
diff --git a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.menu b/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.menu
index 4210733e4..f7eea4b3b 100644
--- a/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.menu
+++ b/ubuntu/maverick/applications/digikam/debian/showfoto-trinity.menu
@@ -1,4 +1,4 @@
-?package(showfoto):\
+?package(showfoto-trinity):\
 	needs="X11"\
 	section="Applications/Viewers"\
 	title="showfoto"\