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

3 files changed, 11 insertions, 11 deletions

diff --git a/ubuntu/maverick/applications/adept/debian/changelog b/ubuntu/maverick/applications/adept/debian/changelog
index b4f4234f3..58496db32 100644
--- a/ubuntu/maverick/applications/adept/debian/changelog
+++ b/ubuntu/maverick/applications/adept/debian/changelog
@@ -18,7 +18,7 @@ adept-trinity (2.1.3ubuntu11) karmic; urgency=low
 
 adept-trinity (2.1.3ubuntu10) jaunty; urgency=low
 
-  * Moved KDE3 to /opt/trinity
+  * Moved Trinity to /opt/trinity
   * Integrated properly with KDE4.2+
 
  -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 04 March 2009 01:08:00 -0600
diff --git a/ubuntu/maverick/applications/adept/debian/control b/ubuntu/maverick/applications/adept/debian/control
index 407da25d0..64cc6d154 100644
--- a/ubuntu/maverick/applications/adept/debian/control
+++ b/ubuntu/maverick/applications/adept/debian/control
@@ -11,7 +11,7 @@ Package: adept-trinity
 Section: kde
 Depends: adept-manager-trinity, adept-installer-trinity, adept-updater-trinity, adept-notifier-trinity, adept-batch-trinity
 Architecture: all
-Description: package management suite for KDE3
+Description: package management suite for Trinity
  These packages belong to the adept suite:
   * adept-manager-trinity - package manager
   * adept-installer-trinity - application manager
@@ -22,7 +22,7 @@ Package: adept-common-trinity
 Section: kde
 Depends: debtags (>= 1.6.1), konsole-trinity (>= 3.5.0), ${shlibs:Depends}
 Architecture: all
-Description: package manager for KDE3 -- common files
+Description: package manager for Trinity -- common files
  Icons and other common files for all adept components.
 
 Package: adept-manager-trinity
@@ -30,7 +30,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: package manager for KDE3
+Description: package manager for Trinity
  Adept Manager is a graphical user interface for package management.
  .
  Besides these basic functions the following features are provided:
@@ -47,7 +47,7 @@ Section: kde
 Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: simple user interface for application management (for KDE3)
+Description: simple user interface for application management (for Trinity)
  Adept Installer presents a list of applications available through the
  Advanced Package Tool (APT). An application is considered a package
  that contains a .desktop file for use with KDE, GNOME or other
@@ -61,7 +61,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: system update tool for KDE3
+Description: system update tool for Trinity
  Adept Updater provides a simple wizard-style user interface to system
  upgrades. It uses same algorithms as apt-get dist-upgrade.
  .
diff --git a/ubuntu/maverick/applications/adept/debian/control.in b/ubuntu/maverick/applications/adept/debian/control.in
index df390b4e6..2c9a1ea70 100644
--- a/ubuntu/maverick/applications/adept/debian/control.in
+++ b/ubuntu/maverick/applications/adept/debian/control.in
@@ -11,7 +11,7 @@ Package: adept-trinity
 Section: kde
 Depends: adept-manager-trinity, adept-installer-trinity, adept-updater-trinity, adept-notifier-trinity, adept-batch-trinity
 Architecture: all
-Description: package management suite for KDE3
+Description: package management suite for Trinity
  These packages belong to the adept suite:
   * adept-manager-trinity - package manager
   * adept-installer-trinity - application manager
@@ -22,7 +22,7 @@ Package: adept-common-trinity
 Section: kde
 Depends: debtags (>= 1.6.1), konsole-trinity (>= 3.5.0), ${shlibs:Depends}
 Architecture: all
-Description: package manager for KDE3 -- common files
+Description: package manager for Trinity -- common files
  Icons and other common files for all adept components.
 
 Package: adept-manager-trinity
@@ -30,7 +30,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: package manager for KDE3
+Description: package manager for Trinity
  Adept Manager is a graphical user interface for package management.
  .
  Besides these basic functions the following features are provided:
@@ -47,7 +47,7 @@ Section: kde
 Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: simple user interface for application management (for KDE3)
+Description: simple user interface for application management (for Trinity)
  Adept Installer presents a list of applications available through the
  Advanced Package Tool (APT). An application is considered a package
  that contains a .desktop file for use with KDE, GNOME or other
@@ -61,7 +61,7 @@ Section: kde
 Depends: adept-common-trinity, ${shlibs:Depends}
 Recommends: libqt-perl
 Architecture: any
-Description: system update tool for KDE3
+Description: system update tool for Trinity
  Adept Updater provides a simple wizard-style user interface to system
  upgrades. It uses same algorithms as apt-get dist-upgrade.
  .