Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

5 files changed, 19 insertions, 19 deletions

diff --git a/ubuntu/maverick/applications/kuickshow/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kuickshow/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/kuickshow/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/kuickshow/debian/control b/ubuntu/maverick/applications/kuickshow/debian/control
index cae8dc6b2..ae7096ed2 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/control
+++ b/ubuntu/maverick/applications/kuickshow/debian/control
@@ -12,7 +12,7 @@ Replaces: kuickshow-kde3 (<< 4:14.0.0~), kuickshow-trinity (<< 4:14.0.0~)
 Breaks: kuickshow-kde3 (<< 4:14.0.0~), kuickshow-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: KDE image/slideshow viewer [Trinity]
+Description: TDE image/slideshow viewer [Trinity]
  KuickShow is an image browser/viewer with a nice filebrowser to
  select images to be shown, slideshow support and the ability to
  display the following image formats: jpg, gif, tiff, png, bmp, psd,
@@ -20,7 +20,7 @@ Description: KDE image/slideshow viewer [Trinity]
  window, as large as the image, or fullscreen (which shrinks images too
  large to display). KuickShow also has a slideshow mode.
  .
- This package is part of KDE, as a component of the KDE graphics
- module. See the 'kde' and 'tdegraphics' packages for more information.
+ This package is part of TDE, as a component of the TDE graphics
+ module. See the 'tde' and 'tdegraphics' packages for more information.
  .
  Homepage: http://kuickshow.sourceforge.net
diff --git a/ubuntu/maverick/applications/kuickshow/debian/control.in b/ubuntu/maverick/applications/kuickshow/debian/control.in
index b1c3bdfc5..8fca1b521 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/control.in
+++ b/ubuntu/maverick/applications/kuickshow/debian/control.in
@@ -12,7 +12,7 @@ Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter-trinity
-Description: KDE image/slideshow viewer [Trinity]
+Description: TDE image/slideshow viewer [Trinity]
  KuickShow is an image browser/viewer with a nice filebrowser to
  select images to be shown, slideshow support and the ability to
  display the following image formats: jpg, gif, tiff, png, bmp, psd,
@@ -20,7 +20,7 @@ Description: KDE image/slideshow viewer [Trinity]
  window, as large as the image, or fullscreen (which shrinks images too
  large to display). KuickShow also has a slideshow mode.
  .
- This package is part of KDE, as a component of the KDE graphics
- module. See the 'kde' and 'tdegraphics' packages for more information.
+ This package is part of TDE, as a component of the TDE graphics
+ module. See the 'tde' and 'tdegraphics' packages for more information.
  .
  Homepage: http://kuickshow.sourceforge.net
diff --git a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.menu b/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.menu
index eb28ff0fe..b76eb47d9 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/ubuntu/maverick/applications/kuickshow/debian/kuickshow-trinity.menu
@@ -1,4 +1,4 @@
-?package(kuickshow):\
+?package(kuickshow-trinity):\
 	needs="X11"\
 	section="Apps/Graphics"\
 	hints="TDE"\
diff --git a/ubuntu/maverick/applications/kuickshow/debian/man/kuickshow.1 b/ubuntu/maverick/applications/kuickshow/debian/man/kuickshow.1
index 2675eae4e..bf5caf30c 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/man/kuickshow.1
+++ b/ubuntu/maverick/applications/kuickshow/debian/man/kuickshow.1
@@ -1,13 +1,13 @@
-.TH KUICKSHOW "1" "September 2002" KDE "KDE Application"
+.TH KUICKSHOW "1" "September 2002" TDE "TDE Application"
 .SH NAME
-kuickshow \- KDE Image Viewer
+kuickshow \- TDE Image Viewer
 .SH SYNOPSIS
 .B kuickshow
-[\fIQt-options\fR] [\fIKDE-options\fR] [\fIoptions\fR] [\fIfiles\fR]
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIoptions\fR] [\fIfiles\fR]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B Kuickshow
-KDE Application.
+TDE Application.
 This manual page was written for the Debian GNU/Linux distribution
 because the original program does not have a manual page.
 .P
@@ -40,7 +40,7 @@ The following image formats are supported:
 Images can be displayed either in their own window, as large as the
 image, or fullscreen. 
 .P
-This program is part of the official KDE graphics module.
+This program is part of the official TDE graphics module.
 .SS "Generic options:"
 .TP
 \fB\-\-help\fR
@@ -49,8 +49,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
@@ -90,7 +90,7 @@ KuickShow was written by
 Carsten Pfeiffer <pfeiffer@kde.org>.
 .hy
 .br
-Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+Please use http://bugs.trinitydesktop.org to report bugs, do not mail the authors directly.
 .br
 This manual page was prepared by
 .nh