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

6 files changed, 23 insertions, 23 deletions

diff --git a/ubuntu/maverick/applications/bibletime/debian/cdbs/versions.pl b/ubuntu/maverick/applications/bibletime/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/bibletime/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/bibletime/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/bibletime/debian/control b/ubuntu/maverick/applications/bibletime/debian/control
index 55844da60..a76e9cae7 100644
--- a/ubuntu/maverick/applications/bibletime/debian/control
+++ b/ubuntu/maverick/applications/bibletime/debian/control
@@ -16,7 +16,7 @@ Suggests: bibletime-i18n-trinity
 Provides: sword-frontend
 Description: A bible study tool for Trinity
  BibleTime is a free and easy to use bible study tool for UNIX systems.
- It requires a working KDE environment and the SWORD library.
+ It requires a working TDE environment and the SWORD library.
  BibleTime provides easy handling of digitized texts (Bibles, commentaries
  and lexicons) and powerful features to work with these texts (search in
  texts, write own notes, save, print etc.).
diff --git a/ubuntu/maverick/applications/bibletime/debian/control.in b/ubuntu/maverick/applications/bibletime/debian/control.in
index e454487c3..59c17465d 100644
--- a/ubuntu/maverick/applications/bibletime/debian/control.in
+++ b/ubuntu/maverick/applications/bibletime/debian/control.in
@@ -15,7 +15,7 @@ Suggests: bibletime-i18n-trinity
 Provides: sword-frontend
 Description: A bible study tool for Trinity
  BibleTime is a free and easy to use bible study tool for UNIX systems.
- It requires a working KDE environment and the SWORD library.
+ It requires a working TDE environment and the SWORD library.
  BibleTime provides easy handling of digitized texts (Bibles, commentaries
  and lexicons) and powerful features to work with these texts (search in
  texts, write own notes, save, print etc.).
diff --git a/ubuntu/maverick/applications/bibletime/debian/de/bibletime.1 b/ubuntu/maverick/applications/bibletime/debian/de/bibletime.1
index 6b662b132..a7b223af3 100644
--- a/ubuntu/maverick/applications/bibletime/debian/de/bibletime.1
+++ b/ubuntu/maverick/applications/bibletime/debian/de/bibletime.1
@@ -1,20 +1,20 @@
-.TH "BibleTime" "1" "17. Juli 2004" "BibleTime 1.4.1" "KDE Application"
+.TH "BibleTime" "1" "17. Juli 2004" "BibleTime 1.4.1" "TDE Application"
 .SH "NAME"
-bibletime \- Software für das Bibelstudium für KDE
+bibletime \- Software für das Bibelstudium für TDE
 .SH "ÜBERSICHT"
 .B bibletime
 [
 \fIQt\-Optionen\fR
 ] 
 [
-\fIKDE\-Optionen\fR
+\fITDE\-Optionen\fR
 ]
 [
 \fIOptionen\fR
 ]
 .SH "BESCHREIBUNG"
 Diese Manpage beschreibt die 
-KDE\-Applikation
+TDE\-Applikation
 .B bibletime
 und wurde für Debian GNU/Linux geschrieben, weil
 das Programm selbst keine Manpage mitbrachte.
@@ -22,7 +22,7 @@ das Programm selbst keine Manpage mitbrachte.
 .B BibleTime
 ist ein freies und einfach zu bedienendes Hilfsmittel zum Bibelstudium
 für UNIX\-Systeme.
-Es erfordert eine laufende KDE\-Umgebung und die Bibliothek SWORD.
+Es erfordert eine laufende TDE\-Umgebung und die Bibliothek SWORD.
 BibleTime ermöglicht den einfachen Umgang mit digitalen Texten (Bibeln, 
 Kommentare und Lexikas) und bietet leistungsfähige Funktionen, um mit diesen
 Texten zu arbeiten (suchen in Texten, eigene Notizen schreiben, speichern,
@@ -35,8 +35,8 @@ Optionen von "Hilfe zu" anzeigen
 \fB\-\-help\-qt\fR
 Spezielle Optionen zu Qt anzeigen
 .TP 
-\fB\-\-help\-kde\fR
-Spezielle Optionen zu KDE anzeigen
+\fB\-\-help\-tde\fR
+Spezielle Optionen zu TDE anzeigen
 .TP 
 \fB\-\-help\-all\fR
 Alle Optionen anzeigen
@@ -79,7 +79,7 @@ das komplette Handbuch zugänglich machen.
 .SH "FEHLER"
 Bitte melden Sie Fehler an 
 .br 
-http://bugs.kde.org oder info@bibletime.info ,
+http://bugs.trinitydesktop.org oder info@bibletime.info ,
 .br 
 nicht direkt an die Autoren.
 .br 
diff --git a/ubuntu/maverick/applications/bibletime/debian/en/bibletime.1 b/ubuntu/maverick/applications/bibletime/debian/en/bibletime.1
index b71192301..46332c7d9 100644
--- a/ubuntu/maverick/applications/bibletime/debian/en/bibletime.1
+++ b/ubuntu/maverick/applications/bibletime/debian/en/bibletime.1
@@ -1,13 +1,13 @@
-.TH "BibleTime" "1" "July 17, 2004" "BibleTime 1.4.1" "KDE Application"
+.TH "BibleTime" "1" "July 17, 2004" "BibleTime 1.4.1" "TDE Application"
 .SH "NAME"
-bibletime \- Bible study tool for KDE
+bibletime \- Bible study tool for TDE
 .SH "SYNOPSIS"
 .B bibletime
 [
 \fIQt\-options\fR
 ] 
 [
-\fIKDE\-options\fR
+\fITDE\-options\fR
 ]
 [
 \fIoptions\fR
@@ -15,13 +15,13 @@ bibletime \- Bible study tool for KDE
 .SH "DESCRIPTION"
 This manual page documents briefly the
 .B bibletime
-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
 .B BibleTime
 is a free and easy to use bible study tool for UNIX systems.
-It requires a working KDE environment and the SWORD library.
+It requires a working TDE environment and the SWORD library.
 BibleTime provides easy handling of digitized texts (Bibles, commentaries
 and lexicons) and powerful features to work with these texts (search in
 texts, write own notes, save, print etc.).
@@ -33,8 +33,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
@@ -79,7 +79,7 @@ should give you access to the complete manual.
 .SH "BUGS"
 Please use 
 .br 
-http://bugs.kde.org or info@bibletime.info 
+http://bugs.trinitydesktop.org or info@bibletime.info 
 .br 
 to report bugs, do not mail the authors directly.
 .br 
diff --git a/ubuntu/maverick/applications/bibletime/debian/menu b/ubuntu/maverick/applications/bibletime/debian/menu
index cf2c01b5d..ad90450f6 100644
--- a/ubuntu/maverick/applications/bibletime/debian/menu
+++ b/ubuntu/maverick/applications/bibletime/debian/menu
@@ -1,4 +1,4 @@
-?package(bibletime):\
+?package(bibletime-trinity):\
     needs="X11"\
     hints="TDE,Bible"\
     section="Applications/Education"\