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

4 files changed, 15 insertions, 15 deletions

diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kbarcode/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/applications/kbarcode/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/kbarcode/debian/control b/ubuntu/maverick/applications/kbarcode/debian/control
index 95f3796db..7751c246c 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/control
+++ b/ubuntu/maverick/applications/kbarcode/debian/control
@@ -11,8 +11,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, barcode, imagemagick
 Replaces: kbarcode-kde3 (<< 4:14.0.0~), kbarcode-trinity (<< 4:14.0.0~)
 Breaks: kbarcode-kde3 (<< 4:14.0.0~), kbarcode-trinity (<< 4:14.0.0~)
-Recommends: libqt3-mt-mysql | libqt3-mt-psql | libqt3-mt-odbc | libqt3-mt-sqlite |
- libqt3-mt-ibase
+Recommends: libtqt3-mt-mysql | libtqt3-mt-psql | libtqt3-mt-odbc | libtqt3-mt-sqlite |
+ libtqt3-mt-ibase
 Description: barcode and label printing application for Trinity
  KBarcode is a barcode and label printing application for Trinity. It can be used
  to print everything from simple business cards up to complex labels with
@@ -23,7 +23,7 @@ Description: barcode and label printing application for Trinity
  note), thousands of predefined labels, database management tools and
  translations in many languages. Even printing more than 10.000 labels in one
  go is no problem for KBarcode. Data for printing can be imported from several
- different data sources, including SQL databases, CSV files and the KDE address
+ different data sources, including SQL databases, CSV files and the TDE address
  book.
  .
  Additionally it is a simple barcode generator (similar to the old xbarcode you
diff --git a/ubuntu/maverick/applications/kbarcode/debian/kbarcode.1 b/ubuntu/maverick/applications/kbarcode/debian/kbarcode.1
index 12d3bfaad..b81aee534 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/kbarcode.1
+++ b/ubuntu/maverick/applications/kbarcode/debian/kbarcode.1
@@ -1,12 +1,12 @@
 .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand
-.TH KBARCODE 1 "Jun 2006" "K Desktop Environment" "barcode and label printing"
+.TH KBARCODE 1 "Jun 2006" "Trinity Desktop Environment" "barcode and label printing"
 .SH NAME
 kbarcode
 \- KBarcode is a barcode and label printing application
 .SH SYNOPSIS
-\fBkbarcode\fP [Qt\-options] [KDE\-options] [\fIfile\fP]
+\fBkbarcode\fP [Qt\-options] [TDE\-options] [\fIfile\fP]
 .SH DESCRIPTION
-\fBKBarcode\fP is a barcode and label printing application for KDE. It can be used to print everything from simple business cards up to complex labels with several barcodes, such as article descriptions.
+\fBKBarcode\fP is a barcode and label printing application for TDE. It can be used to print everything from simple business cards up to complex labels with several barcodes, such as article descriptions.
 .sp 1
 \fBKBarcode\fP comes with an easy\-to\-use WYSIWYG label designer, a setup wizard, batch import of labels (directly from the delivery note), thousands of predefined labels, database management tools, and translations in many languages.
 .sp 1
@@ -53,8 +53,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
@@ -137,7 +137,7 @@ disable XIM
 .B  \-\-reverse  
 mirrors the whole layout of widgets
 .SS 
-.SS KDE options:
+.SS TDE options:
 .TP
 .B  \-\-caption  <caption>
 Use 'caption' as name in the titlebar
@@ -187,7 +187,7 @@ Stefan "Stonki" Onken <support@stonki.de>
 
 .br
 .fi
-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.
 .PP
 This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the \fBDebian\fP Project (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version or any later version published by the Free Software Foundation.
 .PP
diff --git a/ubuntu/maverick/applications/kbarcode/debian/menu b/ubuntu/maverick/applications/kbarcode/debian/menu
index e27b90141..33f4f83da 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/menu
+++ b/ubuntu/maverick/applications/kbarcode/debian/menu
@@ -1,4 +1,4 @@
-?package(kbarcode):\
+?package(kbarcode-trinity):\
   needs="X11"\
   section="Applications/Graphics"\
   hints="TDE,Barcode"\