merge

6 files changed, 21 insertions, 21 deletions

diff --git a/ubuntu/maverick/applications/k3b/debian/cdbs/versions.pl b/ubuntu/maverick/applications/k3b/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/k3b/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/k3b/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/k3b/debian/control b/ubuntu/maverick/applications/k3b/debian/control
index 145c361f3..4409688e4 100644
--- a/ubuntu/maverick/applications/k3b/debian/control
+++ b/ubuntu/maverick/applications/k3b/debian/control
@@ -15,7 +15,7 @@ Replaces: k3b-kde3 (<< 4:14.0.0~), k3b-trinity (<< 4:14.0.0~)
 Breaks: k3b-kde3 (<< 4:14.0.0~), k3b-trinity (<< 4:14.0.0~)
 Recommends: dvd+rw-tools, libk3b3-extracodecs-trinity
 Suggests: k3b-i18n-trinity, normalize-audio, toolame, sox, movixmaker-2, vcdimager (>= 0.7)
-Description: A sophisticated KDE CD burning application [Trinity]
+Description: A sophisticated TDE CD burning application [Trinity]
  K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
  that come with cd recording.
@@ -33,7 +33,7 @@ Conflicts: k3b-trinity (<< 1.0.4-4)
 Architecture: all
 Replaces: k3b-data-kde3 (<< 4:14.0.0~), k3b-data-trinity (<< 4:14.0.0~)
 Breaks: k3b-data-kde3 (<< 4:14.0.0~), k3b-data-trinity (<< 4:14.0.0~)
-Description: A sophisticated KDE CD burning application - data files [Trinity]
+Description: A sophisticated TDE CD burning application - data files [Trinity]
  K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
  that come with cd recording.
@@ -47,7 +47,7 @@ Replaces: libk3b-kde3-dev (<< 4:14.0.0~), libk3b-trinity-dev (<< 4:14.0.0~)
 Breaks: libk3b-kde3-dev (<< 4:14.0.0~), libk3b-trinity-dev (<< 4:14.0.0~)
 Architecture: any
 Depends: libk3b3-trinity (= ${binary:Version})
-Description: The KDE cd burning application library - development files [Trinity]
+Description: The TDE cd burning application library - development files [Trinity]
  K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
  that come with cd recording and a lot more.
@@ -61,7 +61,7 @@ Replaces: libk3b3-kde3 (<< 4:14.0.0~), libk3b3-trinity (<< 4:14.0.0~)
 Breaks: libk3b3-kde3 (<< 4:14.0.0~), libk3b3-trinity (<< 4:14.0.0~)
 Conflicts: libk3bcore-trinity, libk3bplugin-trinity, libk3btools-trinity, libk3bproject-trinity, k3blibs-trinity, libk3b2-trinity
 Depends: ${shlibs:Depends}
-Description: The KDE cd burning application library - runtime files [Trinity]
+Description: The TDE cd burning application library - runtime files [Trinity]
  K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
  that come with cd recording and a lot more.
@@ -75,7 +75,7 @@ Replaces: libk3b3-extracodecs-kde3 (<< 4:14.0.0~), libk3b3-extracodecs-trinity (
 Breaks: libk3b3-extracodecs-kde3 (<< 4:14.0.0~), libk3b3-extracodecs-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Conflicts: libk3b2-mp3-trinity
-Description: The KDE cd burning application library - extra decoders [Trinity]
+Description: The TDE cd burning application library - extra decoders [Trinity]
  K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
  Its aim is to provide a very user friendly interface to all the tasks
  that come with cd recording and a lot more.
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.1 b/ubuntu/maverick/applications/k3b/debian/k3b-trinity.1
index abbd41f07..08ca27b5f 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.1
+++ b/ubuntu/maverick/applications/k3b/debian/k3b-trinity.1
@@ -1,20 +1,20 @@
-.TH K3B "1" "December 2002" KDE "KDE Application"
+.TH K3B "1" "December 2002" TDE "TDE Application"
 .SH NAME
-k3b \- KDE CD burning program
+k3b \- TDE CD burning program
 .SH SYNOPSIS
 .B k3b
-[\fIQt-options\fR] [\fIKDE-options\fR] [\fIFile\fR]
+[\fIQt-options\fR] [\fITDE-options\fR] [\fIFile\fR]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B k3b
-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.
 .PP
 K3b is a CD burning program that has two aims:
 usability and as many features as possible.
 .P
-This program is part of the official KDE extra gear #1 module.
+This program is part of the official TDE extra gear #1 module.
 .SH OPTIONS
 .SS "Arguments:"
 .TP
@@ -27,8 +27,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
@@ -148,7 +148,7 @@ disable XIM.
 .TP
 .B \-\-reverse
 mirrors the whole layout of widgets.
-.SS "KDE options:"
+.SS "TDE options:"
 .TP
 .BI \-\-caption \ caption
 Use \fIcaption\fP as name in the titlebar.
@@ -184,7 +184,7 @@ Sebastian Trueg <trueg@informatik.uni-freiburg.de>
 and Thomas Froescher <tfroescher@gmx.de>.
 .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
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.menu b/ubuntu/maverick/applications/k3b/debian/k3b-trinity.menu
index 52a67ba44..e3ec0ef1f 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b-trinity.menu
+++ b/ubuntu/maverick/applications/k3b/debian/k3b-trinity.menu
@@ -1,4 +1,4 @@
-?package(k3b):\
+?package(k3b-trinity):\
 	needs="X11"\
 	section="Applications/File Management"\
 	title="K3b"\
diff --git a/ubuntu/maverick/applications/k3b/debian/k3b.menu b/ubuntu/maverick/applications/k3b/debian/k3b.menu
index 52a67ba44..e3ec0ef1f 100644
--- a/ubuntu/maverick/applications/k3b/debian/k3b.menu
+++ b/ubuntu/maverick/applications/k3b/debian/k3b.menu
@@ -1,4 +1,4 @@
-?package(k3b):\
+?package(k3b-trinity):\
 	needs="X11"\
 	section="Applications/File Management"\
 	title="K3b"\
diff --git a/ubuntu/maverick/applications/k3b/debian/rules b/ubuntu/maverick/applications/k3b/debian/rules
index 4273756e6..18410f4b5 100755
--- a/ubuntu/maverick/applications/k3b/debian/rules
+++ b/ubuntu/maverick/applications/k3b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/kde.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
 DEB_CONFIGURE_PREFIX := /opt/trinity
 DEB_CONFIGURE_INFODIR := /opt/trinity/share/info