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

2 files changed, 30 insertions, 30 deletions

diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index 848ece787..6967dbe4c 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -1,5 +1,5 @@
 Source: tdepim-trinity
-Section: kde
+Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
@@ -18,7 +18,7 @@ Build-Conflicts: libkleopatra0-trinity-dev
 Standards-Version: 3.8.4
 
 Package: tdepim-trinity
-Section: kde
+Section: tde
 Architecture: all
 Replaces: kdepim-trinity (<< 4:14.0.0)
 Breaks: kdepim-trinity (<< 4:14.0.0)
@@ -128,7 +128,7 @@ Description: KDE NG addressbook application
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kalarm-trinity
-Section: kde
+Section: tde
 Architecture: any
 Replaces: kalarm-trinity (<< 4:14.0.0)
 Breaks: kalarm-trinity (<< 4:14.0.0)
@@ -184,7 +184,7 @@ Description: Trinity time tracker tool
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: tdepim-kfile-plugins-trinity
-Section: kde
+Section: tde
 Architecture: any
 Replaces: kdepim-kfile-plugins-trinity (<< 4:14.0.0)
 Breaks: kdepim-kfile-plugins-trinity (<< 4:14.0.0)
@@ -196,7 +196,7 @@ Description: KDE File dialog plugins for palm and vcf files
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: tdepim-kio-plugins-trinity
-Section: kde
+Section: tde
 Architecture: any
 Replaces: kdepim-kio-plugins-trinity (<< 4:14.0.0)
 Breaks: kdepim-kio-plugins-trinity (<< 4:14.0.0)
@@ -209,7 +209,7 @@ Description: Trinity pim I/O Slaves
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: tdepim-kresources-trinity
-Section: kde
+Section: tde
 Architecture: any
 Replaces: kdepim-kresources-trinity (<< 4:14.0.0)
 Breaks: kdepim-kresources-trinity (<< 4:14.0.0)
@@ -225,7 +225,7 @@ Description: Trinity pim resource plugins
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: tdepim-wizards-trinity
-Section: kde
+Section: tde
 Architecture: any
 Replaces: kdepim-wizards-trinity (<< 4:14.0.0)
 Breaks: kdepim-wizards-trinity (<< 4:14.0.0)
@@ -239,7 +239,7 @@ Description: Trinity server configuration wizards
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kitchensync-trinity
-Section: kde
+Section: tde
 Architecture: any
 Replaces: kitchensync-trinity (<< 4:14.0.0)
 Breaks: kitchensync-trinity (<< 4:14.0.0)
@@ -319,7 +319,7 @@ Description: Trinity news reader
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: knotes-trinity
-Section: kde
+Section: tde
 Architecture: any
 Replaces: knotes-trinity (<< 4:14.0.0)
 Breaks: knotes-trinity (<< 4:14.0.0)
@@ -349,7 +349,7 @@ Description: Helper library for programmatic generation of C++ code
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: konsolekalendar-trinity
-Section: kde
+Section: tde
 Architecture: any
 Replaces: konsolekalendar-trinity (<< 4:14.0.0)
 Breaks: konsolekalendar-trinity (<< 4:14.0.0)
@@ -363,7 +363,7 @@ Description: Trinity konsole personal organizer
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: kontact-trinity
-Section: kde
+Section: tde
 Architecture: any
 Replaces: kontact-trinity (<< 4:14.0.0)
 Breaks: kontact-trinity (<< 4:14.0.0)
@@ -383,7 +383,7 @@ Description: Trinity pim application
   Homepage: http://kontact.kde.org/
 
 Package: korganizer-trinity
-Section: kde
+Section: tde
 Architecture: any
 Replaces: korganizer-trinity (<< 4:14.0.0)
 Breaks: korganizer-trinity (<< 4:14.0.0)
@@ -406,7 +406,7 @@ Description: Trinity personal organizer
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: korn-trinity
-Section: kde
+Section: tde
 Architecture: any
 Replaces: korn-trinity (<< 4:14.0.0)
 Breaks: korn-trinity (<< 4:14.0.0)
@@ -423,7 +423,7 @@ Description: Trinity mail checker
  See the 'kde-trinity' and 'tdepim-trinity' packages for more information.
 
 Package: ktnef-trinity
-Section: kde
+Section: tde
 Architecture: any
 Replaces: ktnef-trinity (<< 4:14.0.0)
 Breaks: ktnef-trinity (<< 4:14.0.0)
diff --git a/ubuntu/maverick/tdepim/debian/control.in b/ubuntu/maverick/tdepim/debian/control.in
index a5bb4892a..88bd2e756 100644
--- a/ubuntu/maverick/tdepim/debian/control.in
+++ b/ubuntu/maverick/tdepim/debian/control.in
@@ -1,5 +1,5 @@
 Source: tdepim
-Section: kde
+Section: tde
 Priority: optional
 Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: @@@MAINTAINER@@@
@@ -17,7 +17,7 @@ Build-Conflicts: libkleopatra0-dev, autoconf2.13
 Standards-Version: 3.7.2
 
 Package: tdepim
-Section: kde
+Section: tde
 Architecture: all
 Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), tdepim-kfile-plugins (>= ${Source-Version}), tdepim-kio-plugins (>= ${Source-Version}), tdepim-kresources (>= ${Source-Version}), tdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libtdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version})
 Suggests: tdepim-doc-html
@@ -113,7 +113,7 @@ Description: KDE NG addressbook application
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: kalarm
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: kmix, kttsd
@@ -162,7 +162,7 @@ Description: KDE time tracker tool
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: tdepim-kfile-plugins
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: KDE File dialog plugins for palm and vcf files
@@ -172,7 +172,7 @@ Description: KDE File dialog plugins for palm and vcf files
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: tdepim-kio-plugins
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: tdebase-kio-plugins (<< 4:3.4.0)
@@ -184,7 +184,7 @@ Description: KDE pim I/O Slaves
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: tdepim-kresources
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: libkcal2a (<< 4:3.4.1), kaddressbook (<< 4:3.4.1), knotes (<< 4:3.4.1)
@@ -199,7 +199,7 @@ Description: KDE pim resource plugins
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: tdepim-wizards
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: tdepim-dev (<< 4:3.4.1-2)
@@ -212,7 +212,7 @@ Description: KDE server configuration wizards
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: kitchensync
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: konqueror
@@ -283,7 +283,7 @@ Description: KDE news reader
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: knotes
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: tdepim-kresources
@@ -308,7 +308,7 @@ Description: Helper library for programmatic generation of C++ code
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: konsolekalendar
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: KDE konsole personal organizer
@@ -320,7 +320,7 @@ Description: KDE konsole personal organizer
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: kontact
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}, kitchensync, kmail, knode, knotes
@@ -339,7 +339,7 @@ Description: KDE pim application
   Homepage: http://kontact.kde.org/
 
 Package: korganizer
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: kghostview
@@ -359,7 +359,7 @@ Description: KDE personal organizer
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: korn
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}, tdepim-kio-plugins, tdebase-kio-plugins
 Description: KDE mail checker
@@ -374,7 +374,7 @@ Description: KDE mail checker
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: ktnef
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: KDE TNEF viewer
@@ -386,7 +386,7 @@ Description: KDE TNEF viewer
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: networkstatus
-Section: kde
+Section: tde
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: KDE network status monitor
@@ -397,7 +397,7 @@ Description: KDE network status monitor
  See the 'kde' and 'tdepim' packages for more information.
 
 Package: networkstatus-dev
-Section: kde
+Section: tde
 Architecture: any
 Depends: networkstatus (= ${Source-Version}), libtdepim1-dev (= ${Source-Version})
 Description: KDE network status monitor [development]