DEB: Remove a mechanism for updating the uploaders list.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit fe5341d9d3770ae6f476d1c0a0db4685cc9d6f23)

215 files changed, 0 insertions, 3661 deletions

diff --git a/debian/squeeze/applications/abakus/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/abakus/debian/cdbs/debian-qt-kde.mk
index c5d8ecfd3..68dca1718 100644
--- a/debian/squeeze/applications/abakus/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/abakus/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,6 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/abakus/debian/cdbs/team-members b/debian/squeeze/applications/abakus/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/abakus/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/abakus/debian/cdbs/uploaders.mk b/debian/squeeze/applications/abakus/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/abakus/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/abakus/debian/control.in b/debian/squeeze/applications/abakus/debian/control.in
deleted file mode 100644
index cc6cb0a25..000000000
--- a/debian/squeeze/applications/abakus/debian/control.in
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: abakus-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: autotools-dev, debhelper (>= 4.1.0), quilt, cdbs (>= 0.4.0), cmake, imagemagick, tdelibs14-trinity-dev, chrpath, bison, flex
-Standards-Version: 3.8.4
-
-Package: abakus-trinity
-Architecture: any
-Depends: ${shlibs:Depends}
-Replaces: abakus-kde3 (<< 4:3.5.13)
-Breaks: abakus-kde3 (<< 4:3.5.13)
-Description: calculator for TDE [Trinity]
- AbaKus is a complex calculator, which provides
- many different kinds of calculations.
- Think of it as bc (the command-line calculator) with a nice GUI.
- It also gives information about mathematical variables and
- has the user-friendly menu options of a normal TDE application.
- .
- Web site: http://grammarian.homelinux.net/abakus/
diff --git a/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/adept/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/adept/debian/cdbs/team-members b/debian/squeeze/applications/adept/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/adept/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/adept/debian/cdbs/uploaders.mk b/debian/squeeze/applications/adept/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/adept/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/adept/debian/control.in b/debian/squeeze/applications/adept/debian/control.in
deleted file mode 100644
index 5df662ee2..000000000
--- a/debian/squeeze/applications/adept/debian/control.in
+++ /dev/null
@@ -1,88 +0,0 @@
-Source: adept-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>> 4.1), quilt, dh-buildinfo, libapt-front-dev (>= 0.4.0-0.1ubuntu5), libapt-front-dev (<< 0.5), libept-dev (>= 0.5.7), libept-dev (<< 0.6), libtagcoll2-dev (>= 2.0.6), libtagcoll2-dev (<< 2.1), libwibble-dev (>= 0.1.10), libwibble-dev (>= 1.1) | libwibble-dev (<< 0.2), tdelibs14-trinity-dev (>= 3.5.0), sharutils, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
-Standards-Version: 3.8.3
-
-Package: adept-trinity
-Section: tde
-Depends: adept-manager-trinity, adept-installer-trinity, adept-updater-trinity, adept-notifier-trinity, adept-batch-trinity
-Architecture: all
-Description: package management suite for Trinity
- These packages belong to the adept suite:
-  * adept-manager-trinity - package manager
-  * adept-installer-trinity - application manager
-  * adept-updater-trinity - system upgrade wizard
-  * adept-notifier-trinity - systray notification of available updates
-
-Package: adept-common-trinity
-Section: tde
-Depends: debtags (>= 1.6.1), konsole-trinity (>= 3.5.0), ${shlibs:Depends}
-Architecture: all
-Description: package manager for Trinity -- common files
- Icons and other common files for all adept components.
-
-Package: adept-manager-trinity
-Section: tde
-Depends: adept-common-trinity, ${shlibs:Depends}
-Recommends: libtqt-perl
-Architecture: any
-Description: package manager for Trinity
- Adept Manager is a graphical user interface for package management.
- .
- Besides these basic functions the following features are provided:
-  * Search and filter the list of available packages (also using debtags)
-  * Perform smart system upgrades
-  * Edit the list of used repositories (sources.list)
-  * Configure packages through the debconf system
- .
- Please also install libtqt-perl if you want the TDE Debconf frontend
- to function.
-
-Package: adept-installer-trinity
-Section: tde
-Depends: adept-common-trinity, app-install-data, ${shlibs:Depends}
-Recommends: libtqt-perl
-Architecture: any
-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 TDE, KDE, GNOME or other
- desktop environment.
- .
- Please also install libtqt-perl if you want the TDE Debconf frontend
- to function.
-
-Package: adept-updater-trinity
-Section: tde
-Depends: adept-common-trinity, ${shlibs:Depends}
-Recommends: libtqt-perl
-Architecture: any
-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.
- .
- Please also install libtqt-perl if you want the TDE Debconf frontend
- to function.
-
-Package: adept-notifier-trinity
-Section: tde
-Depends: ${shlibs:Depends}, adept-updater-trinity, update-notifier-common
-Architecture: any
-Description: system tray notifier of available system updates
- Adept Notifier provides a system tray icon notifying the user of
- available updates.  It will run Adept Updater for the user when
- clicked.
-
-Package: adept-batch-trinity
-Section: tde
-Depends: ${shlibs:Depends}, adept-manager-trinity
-Architecture: any
-Description: command line install for Adept
- Adept Batch lets you install packages with Adept from the
- command line.  It is intended for shell scripts and being run
- by external applications.
-
diff --git a/debian/squeeze/applications/amarok/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/amarok/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/amarok/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/amarok/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/amarok/debian/cdbs/team-members b/debian/squeeze/applications/amarok/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/amarok/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/amarok/debian/cdbs/uploaders.mk b/debian/squeeze/applications/amarok/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/amarok/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/amarok/debian/control.in b/debian/squeeze/applications/amarok/debian/control.in
deleted file mode 100644
index 1ef7aedcf..000000000
--- a/debian/squeeze/applications/amarok/debian/control.in
+++ /dev/null
@@ -1,98 +0,0 @@
-Source: amarok-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, automake, autoconf, libtool,
- tdelibs14-trinity-dev,
- libxine-dev, libdbus-qt-1-dev,
- libtag1-dev, libsqlite3-dev, libtunepimp-dev,
- default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev,
- libvisual-0.4-dev, libsdl1.2-dev,
- libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2) | libgpod-dev (>> 0.8.3-8), libnjb-dev, libmtp-dev,
- ruby, ruby1.8-dev
-Standards-Version: 3.8.3
-Homepage: http://amarok.kde.org
-
-Package: amarok-trinity
-Architecture: any
-Depends:  amarok-common-trinity (>= ${source:Version}), amarok-engine-xine-trinity (= ${binary:Version}) | amarok-engine-yauap-trinity (= ${binary:Version}), unzip, ${shlibs:Depends}
-Suggests: amarok-engines-trinity, moodbar, konqueror-trinity | www-browser,
- python, python-qt3, libqt0-ruby1.8, libvisual-0.4-plugins
-Description: versatile and easy to use audio player for Trinity
- Amarok tries to be a little different, providing a simple drag and drop
- interface that really makes playlist handling easy.
- .
- Features include:
-   - rapid playlist creation, with drag and drop from a directory view
-   - nice playlist browser for your existing playlists (PLS or M3U formats)
-   - collection-indexing support, for smart browsing and playlist creation
-   - possibility of accessing media via tdeioslaves, allowing you to play
-     via smb:// or fish:// (normal streams are of course supported)
-   - inline ID3 tag editing, capable of retrieving tags via MusicBrainz
-   - album cover support: automatically displays album covers from the
-     filesystem, or downloaded on the fly
-   - miscellaneous audio effects, including crossfading
-   - easy bindable global shortcuts, rich DCOP interface
-   - On-Screen Display (OSD), on track change or at keypress
-   - iPod and iRiver support
-   - Last.fm stream playing support (if ruby is installed)
-   - Track "mood" display (requires moodbar package installed)
- .
- Support for libvisual visualization plugins is also compiled in (you need 
- to have libvisual-0.4-plugins installed to be able to use it).
-
-Package: amarok-common-trinity
-Architecture: all
-Depends: ruby
-Recommends: amarok-trinity (>= ${source:Version})
-Suggests: libqt0-ruby1.8, python, python-qt3
-Description: architecture independent files for Amarok [Trinity]
- This package contains architecture independent files needed for Amarok to run
- properly. It also provides Amarok documentation. Therefore, unless you have
- 'amarok' package installed, you will hardly find this package useful.
- .
- You need to install Python if you intend to use Zeroconf support, WebControl
- and/or playlist2html scripts. You will also need python-qt3 for the
- WebControl script.
-
-Package: amarok-engines-trinity
-Architecture: all
-Depends: amarok-engine-xine-trinity (>= ${source:Version})
-Recommends: amarok-engine-yauap-trinity (>= ${source:Version})
-Description: output engines for the Amarok music player [Trinity]
- This package serves merely as a reference point if you want to install
- all available Amarok engines. It depends on those Amarok engines that
- generally can be used by most users. You can safely remove this metapackage
- as you can remove the amarok-engine-$engine packages that you don't use.
-
-Package: amarok-engine-xine-trinity
-Architecture: any
-Depends: ${shlibs:Depends}
-Recommends: amarok-trinity (= ${binary:Version})
-Description: xine engine for the Amarok audio player [Trinity]
- This package provides the xine engine for Amarok, which you may prefer
- for some reason over the other engines (e.g., it is the lightest engine
- Dependency-wise).
-
-Package: amarok-engine-yauap-trinity
-Architecture: any
-Depends: yauap, ${shlibs:Depends}
-Recommends: amarok-trinity (= ${binary:Version})
-Description: Yauap engine for the Amarok audio player [Trinity]
- This package includes Amarok yauap engine, which provides a frontend
- to Yauap Commandline Audio Player. DBus is used as a means of communication
- between the engine and Yauap. Please note that some extra Amarok features 
- (like visualizations) might not be available while using this engine.
-
-Package: amarok-trinity-dbg
-Priority: extra
-Architecture: any
-Depends: amarok-trinity (= ${binary:Version})
-Recommends: tdelibs-trinity-dbg
-Description: debugging symbols for Amarok [Trinity]
- This package provides debugging symbols for all binary packages built from
- amarok source package. It's highly recommended to have this package installed
- before reporting any Amarok crashes to either Amarok developers or Debian
- package maintainers.
diff --git a/debian/squeeze/applications/bibletime/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/bibletime/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/bibletime/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/bibletime/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/bibletime/debian/cdbs/team-members b/debian/squeeze/applications/bibletime/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/bibletime/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/bibletime/debian/cdbs/uploaders.mk b/debian/squeeze/applications/bibletime/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/bibletime/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/bibletime/debian/control.in b/debian/squeeze/applications/bibletime/debian/control.in
deleted file mode 100644
index 59c17465d..000000000
--- a/debian/squeeze/applications/bibletime/debian/control.in
+++ /dev/null
@@ -1,21 +0,0 @@
-Source: bibletime-trinity
-Section: tde
-Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 4.1.0), tdelibs14-trinity-dev, libsword-dev, libclucene-dev, poxml, libboost-dev
-Priority: optional
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Standards-Version: 3.8.3
-
-Package: bibletime-trinity
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}
-Recommends: sword-text, sword-dict, sword-comm
-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 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/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/team-members b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/uploaders.mk b/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/compizconfig-backend-tdeconfig/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/digikam/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/digikam/debian/cdbs/team-members b/debian/squeeze/applications/digikam/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/digikam/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/digikam/debian/cdbs/uploaders.mk b/debian/squeeze/applications/digikam/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/digikam/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/digikam/debian/control.in b/debian/squeeze/applications/digikam/debian/control.in
deleted file mode 100644
index e16fdfc0a..000000000
--- a/debian/squeeze/applications/digikam/debian/control.in
+++ /dev/null
@@ -1,57 +0,0 @@
-Source: digikam-trinity
-Section: graphics
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev,
- libtiff-dev, libgphoto2-2-dev, libkipi0-trinity-dev,
- libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-3-trinity-dev (>= 0.1.6),
- libjasper-dev, libpng-dev, libexiv2-trinity-dev (>= 0.16),
- libkdcraw3-trinity-dev (>= 0.1.4),
- automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
-Standards-Version: 3.8.3
-Homepage: http://www.digikam.org
-
-Package: digikam-trinity
-Architecture: any
-Depends: ${shlibs:Depends}
-Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
-Suggests: digikam-trinity-doc
-Description: digital photo management application for TDE [Trinity]
- An easy to use and powerful digital photo management
- application, which makes importing, organizing and manipulating
- digital photos a "snap".  An interface is provided to connect to
- your digital camera, preview the images and download and/or
- delete them.
- .
- The digiKam built-in image editor makes the common photo correction
- a simple task. The image editor is extensible via plugins and,
- the digikamimageplugins project has been merged to digiKam core
- since release 0.9.2, all useful image editor plugins are available
- in the base installation.
- .
- digiKam can also make use of the KIPI image handling plugins to
- extend its capabilities even further for photo manipulations,
- import and export, etc. The kipi-plugins package contains many
- very useful extentions.
- .
- digiKam is based in part on the work of the Independent JPEG Group.
-
-Package: showfoto-trinity
-Architecture: any
-Section: graphics
-Depends: ${shlibs:Depends}, digikam-trinity
-Recommends: kipi-plugins-trinity, tdeprint-trinity, konqueror-trinity
-Description: image viewer/editor for TDE [Trinity]
- Showphoto is part of the Digikam project.
- It allows to browse your photo collection and edit them with ease.
-
-Package: digikam-trinity-dbg
-Architecture: any
-Section: devel
-Depends: ${shlibs:Depends}, digikam-trinity (= ${binary:Version}), showfoto-trinity (= ${binary:Version}), tdelibs-trinity-dbg
-Priority: extra
-Description: debugging symbols for digikam [Trinity]
- The debugging symbols associated with digikam and showfoto. They will
- automatically be used by gdb for debugging digikam-related issues.
diff --git a/debian/squeeze/applications/dolphin/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/dolphin/debian/cdbs/debian-qt-kde.mk
index fb36ac52f..2dff59226 100644
--- a/debian/squeeze/applications/dolphin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/dolphin/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,6 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/dolphin/debian/cdbs/team-members b/debian/squeeze/applications/dolphin/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/dolphin/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/dolphin/debian/cdbs/uploaders.mk b/debian/squeeze/applications/dolphin/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/dolphin/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/dolphin/debian/control.in b/debian/squeeze/applications/dolphin/debian/control.in
deleted file mode 100644
index 3f1691432..000000000
--- a/debian/squeeze/applications/dolphin/debian/control.in
+++ /dev/null
@@ -1,34 +0,0 @@
-Source: dolphin-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, autotools-dev, docbook2x, docbook-xml, tdesdk-scripts-trinity, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
-Standards-Version: 3.8.3
-
-Package: dolphin-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: amarok-trinity, ark-trinity, k3b-trinity, kmail-trinity, digikam-trinity
-Suggests: kfloppy-trinity
-Description: File manager for TDE focusing on usability [Trinity]
- Dolphin is not intended to be a competitor to Konqueror, the default TDE
- file manager: Konqueror acts as universal viewer being able to show HTML
- pages, text documents, directories and a lot more, whereas Dolphin focuses
- on being only a file manager. This approach allows to optimize the user
- interface for the task of file management.
- .
- Features include:
-  Sidebar
-  Navigation bar (breadcrumbs)
-  View properties remembered for each folder
-  Split views
-  Network transparency
-  Undo/redo functionality
-  Renaming of a variable number of selected items in one step.
- .
- This is the D3lphin fork of Dolphin, intended to keep development of
- the TDE version of Dolphin active.
- .
-  Homepage: https://marrat.homelinux.org/D3lphin
diff --git a/debian/squeeze/applications/filelight/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/filelight/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/filelight/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/filelight/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/filelight/debian/cdbs/team-members b/debian/squeeze/applications/filelight/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/filelight/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/filelight/debian/cdbs/uploaders.mk b/debian/squeeze/applications/filelight/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/filelight/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/team-members b/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/team-members
deleted file mode 100644
index 815b2c16f..000000000
--- a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/team-members
+++ /dev/null
@@ -1,17 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fabo@debian.org>
-Modestas Vainius <modestas@vainius.eu>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
-Raúl Sánchez Siles <rasasi78@gmail.com>
-Pino Toscano <pino@kde.org>
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/uploaders.mk b/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/gtk-qt-engine/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
index ec89756bb..3bd77b8f7 100644
--- a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/gwenview-i18n/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,6 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/team-members b/debian/squeeze/applications/gwenview-i18n/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/uploaders.mk b/debian/squeeze/applications/gwenview-i18n/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/gwenview-i18n/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/gwenview/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/gwenview/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/gwenview/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/gwenview/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/gwenview/debian/cdbs/team-members b/debian/squeeze/applications/gwenview/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/gwenview/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/gwenview/debian/cdbs/uploaders.mk b/debian/squeeze/applications/gwenview/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/gwenview/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/k3b/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/k3b/debian/cdbs/team-members b/debian/squeeze/applications/k3b/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/k3b/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/k3b/debian/cdbs/uploaders.mk b/debian/squeeze/applications/k3b/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/k3b/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/k9copy/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/k9copy/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/k9copy/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/k9copy/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/k9copy/debian/cdbs/team-members b/debian/squeeze/applications/k9copy/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/k9copy/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/k9copy/debian/cdbs/uploaders.mk b/debian/squeeze/applications/k9copy/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/k9copy/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kaffeine/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kaffeine/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kaffeine/debian/cdbs/team-members b/debian/squeeze/applications/kaffeine/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kaffeine/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kaffeine/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kaffeine/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kaffeine/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..9f8f97776 100644
--- a/debian/squeeze/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kasablanca/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kasablanca/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kasablanca/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/katapult/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/katapult/debian/cdbs/team-members b/debian/squeeze/applications/katapult/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/katapult/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/katapult/debian/cdbs/uploaders.mk b/debian/squeeze/applications/katapult/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/katapult/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kbarcode/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kbarcode/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kbarcode/debian/cdbs/team-members b/debian/squeeze/applications/kbarcode/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kbarcode/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kbarcode/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kbarcode/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kbarcode/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kbfx/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kbfx/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/kbfx/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kbfx/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..9f8f97776 100644
--- a/debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kbibtex/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kbibtex/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kbibtex/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kbibtex/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kbiff/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kbiff/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/kbiff/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kbiff/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kbookreader/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kbookreader/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kbookreader/debian/cdbs/team-members b/debian/squeeze/applications/kbookreader/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kbookreader/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kbookreader/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kbookreader/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kbookreader/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kcmautostart/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kcmautostart/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/kcmautostart/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kcmautostart/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kcpuload/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kcpuload/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kcpuload/debian/cdbs/team-members b/debian/squeeze/applications/kcpuload/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kcpuload/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kcpuload/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kcpuload/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kcpuload/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..9f8f97776 100644
--- a/debian/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kdbg/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kdbg/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kdbg/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kdbg/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kdbusnotification/debian/cdbs/team-members b/debian/squeeze/applications/kdbusnotification/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kdbusnotification/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kdbusnotification/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kdbusnotification/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kdbusnotification/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kdiff3/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..9f8f97776 100644
--- a/debian/squeeze/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kdiff3/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kdiff3/debian/cdbs/team-members b/debian/squeeze/applications/kdiff3/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kdiff3/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kdiff3/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kdiff3/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kdiff3/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kdirstat/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kdirstat/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/keep/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/keep/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/keep/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/keep/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/keep/debian/cdbs/team-members b/debian/squeeze/applications/keep/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/keep/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/keep/debian/cdbs/uploaders.mk b/debian/squeeze/applications/keep/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/keep/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk
index 61f3ab2dc..91a547ea9 100644
--- a/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kerry/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kerry/debian/cdbs/team-members b/debian/squeeze/applications/kerry/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kerry/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kerry/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kerry/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kerry/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kerry/debian/control.in b/debian/squeeze/applications/kerry/debian/control.in
deleted file mode 100644
index d0ab72677..000000000
--- a/debian/squeeze/applications/kerry/debian/control.in
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: kerry-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0.0), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libqt3-mt-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
-Homepage: http://en.opensuse.org/Kerry
-Standards-Version: 3.8.3
-
-Package: kerry-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, beagle (>= 0.2.3)
-Description: a TDE frontend for the Beagle desktop search daemon [Trinity]
- Kerry is a Trinity frontend for the Beagle desktop search daemon.
- .
- A program for indexing and searching user's data. At the moment, it can index
- filesystems, chat logs, mail and data, RSS and other.
- .
diff --git a/debian/squeeze/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..9f8f97776 100644
--- a/debian/squeeze/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kftpgrabber/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kftpgrabber/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kftpgrabber/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kftpgrabber/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
index c5d8ecfd3..68dca1718 100644
--- a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kgtk-qt3/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,6 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/team-members b/debian/squeeze/applications/kgtk-qt3/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kgtk-qt3/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kgtk-qt3/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kgtk-qt3/debian/control.in b/debian/squeeze/applications/kgtk-qt3/debian/control.in
deleted file mode 100644
index 95e5d0abd..000000000
--- a/debian/squeeze/applications/kgtk-qt3/debian/control.in
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: kgtk-qt3-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 7), quilt, cdbs, tdelibs14-trinity-dev, libgtk2.0-dev, libtqtinterface-dev, cmake
-Standards-Version: 3.8.4
-Homepage: http://trinity.pearsoncomputing.net
-
-Package: kgtk-qt3-trinity
-Architecture: any
-Depends: ${shlibs:Depends}
-Replaces: kgtk-qt3-kde3 (<< 4:3.5.13)
-Breaks: kgtk-qt3-kde3 (<< 4:3.5.13)
-Conflicts: kgtk-config-bluefish, kgtk-config-eclipse, kgtk-config-firefox, kgtk-config-gimp, kgtk-config-inkscape, kgtk-config-kino, kgtk-config-openoffice, kgtk-config-opera-qt3, kgtk-config-opera-qt4, kgtk-config-scribus, kgtk-config-thunderbird, kubuntu-kgtk-trinity
-Description: Use TDE dialogs in Gtk apps
- This is an LD_PRELOAD hack that allows most GTK
- applications to use Trinity's file dialogs when run under Trinity.
- .
- The Gtk file chooser functions have been overridden to communicate
- with this TDE module/application.
- .
- This package includes the kqt3-wrapper
diff --git a/debian/squeeze/applications/kile/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kile/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/kile/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kile/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kile/debian/cdbs/team-members b/debian/squeeze/applications/kile/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kile/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kile/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kile/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kile/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kiosktool/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kiosktool/debian/cdbs/team-members b/debian/squeeze/applications/kiosktool/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kiosktool/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kiosktool/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kiosktool/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kiosktool/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kkbswitch/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/klcddimmer/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kmplayer/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kmplayer/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kmplayer/debian/cdbs/team-members b/debian/squeeze/applications/kmplayer/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kmplayer/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kmplayer/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kmplayer/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kmplayer/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kmyfirewall/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kmyfirewall/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/kmyfirewall/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kmyfirewall/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kmymoney/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kmymoney/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kmymoney/debian/cdbs/team-members b/debian/squeeze/applications/kmymoney/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kmymoney/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kmymoney/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kmymoney/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kmymoney/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/knemo/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knemo/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/knemo/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/knemo/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/knemo/debian/cdbs/team-members b/debian/squeeze/applications/knemo/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/knemo/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/knemo/debian/cdbs/uploaders.mk b/debian/squeeze/applications/knemo/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/knemo/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/knetload/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knetload/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/knetload/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/knetload/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/knetstats/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knetstats/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/knetstats/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/knetstats/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk b/debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/knetworkmanager8/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/control.in b/debian/squeeze/applications/knetworkmanager8/debian/control.in
deleted file mode 100644
index 4891ff225..000000000
--- a/debian/squeeze/applications/knetworkmanager8/debian/control.in
+++ /dev/null
@@ -1,36 +0,0 @@
-Source: knetworkmanager-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs,
- debhelper (>= 7),
- pkg-config,
- tdelibs14-trinity-dev,
- libnm-util-dev (>= 0.7.0),
- libnm-glib-dev (>= 0.7.0),
- network-manager-dev (>= 0.7.0),
- libhal-dev,
- libdbus-1-qt3-dev (>= 0.8.1),
- libiw-dev,
- libnl-dev (>= 1.1),
- quilt,
- network-manager-vpnc,
- network-manager-openvpn,
- network-manager-strongswan,
- network-manager-pptp,
- automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
-Standards-Version: 3.8.3
-Homepage: http://opensuse.org/Projects/KNetworkManager
-
-Package: network-manager-kde-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Recommends: tdewalletmanager-trinity, network-manager-vpnc, network-manager-openvpn, network-manager-strongswan, network-manager-pptp
-Provides: knetworkmanager-trinity
-Conflicts: network-manager-kde
-Description: TDE systray applet for controlling NetworkManager [Trinity]
- Systray applet for controlling network connections managed by 
- NetworkManager. It is mainly written for Trinity but also works for 
- other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/knmap/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knmap/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/knmap/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/knmap/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/knutclient/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/knutclient/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/knutclient/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/knutclient/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk
index bb7bdf7e0..eb7666b8e 100644
--- a/debian/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/koffice/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/koffice/debian/cdbs/team-members b/debian/squeeze/applications/koffice/debian/cdbs/team-members
deleted file mode 100644
index 4974edd91..000000000
--- a/debian/squeeze/applications/koffice/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fabo@debian.org>
-Modestas Vainius <modestas@vainius.eu>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
-Raúl Sánchez Siles <rasasi78@gmail.com>
diff --git a/debian/squeeze/applications/koffice/debian/cdbs/uploaders.mk b/debian/squeeze/applications/koffice/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/koffice/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/koffice/debian/control.in b/debian/squeeze/applications/koffice/debian/control.in
deleted file mode 100644
index 4a47e14cf..000000000
--- a/debian/squeeze/applications/koffice/debian/control.in
+++ /dev/null
@@ -1,300 +0,0 @@
-Source: koffice-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), quilt, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, flex, tdelibs14-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev, libtiff-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev, default-libmysqlclient-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-qt-dev, libexif-dev, libasound2-dev, libogg-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
-Build-Depends-Indep: qt3-doc, graphviz, gsfonts-x11
-Standards-Version: 3.8.3
-Homepage: http://www.koffice.org
-
-Package: koffice-trinity
-Architecture: all
-Section: tde
-Depends: karbon-trinity (>= ${source:Version}), kchart-trinity (>= ${source:Version}), kexi-trinity (>= ${source:Version}), kformula-trinity (>= ${source:Version}), kivio-trinity (>= ${source:Version}), koshell-trinity (>= ${source:Version}), kplato-trinity (>= ${source:Version}), kpresenter-trinity (>= ${source:Version}), chalk-trinity (>= ${source:Version}), kspread-trinity (>= ${source:Version}), kugar-trinity (>= ${source:Version}), kword-trinity (>= ${source:Version}), kthesaurus-trinity (>= ${source:Version})
-Suggests: koffice-i18n-trinity, koffice-trinity-dev (>= ${source:Version}), koffice-trinity-doc (>= ${source:Version}), koffice-trinity-doc-html (= ${source:Version})
-Description: Trinity Office Suite [Trinity]
- KOffice is an integrated office suite for TDE, the Trinity Desktop
- Environment.  It offers a word processor, spreadsheet, presentation
- program, graphics tools and more.
- .
- This package provides all the components of KOffice.
-
-Package: koffice-trinity-doc
-Section: doc
-Architecture: all
-Description: developer documentation for the Trinity Office Suite [Trinity]
- This package contains documentation for the Trinity Office Suite, of
- use more for developers creating applications than regular users.
- .
- This package is part of the Trinity Office Suite.
-
-Package: koffice-trinity-doc-html
-Architecture: all
-Section: doc
-Suggests: konqueror-trinity | www-browser, koffice-trinity
-Description: Trinity Office Suite documentation in HTML format [Trinity]
- KOffice is an integrated office suite for TDE, the Trinity Desktop
- Environment.  It offers a word processor, spreadsheet, presentation
- program, graphics tools and more.
- .
- By default the KOffice applications only provide their documentation in
- TDE docbook format, which can only be read by Konqueror or KHelpCenter.
- This package provides all of the KOffice documentation converted to HTML
- format so it can be read with any web browser.
- .
- The documentation will be installed into the usual directories
- /usr/share/doc/tde/HTML/<language>/<app>/, for instance
- /usr/share/doc/tde/HTML/en/kword/.
- .
- This package is part of the Trinity Office Suite.
-
-Package: karbon-trinity
-Architecture: any
-Section: graphics
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
-Description: a vector graphics application for the Trinity Office Suite
- Karbon is a vector graphics application.
- .
- This package is part of the Trinity Office Suite.
-
-Package: kchart-trinity
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
-Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a chart drawing program for the Trinity Office Suite [Trinity]
- KChart is a chart drawing application.  It can be used to embed charts
- into KOffice documents.  KChart is easy to use and highly configurable.
- .
- This package is part of the Trinity Office Suite.
-
-Package: kexi-trinity
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
-Suggests: kexi-mdb-plugin-trinity
-Description: integrated database environment for the Trinity Office Suite [Trinity]
- Kexi is an integrated data management application. It can be used for
- creating database schemas, inserting data, performing queries, and
- processing data. Forms can be created to provide a custom interface to
- your data. All database objects - tables, queries and forms - are stored
- in the database, making it easy to share data and design.
- .
- Kexi is considered as a long awaited Open Source competitor for MS Access,
- Filemaker and Oracle Forms. Its development is motivated by the lack of
- Rapid Application Development (RAD) tools for database systems that are
- sufficiently powerful, inexpensive, open standards driven and portable
- across many operating systems and hardware platforms.
- .
- This package is part of the Trinity Office Suite.
-
-Package: kformula-trinity
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
-Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a formula editor for the Trinity Office Suite [Trinity]
- KFormula is a formula editor that provides the basic input facilities
- and the support functionality expected of a KOffice application.
- .
- Features include easy Greek letter insertion, intelligent cursor
- movement, advanced syntax highlighting, multi-level undo support,
- LaTeX export and MathML import.
- .
- This package is part of the Trinity Office Suite.
-
-Package: kivio-trinity
-Architecture: any
-Section: graphics
-Depends: ${shlibs:Depends}, kivio-data-trinity (>> 1:1.4.90.2-1), kivio-data-trinity (>> ${TDE-Version3}), kivio-data-trinity (<< ${TDE-Next-Version3}), koffice-libs-trinity (<< ${TDE-Next-Version3})
-Description: a flowcharting program for the Trinity Office Suite [Trinity]
- Kivio is a flowcharting program that offers basic flowcharting abilities,
- but with a twist.  Objects are scriptable, and a backend plugin system
- offers the ability to make objects do just about anything.
- .
- This package is part of the Trinity Office Suite.
-
-Package: kivio-data-trinity
-Architecture: all
-Section: graphics
-Description: data files for Kivio flowcharting program [Trinity]
- This package contains architecture-independent data files for Kivio,
- the flowcharting program shipped with the Trinity Office Suite.
- .
- See the kivio package for further information.
- .
- This package is part of the Trinity Office Suite.
-
-Package: koshell-trinity
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
-Recommends: koffice-trinity, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: the Trinity Office Suite workspace [Trinity]
- The KOffice workspace is a desktop with easy one-click launchers for
- KOffice applications.
- .
- This package is part of the Trinity Office Suite.
-
-Package: kplato-trinity
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
-Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: an integrated project management and planning tool [Trinity]
- KPlato is a project management application, allowing for the planning and
- scheduling of projects. It is in the very early stages of development.
- .
- This package is part of the Trinity Office Suite.
-
-
-Package: kpresenter-trinity
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}, ${perl:Depends}, kpresenter-data-trinity (>> ${TDE-Version3}), kpresenter-data-trinity (<< ${TDE-Next-Version3}), koffice-libs-trinity (<< ${TDE-Next-Version3})
-Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a presentation program for the Trinity Office Suite [Trinity]
- KPresenter is a fully-featured presentation program.  Presentations can
- be edited directly within KPresenter, and many advanced features for
- screen presentations are available.
- .
- This package is part of the Trinity Office Suite.
-
-Package: kpresenter-data-trinity
-Architecture: all
-Section: tde
-Description: data files for KPresenter presentation program [Trinity]
- This package contains architecture-independent data files for KPresenter,
- the presentation program shipped with the Trinity Office Suite.
- .
- See the kpresenter package for further information.
- .
- This package is part of the Trinity Office Suite.
-
-Package: chalk-trinity
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}, chalk-data-trinity (>> ${TDE-Version3}), chalk-data-trinity (<< ${TDE-Next-Version3}), koffice-libs-trinity (<< ${TDE-Next-Version3})
-Recommends: dcraw, khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a pixel-based image manipulation program for the Trinity Office Suite [Trinity]
- Chalk is a painting and image editing application for KOffice. Chalk contains
- both ease-of-use and fun features like guided painting.
- .
- This package is part of the Trinity Office Suite.
-
-Package: chalk-data-trinity
-Architecture: all
-Section: tde
-Description: data files for Chalk painting program [Trinity]
- This package contains architecture-independent data files for Chalk,
- the painting program shipped with the Trinity Office Suite.
- .
- See the chalk package for further information.
- .
- This package is part of the Trinity Office Suite.
-
-Package: kspread-trinity
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
-Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a spreadsheet for the Trinity Office Suite [Trinity]
- KSpread is a powerful spreadsheet application.  It is scriptable and
- provides both table-oriented sheets and support for complex mathematical
- formulae and statistics.
- .
- This package is part of the Trinity Office Suite.
-
-Package: kugar-trinity
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
-Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a business report maker for the Trinity Office Suite [Trinity]
- Kugar is a tool for generating business quality reports that can
- be viewed and printed.  It includes a standalone report viewer and a
- KPart report viewer.  The latter means that any TDE application can
- embed the report viewing functionality and that reports can be viewed
- using the Konqueror browser.
- .
- This package is part of the Trinity Office Suite.
-
-Package: kword-trinity
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}, kword-data-trinity (>> ${TDE-Version3}), kword-data-trinity (<< ${TDE-Next-Version3}), koffice-libs-trinity (<< ${TDE-Next-Version3})
-Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: a word processor for the Trinity Office Suite [Trinity]
- KWord is a FrameMaker-like word processing and desktop publishing
- application.  KWord is capable of creating demanding and professional
- looking documents.  It can be used for desktop publishing, but also for
- "normal" word processing, like writing letters, reports and so on.
- .
- This package is part of the Trinity Office Suite.
-
-Package: kword-data-trinity
-Architecture: all
-Section: tde
-Description: data files for KWord word processor [Trinity]
- This package contains architecture-independent data files for KWord,
- the word processor shipped with the Trinity Office Suite.
- .
- See the kword package for further information.
- .
- This package is part of the Trinity Office Suite.
-
-Package: kthesaurus-trinity
-Architecture: any
-Section: tde
-Depends: ${shlibs:Depends}, koffice-libs-trinity (<< ${TDE-Next-Version3})
-Recommends: khelpcenter-trinity | koffice-trinity-doc-html (= ${source:Version})
-Description: thesaurus for the Trinity Office Suite [Trinity]
- KThesaurus lists words related to a given term and offers a user interface
- to WordNet, a powerful lexical reference system. By default, only the English
- language is supported.
- .
- This package is part of the Trinity Office Suite.
-
-Package: koffice-libs-trinity
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, koffice-data-trinity (>> ${TDE-Version3}), koffice-data-trinity (<< ${TDE-Next-Version3})
-Recommends: latex-xft-fonts, ruby, python
-Suggests: wordnet, texlive-base
-Description: common libraries and binaries for the Trinity Office Suite [Trinity]
- This package provides the libraries and binaries that are shared amongst
- the various components of KOffice.
- .
- This package is part of the Trinity Office Suite.
-
-Package: koffice-data-trinity
-Architecture: all
-Section: libs
-Recommends: khelpcenter-trinity | koffice-trinity-doc-html
-Description: common shared data for the Trinity Office Suite [Trinity]
- This package provides the architecture-independent data that is shared
- amongst the various components of KOffice.
- .
- This package is part of the Trinity Office Suite.
-
-Package: koffice-trinity-dev
-Architecture: any
-Section: libdevel
-Depends: koffice-libs-trinity (= ${binary:Version}), karbon-trinity (= ${binary:Version}), kchart-trinity (= ${binary:Version}), kexi-trinity (= ${binary:Version}), kformula-trinity (= ${binary:Version}), kivio-trinity (= ${binary:Version}), koshell-trinity (= ${binary:Version}), kplato-trinity (= ${binary:Version}), kpresenter-trinity (= ${binary:Version}), chalk-trinity (= ${binary:Version}), kspread-trinity (= ${binary:Version}), kthesaurus-trinity (= ${binary:Version}), kugar-trinity (= ${binary:Version}), kword-trinity (= ${binary:Version}), tdelibs14-trinity-dev
-Description: common libraries for KOffice (development files) [Trinity]
- This package provides the development files for the libraries that are
- shared amongst the various components of KOffice.
- .
- This package is part of the Trinity Office Suite.
-
-Package: koffice-trinity-dbg
-Section: libdevel
-Architecture: any
-Priority: extra
-Depends: koffice-libs-trinity (= ${binary:Version})
-Description: debugging symbols for koffice [Trinity]
- This package contains the debugging symbols associated with koffice.
- They will automatically be used by gdb for debugging koffice-related
- issues.
diff --git a/debian/squeeze/applications/konversation/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/konversation/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/konversation/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/konversation/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/konversation/debian/cdbs/team-members b/debian/squeeze/applications/konversation/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/konversation/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/konversation/debian/cdbs/uploaders.mk b/debian/squeeze/applications/konversation/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/konversation/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kopete-otr/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kopete-otr/debian/cdbs/team-members b/debian/squeeze/applications/kopete-otr/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kopete-otr/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kopete-otr/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kopete-otr/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kopete-otr/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kpilot/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kpilot/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/kpilot/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kpilot/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kpilot/debian/cdbs/team-members b/debian/squeeze/applications/kpilot/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kpilot/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kpilot/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kpilot/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kpilot/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kpowersave/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kpowersave/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kpowersave/debian/cdbs/team-members b/debian/squeeze/applications/kpowersave/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kpowersave/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kpowersave/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kpowersave/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kpowersave/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/krecipes/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/krecipes/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..9f8f97776 100644
--- a/debian/squeeze/applications/krecipes/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/krecipes/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/krecipes/debian/cdbs/uploaders.mk b/debian/squeeze/applications/krecipes/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/krecipes/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/krename/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/krename/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/krename/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/krename/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/krusader/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/krusader/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/krusader/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/krusader/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/krusader/debian/cdbs/team-members b/debian/squeeze/applications/krusader/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/krusader/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/krusader/debian/cdbs/uploaders.mk b/debian/squeeze/applications/krusader/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/krusader/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kscope/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kscope/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/kscope/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kscope/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/ksensors/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/ksensors/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/ksensors/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/ksensors/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kshowmail/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kshowmail/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..9f8f97776 100644
--- a/debian/squeeze/applications/kshowmail/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kshowmail/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kshowmail/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kshowmail/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kshowmail/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kshutdown/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kshutdown/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..9f8f97776 100644
--- a/debian/squeeze/applications/kshutdown/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kshutdown/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kshutdown/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kshutdown/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kshutdown/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/ksplash-engine-moodin/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/ksplash-engine-moodin/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/ksplash-engine-moodin/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/ksplash-engine-moodin/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/ksystemlog/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/ksystemlog/debian/cdbs/team-members b/debian/squeeze/applications/ksystemlog/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/ksystemlog/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/ksystemlog/debian/cdbs/uploaders.mk b/debian/squeeze/applications/ksystemlog/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/ksystemlog/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
index bb7bdf7e0..eb7666b8e 100644
--- a/debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/ktorrent/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/ktorrent/debian/cdbs/team-members b/debian/squeeze/applications/ktorrent/debian/cdbs/team-members
deleted file mode 100644
index 4974edd91..000000000
--- a/debian/squeeze/applications/ktorrent/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fabo@debian.org>
-Modestas Vainius <modestas@vainius.eu>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
-Raúl Sánchez Siles <rasasi78@gmail.com>
diff --git a/debian/squeeze/applications/ktorrent/debian/cdbs/uploaders.mk b/debian/squeeze/applications/ktorrent/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/ktorrent/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/ktorrent/debian/control.in b/debian/squeeze/applications/ktorrent/debian/control.in
deleted file mode 100644
index 703e04c3e..000000000
--- a/debian/squeeze/applications/ktorrent/debian/control.in
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: ktorrent-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5.0), quilt, cdbs, docbook2x, tdelibs14-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
-Standards-Version: 3.8.3
-
-Package: ktorrent-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: php-cli | php5-cli
-Recommends: tdebase-tdeio-plugins-trinity
-Description: BitTorrent client for Trinity
- KTorrent is a BitTorrent program for Trinity. Its features include speed capping
- (both down and up), integrated searching, UDP tracker support, preview of
- certain file types (video and audio) and integration into the TDE Panel
- enabling background downloading.
- .
-  Homepage: http://ktorrent.org
-
diff --git a/debian/squeeze/applications/kuickshow/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kuickshow/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kuickshow/debian/cdbs/team-members b/debian/squeeze/applications/kuickshow/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/kuickshow/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/kuickshow/debian/cdbs/uploaders.mk b/debian/squeeze/applications/kuickshow/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/kuickshow/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/kuickshow/debian/control.in b/debian/squeeze/applications/kuickshow/debian/control.in
deleted file mode 100644
index 8fca1b521..000000000
--- a/debian/squeeze/applications/kuickshow/debian/control.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Source: kuickshow-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, gawk, tdelibs14-trinity-dev, imlib11-dev, automake1.11-trinity, autoconf2.63, libtool, libltdl-dev
-Standards-Version: 3.8.3
-
-Package: kuickshow-trinity
-Section: graphics
-Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: khelpcenter-trinity
-Description: TDE image/slideshow viewer [Trinity]
- KuickShow is an image browser/viewer with a nice filebrowser to
- select images to be shown, slideshow support and the ability to
- display the following image formats: jpg, gif, tiff, png, bmp, psd,
- xpm, xbm, pbm and eim. Images can be displayed either in their own
- window, as large as the image, or fullscreen (which shrinks images too
- large to display). KuickShow also has a slideshow mode.
- .
- This package is part of TDE, as a component of the TDE graphics
- module. See the 'tde' and 'tdegraphics' packages for more information.
- .
- Homepage: http://kuickshow.sourceforge.net
diff --git a/debian/squeeze/applications/kvkbd/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kvkbd/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/kvpnc/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kvpnc/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/kvpnc/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kvpnc/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..9f8f97776 100644
--- a/debian/squeeze/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/mplayerthumbs/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/mplayerthumbs/debian/cdbs/uploaders.mk b/debian/squeeze/applications/mplayerthumbs/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/mplayerthumbs/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/piklab/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/piklab/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/piklab/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/piklab/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
index c7c382548..68dca1718 100644
--- a/debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/rosegarden/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,6 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/rosegarden/debian/cdbs/team-members b/debian/squeeze/applications/rosegarden/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/rosegarden/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/rosegarden/debian/cdbs/uploaders.mk b/debian/squeeze/applications/rosegarden/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/rosegarden/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/rosegarden/debian/control.in b/debian/squeeze/applications/rosegarden/debian/control.in
deleted file mode 100644
index 16124947d..000000000
--- a/debian/squeeze/applications/rosegarden/debian/control.in
+++ /dev/null
@@ -1,37 +0,0 @@
-Source: rosegarden-trinity
-Section: sound
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>> 5.0.0), quilt, cdbs, cmake, tdelibs14-trinity-dev, libasound2-dev (>= 1.0.0), libjack-dev, ladspa-sdk, liblrdf0-dev, liblircclient-dev, dssi-dev (>= 0.4 ), liblo-dev, libxft-dev, dpatch, libfftw3-dev
-Standards-Version: 3.8.4
-Homepage: http://www.rosegardenmusic.com/
-
-Package: rosegarden-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, khelpcenter-trinity, rosegarden-data-trinity (= ${source:Version}), libxml-twig-perl, sndfile-programs, xterm, tdebase-trinity-bin, konqueror-trinity | www-browser, flac
-Replaces: rosegarden-kde3 (<< 4:3.5.13)
-Breaks: rosegarden-kde3 (<< 4:3.5.13)
-Recommends: jackd, lilypond, swh-plugins | ladspa-plugin
-Suggests: qjackctl
-Description: music editor and MIDI/audio sequencer [Trinity]
- Rosegarden is a TDE application which provides a mixed Audio/MIDI
- sequencer (for playback and recording), a multi-track editor, music
- editing using both piano-roll and score notation, MIDI file IO,
- lilypond and Csound files export, etc.
-
-Package: rosegarden-data-trinity
-Architecture: all
-Recommends: rosegarden-trinity
-Replaces: rosegarden-data-kde3 (<< 4:3.5.13)
-Breaks: rosegarden-data-kde3 (<< 4:3.5.13)
-Priority: optional
-Description: music editor and MIDI/audio sequencer data files [Trinity]
- Rosegarden is a TDE application which provides a mixed Audio/MIDI
- sequencer (for playback and recording), a multi-track editor, music
- editing using both piano-roll and score notation, MIDI file IO,
- lilypond and Csound files export, etc.
- .
- This package provides the data files necessary for running Rosegarden
-
diff --git a/debian/squeeze/applications/smb4k/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/smb4k/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/smb4k/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/smb4k/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/smb4k/debian/cdbs/team-members b/debian/squeeze/applications/smb4k/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/smb4k/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/smb4k/debian/cdbs/uploaders.mk b/debian/squeeze/applications/smb4k/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/smb4k/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/soundkonverter/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/soundkonverter/debian/cdbs/team-members b/debian/squeeze/applications/soundkonverter/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/soundkonverter/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/soundkonverter/debian/cdbs/uploaders.mk b/debian/squeeze/applications/soundkonverter/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/soundkonverter/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
index c5d8ecfd3..68dca1718 100644
--- a/debian/squeeze/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tde-style-qtcurve/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,6 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tde-style-qtcurve/debian/cdbs/team-members b/debian/squeeze/applications/tde-style-qtcurve/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/tde-style-qtcurve/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/tde-style-qtcurve/debian/cdbs/uploaders.mk b/debian/squeeze/applications/tde-style-qtcurve/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/tde-style-qtcurve/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/tde-style-qtcurve/debian/control.in b/debian/squeeze/applications/tde-style-qtcurve/debian/control.in
deleted file mode 100644
index 9533bb7bd..000000000
--- a/debian/squeeze/applications/tde-style-qtcurve/debian/control.in
+++ /dev/null
@@ -1,32 +0,0 @@
-Source: tde-style-qtcurve-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 5), quilt, tdelibs14-trinity-dev, cmake, cdbs
-Standards-Version: 3.8.4
-
-Package: tde-style-qtcurve-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: tde-style-qtcurve-kde3 (<< 4:3.5.13)
-Breaks: tde-style-qtcurve-kde3 (<< 4:3.5.13)
-Recommends: gtk2-engines-qtcurve
-Provides: tde-style-qtcurve
-Description: This is a set of widget styles for Trinity based apps
- This package together with gtk2-engines-qtcurve aim to provide a unified look
- and feel on the desktop when using TDE and Gnome applications.
- .
- This package is most useful when installed together with 
- gtk2-engines-qtcurve.
-
-Package: qtcurve-trinity
-Architecture: any
-Depends: tde-style-qtcurve-trinity, gtk2-engines-qtcurve
-Replaces: qtcurve-kde3 (<< 4:3.5.13)
-Breaks: qtcurve-kde3 (<< 4:3.5.13)
-Description: This is a set of widget styles for Trinity and Gtk2 based apps
- This is an empty dummy package which will drag the packages 
- tde-style-qtcurve and gtk2-engines-qtcurve in your system.
-
diff --git a/debian/squeeze/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tde-systemsettings/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tde-systemsettings/debian/cdbs/team-members b/debian/squeeze/applications/tde-systemsettings/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/tde-systemsettings/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/tde-systemsettings/debian/cdbs/uploaders.mk b/debian/squeeze/applications/tde-systemsettings/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/tde-systemsettings/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdeio-apt/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tdeio-apt/debian/cdbs/team-members b/debian/squeeze/applications/tdeio-apt/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/tdeio-apt/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/tdeio-apt/debian/cdbs/uploaders.mk b/debian/squeeze/applications/tdeio-apt/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/tdeio-apt/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdeio-ftps/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tdeio-ftps/debian/cdbs/uploaders.mk b/debian/squeeze/applications/tdeio-ftps/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/tdeio-ftps/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk
index c5d8ecfd3..68dca1718 100644
--- a/debian/squeeze/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdeio-locate/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,6 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tdeio-locate/debian/cdbs/team-members b/debian/squeeze/applications/tdeio-locate/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/tdeio-locate/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/tdeio-locate/debian/cdbs/uploaders.mk b/debian/squeeze/applications/tdeio-locate/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/tdeio-locate/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/tdeio-locate/debian/control.in b/debian/squeeze/applications/tdeio-locate/debian/control.in
deleted file mode 100644
index 43ca84898..000000000
--- a/debian/squeeze/applications/tdeio-locate/debian/control.in
+++ /dev/null
@@ -1,21 +0,0 @@
-Source: tdeio-locate-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs14-trinity-dev, bzip2, python (>= 2.3), cmake
-Standards-Version: 3.8.4
-
-Package: tdeio-locate-trinity
-Architecture: any
-Depends: ${shlibs:Depends}
-Replaces: kio-locate-kde3 (<< 4:3.5.13)
-Breaks: kio-locate-kde3 (<< 4:3.5.13)
-Description: tdeio-slave for the locate command [Trinity]
- Adds support for the "locate:" and "locater:"
- protocols to Konqueror and other TDE applications.
- .
- This enables you to perform locate searches as you
- would in a terminal. The result is displayed just
- as a directory.
diff --git a/debian/squeeze/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdeio-sword/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/team-members b/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/uploaders.mk b/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/tdeio-umountwrapper/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
index fb36ac52f..2dff59226 100644
--- a/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,6 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/team-members b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/uploaders.mk b/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/tdenetworkmanager/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/tdenetworkmanager/debian/control.in b/debian/squeeze/applications/tdenetworkmanager/debian/control.in
deleted file mode 100644
index efe461abd..000000000
--- a/debian/squeeze/applications/tdenetworkmanager/debian/control.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Source: tdenetworkmanager-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs,
- debhelper (>= 7),
- pkg-config,
- tdelibs14-trinity-dev,
- libiw-dev,
- libnl-3-dev | libnl-dev (>= 1.1),
- quilt,
- libtool, libltdl-dev, cmake
-Standards-Version: 3.8.4
-Homepage: http://www.trinitydesktop.org/
-
-Package: network-manager-tde
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (>= 0.7.0)
-Recommends: tdewalletmanager-trinity
-Provides: tdenetworkmanager-trinity
-Description: TDE systray applet for controlling networking [Trinity]
- Systray applet for controlling network connections managed by
- a TDE network backend. It is mainly written for Trinity but also works for
- other desktop environments like GNOME or Xfce.
diff --git a/debian/squeeze/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
index ede9d744d..60310a01a 100644
--- a/debian/squeeze/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdepowersave/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tdepowersave/debian/cdbs/team-members b/debian/squeeze/applications/tdepowersave/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/tdepowersave/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/tdepowersave/debian/cdbs/uploaders.mk b/debian/squeeze/applications/tdepowersave/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/tdepowersave/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/tdesudo/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdesudo/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tdesvn/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
index c5d8ecfd3..68dca1718 100644
--- a/debian/squeeze/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdesvn/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,6 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tdesvn/debian/cdbs/team-members b/debian/squeeze/applications/tdesvn/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/tdesvn/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/tdesvn/debian/cdbs/uploaders.mk b/debian/squeeze/applications/tdesvn/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/tdesvn/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/tdesvn/debian/control.in b/debian/squeeze/applications/tdesvn/debian/control.in
deleted file mode 100644
index aa173a7ae..000000000
--- a/debian/squeeze/applications/tdesvn/debian/control.in
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: tdesvn-trinity
-Section: devel
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.50), debhelper (>= 5.0.0), cmake (>= 2.4), tdelibs14-trinity-dev (>= 4:3.4.3-2), libsvn-dev (>= 1.2.0), libssl-dev (>= 0.9.8a), libsqlite3-dev, gettext, quilt, libaprutil1-dev
-Standards-Version: 3.8.4
-
-Package: libsvnqt4-trinity
-Section: libs
-Architecture: any
-Replaces: libsvnqt4-kde3 (<< 4:3.5.13)
-Breaks: libsvnqt4-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt wrapper library for subversion [Trinity]
- This package provides svnqt, a Qt wrapper library around the 
- subversion library.
- .
- It is based on the RapidSvn SvnCpp library, a subversion client API 
- written in C++.
-  
-Package: libsvnqt-trinity-dev
-Section: libdevel
-Architecture: any
-Replaces: libsvnqt-kde3-dev (<< 4:3.5.13)
-Breaks: libsvnqt-kde3-dev (<< 4:3.5.13)
-Depends: libsvnqt4-trinity (= ${binary:Version}), libqt3-mt-dev, libsvn-dev
-Description: Qt wrapper library for subversion (development files) [Trinity]
- This package contains the header files and symbolic links that developers
- using svnqt will need.
-
-Package: tdesvn-trinity
-Section: devel
-Architecture: any
-Replaces: tdesvn-kde3 (<< 4:3.5.13)
-Breaks: tdesvn-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, ${misc:Depends}, tdesvn-tdeio-plugins-trinity (= ${binary:Version})
-Recommends: kompare-trinity, graphviz
-Suggests: khelpcenter-trinity, kdiff3-trinity
-Description: subversion client with tight TDE integration [Trinity]
- TDESvn is a graphical client for the subversion revision control
- system (svn).
- .
- Besides offering common and advanced svn operations, it features
- a tight integration into TDE and can be embedded into other TDE 
- applications like konqueror via the TDE component technology KParts.
-
-Package: tdesvn-tdeio-plugins-trinity
-Section: devel
-Architecture: any
-Replaces: tdesvn-kio-plugins-kde3 (<< 4:3.5.13)
-Breaks: tdesvn-kio-plugins-kde3 (<< 4:3.5.13)
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: tdesdk-tdeio-plugins-trinity
-Description: subversion I/O slaves for Trinity
- This packages includes KIO slaves for svn, svn+file, svn+http, 
- svn+https, svn+ssh. This allows you to access subversion repositories 
- inside any KIO enabled TDE application.
- .
- This package is part of tdesvn-trinity.
diff --git a/debian/squeeze/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tdmtheme/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tellico/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tellico/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/tellico/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tellico/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tork/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/tork/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..9f8f97776 100644
--- a/debian/squeeze/applications/tork/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/tork/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/tork/debian/cdbs/uploaders.mk b/debian/squeeze/applications/tork/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/tork/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
index 9920696ce..9f8f97776 100644
--- a/debian/squeeze/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/twin-style-crystal/debian/cdbs/debian-qt-kde.mk
@@ -21,7 +21,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/twin-style-crystal/debian/cdbs/team-members b/debian/squeeze/applications/twin-style-crystal/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/twin-style-crystal/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/twin-style-crystal/debian/cdbs/uploaders.mk b/debian/squeeze/applications/twin-style-crystal/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/twin-style-crystal/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/wlassistant/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
index c5d8ecfd3..68dca1718 100644
--- a/debian/squeeze/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/wlassistant/debian/cdbs/debian-qt-kde.mk
@@ -13,7 +13,6 @@ debian/stamp-cvs-make:
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/wlassistant/debian/cdbs/team-members b/debian/squeeze/applications/wlassistant/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/wlassistant/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/wlassistant/debian/cdbs/uploaders.mk b/debian/squeeze/applications/wlassistant/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/wlassistant/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/wlassistant/debian/control.in b/debian/squeeze/applications/wlassistant/debian/control.in
deleted file mode 100644
index ab3e7e5a6..000000000
--- a/debian/squeeze/applications/wlassistant/debian/control.in
+++ /dev/null
@@ -1,23 +0,0 @@
-Source: wlassistant-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-XSBC-Original-Maintainer: @@@MAINTAINER@@@
-Uploaders: @@@UPLOADERS@@@
-Build-Depends: debhelper (>= 4.1.0), quilt, cmake, cdbs, tdelibs14-trinity-dev, net-tools, wireless-tools, libiw-dev
-Standards-Version: 3.8.4
-
-Package: wlassistant-trinity
-Architecture: any
-Depends: kicker-trinity, net-tools, wireless-tools, menu, ${shlibs:Depends}
-Replaces: wlassistant-kde3 (<< 4:3.5.13)
-Breaks: wlassistant-kde3 (<< 4:3.5.13)
-Recommends: dhcp3-client | dhcp-client | dhcpcd
-Description: User friendly TDE frontend for wireless network connection [Trinity]
- Wireless Assistant scans for wireless access points and displays link quality,
- encryption and other useful information. When user wants to connect to a
- network, Wireless Assistant opens up its wizards and guides the user through
- Wi-Fi settings. After a successful connection is made the settings are
- remembered so next time the user won't have to enter them again.
- .
-  Homepage: http://wlassistant.sourceforge.net/
diff --git a/debian/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk
index 32ba4acfb..60310a01a 100644
--- a/debian/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/yakuake/debian/cdbs/debian-qt-kde.mk
@@ -23,7 +23,6 @@ endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-#include debian/cdbs/uploaders.mk
 
 ifndef _cdbs_rules_patchsys_quilt
 DEB_PATCHDIRS := debian/patches/common debian/patches
diff --git a/debian/squeeze/applications/yakuake/debian/cdbs/team-members b/debian/squeeze/applications/yakuake/debian/cdbs/team-members
deleted file mode 100644
index 05761af6e..000000000
--- a/debian/squeeze/applications/yakuake/debian/cdbs/team-members
+++ /dev/null
@@ -1,16 +0,0 @@
-Sune Vuorela <debian@pusling.com>
-Ana Beatriz Guerrero Lopez <ana@debian.org>
-Fathi Boudra <fboudra@free.fr>
-Modestas Vainius <geromanas@mailas.com>
-Josh Metzler <joshdeb@metzlers.org>
-Isaac Clerencia <isaac@debian.org>
-Adeodato Simó <dato@net.com.org.es>
-Adeodato Simo <dato@net.com.org.es>
-Christopher Martin <chrsmrtn@debian.org>
-Daniel Schepler <schepler@debian.org>
-Sarah Hobbs <hobbsee@ubuntu.com>
-Nacho Barrientos Arias <nacho@debian.org>
-Ricardo Javier Cardenes Medina <rcardenes@debian.org>
-Ricardo Cardenes <rcardenes@debian.org>
-Armin Berres <trigger+debian@space-based.de>
-Francesco Pedrini <francesco.pedrini@gmail.com>
diff --git a/debian/squeeze/applications/yakuake/debian/cdbs/uploaders.mk b/debian/squeeze/applications/yakuake/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/yakuake/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders