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

8 files changed, 35 insertions, 35 deletions

diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/versions.pl b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/libraries/kipi-plugins/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/libraries/kipi-plugins/debian/control b/ubuntu/maverick/libraries/kipi-plugins/debian/control
index ed1e0ab89..eaab27dbe 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control
@@ -20,7 +20,7 @@ Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagi
 Suggests: gimp, gallery, kipi-plugins-trinity-doc
 Enhances: digikam-trinity, kphotoalbum-trinity, showimg, gwenview-trinity
 Description: image manipulation/handling plugins for KIPI aware programs [Trinity]
- KIPI plugins (KDE Image Plugin Interface) is an effort to develop a
+ KIPI plugins (TDE Image Plugin Interface) is an effort to develop a
  common plugin structure for Digikam, KPhotoAlbum (formerly known as
  KimDaBa), Showimg and Gwenview.
  Its aim is to share image plugins among graphic applications.
@@ -72,7 +72,7 @@ Breaks: kipi-plugins-kde3-doc (<< 4:14.0.0~), kipi-plugins-trinity-doc (<< 4:14.
 Depends: khelpcenter-trinity
 Suggests: kipi-plugins-trinity
 Description: kipi-plugins documentation [Trinity]
- KIPI plugins (KDE Image Plugin Interface) is an effort to develop a
+ KIPI plugins (TDE Image Plugin Interface) is an effort to develop a
  common plugin structure for Digikam, KPhotoAlbum (formerly known as
  KimDaBa), Showimg and Gwenview.
  Its aim is to share image plugins among graphic applications.
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/control.in b/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
index 2903acee5..f6fe7c2cf 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/control.in
@@ -20,7 +20,7 @@ Recommends: k3b-trinity, graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagi
 Suggests: gimp, gallery, kipi-plugins-trinity-doc
 Enhances: digikam-trinity, kphotoalbum-trinity, showimg, gwenview-trinity
 Description: image manipulation/handling plugins for KIPI aware programs [Trinity]
- KIPI plugins (KDE Image Plugin Interface) is an effort to develop a
+ KIPI plugins (TDE Image Plugin Interface) is an effort to develop a
  common plugin structure for Digikam, KPhotoAlbum (formerly known as
  KimDaBa), Showimg and Gwenview.
  Its aim is to share image plugins among graphic applications.
@@ -70,7 +70,7 @@ Section: doc
 Depends: khelpcenter-trinity
 Suggests: kipi-plugins-trinity
 Description: kipi-plugins documentation [Trinity]
- KIPI plugins (KDE Image Plugin Interface) is an effort to develop a
+ KIPI plugins (TDE Image Plugin Interface) is an effort to develop a
  common plugin structure for Digikam, KPhotoAlbum (formerly known as
  KimDaBa), Showimg and Gwenview.
  Its aim is to share image plugins among graphic applications.
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/versions.pl b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/libraries/libkdcraw/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/libraries/libkexiv2/debian/cdbs/versions.pl b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/libraries/libkexiv2/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/libraries/libkipi/debian/cdbs/versions.pl b/ubuntu/maverick/libraries/libkipi/debian/cdbs/versions.pl
index 75c9add4b..1b110f7af 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/versions.pl
+++ b/ubuntu/maverick/libraries/libkipi/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/libraries/pytdeextensions/debian/control b/ubuntu/maverick/libraries/pytdeextensions/debian/control
index 985e1a93c..b00cc93d5 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/control
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/control
@@ -15,9 +15,9 @@ Replaces: pykdeextensions-kde3 (<< 4:14.0.0~), pykdeextensions-trinity (<< 4:14.
 Breaks: pykdeextensions-kde3 (<< 4:14.0.0~), pykdeextensions-trinity (<< 4:14.0.0~)
 Conflicts: pykdeextensions
 Provides: ${python:Provides}
-Description: Python packages to support KDE applications (scripts) [Trinity]
- PyKDE Extensions is a collection of software and Python packages
- to support the creation and installation of KDE applications.
+Description: Python packages to support TDE applications (scripts) [Trinity]
+ PyTDE Extensions is a collection of software and Python packages
+ to support the creation and installation of TDE applications.
  .
   Homepage: http://www.simonzone.com/software/pytdeextensions
 
@@ -27,9 +27,9 @@ Section: libdevel
 Replaces: libpythonize0-kde3-dev (<< 4:14.0.0~), libpythonize0-trinity-dev (<< 4:14.0.0~)
 Breaks: libpythonize0-kde3-dev (<< 4:14.0.0~), libpythonize0-trinity-dev (<< 4:14.0.0~)
 Depends: libpythonize0-trinity (= ${binary:Version}), python-all-dev
-Description: Python packages to support KDE applications (development) [Trinity]
- PyKDE Extensions is a collection of software and Python packages
- to support the creation and installation of KDE applications.
+Description: Python packages to support TDE applications (development) [Trinity]
+ PyTDE Extensions is a collection of software and Python packages
+ to support the creation and installation of TDE applications.
  .
  This package contains the libpythonize development files.
  .
@@ -42,9 +42,9 @@ Replaces: libpythonize0-kde3 (<< 4:14.0.0~), libpythonize0-trinity (<< 4:14.0.0~
 Breaks: libpythonize0-kde3 (<< 4:14.0.0~), libpythonize0-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libpythonize0
-Description: Python packages to support KDE applications (library) [Trinity]
- PyKDE Extensions is a collection of software and Python packages
- to support the creation and installation of KDE applications.
+Description: Python packages to support TDE applications (library) [Trinity]
+ PyTDE Extensions is a collection of software and Python packages
+ to support the creation and installation of TDE applications.
  .
  This package contains the libpythonize library files.
  .
diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control
index 5ababab48..113813f16 100644
--- a/ubuntu/maverick/libraries/python-trinity/debian/control
+++ b/ubuntu/maverick/libraries/python-trinity/debian/control
@@ -17,7 +17,7 @@ Provides: ${python:Provides}
 Conflicts: python-trinity-trinity
 Description: Trinity bindings for Python [Trinity]
  Python binding module that provides wide access to the Trinity API,
- also known as PyKDE. Using this, you'll get (for example) classes
+ also known as PyTDE. Using this, you'll get (for example) classes
  from kio, kjs, tdehtml and kprint.
 
 Package: python-trinity-trinity-dbg
@@ -28,7 +28,7 @@ Breaks: python-kde3-kde3-dbg (<< 4:14.0.0~), python-trinity-trinity-dbg (<< 4:14
 Depends: python-trinity-trinity (= ${binary:Version}), python-dbg, python-tqt-dbg, ${shlibs:Depends}
 Description: Trinity bindings for Python (debug extensions) [Trinity]
  Python binding module that provides wide access to the Trinity API,
- also known as PyKDE. Using this, you'll get (for example) classes
+ also known as PyTDE. Using this, you'll get (for example) classes
  from kio, kjs, tdehtml and kprint.
  .
  This package contains the extension built for the Python debug interpreter.
@@ -40,8 +40,8 @@ Replaces: python-kde3-kde3-dev (<< 4:14.0.0~), python-trinity-trinity-dev (<< 4:
 Breaks: python-kde3-kde3-dev (<< 4:14.0.0~), python-trinity-trinity-dev (<< 4:14.0.0~)
 Depends: pytqt-tools, ${python:Depends}
 Description: Trinity bindings for Python - Development files and scripts [Trinity]
- Development .sip files with definitions of PyKDE classes. They
- are needed to build PyKDE, but also as building blocks of other
+ Development .sip files with definitions of PyTDE classes. They
+ are needed to build PyTDE, but also as building blocks of other
  packages based on them. 
  The package also contains tdepyuic, a wrapper script around PyTQt's
  user interface compiler.
@@ -51,6 +51,6 @@ Section: doc
 Architecture: all
 Replaces: python-kde3-kde3-doc (<< 4:14.0.0~), python-trinity-trinity-doc (<< 4:14.0.0~)
 Breaks: python-kde3-kde3-doc (<< 4:14.0.0~), python-trinity-trinity-doc (<< 4:14.0.0~)
-Description: Documentation and examples for PyKDE [Trinity]
- General documentation and examples for PyKDE providing programming
+Description: Documentation and examples for PyTDE [Trinity]
+ General documentation and examples for PyTDE providing programming
  tips and working code you can use to learn from.