DEB: Remove the translation templates update during building.

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

111 files changed, 4 insertions, 984 deletions

diff --git a/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk b/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk
index 4a098a312..f5d237249 100644
--- a/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/abakus/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk b/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk b/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/compizconfig-backend-tdeconfig/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk b/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk b/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk
index 4a098a312..f5d237249 100644
--- a/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/dolphin/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk b/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk b/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/kde.mk b/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/kde.mk
index 4a098a312..f5d237249 100644
--- a/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/gwenview-i18n/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk b/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk b/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/k3b/debian/trinity.mk b/ubuntu/maverick/applications/k3b/debian/trinity.mk
deleted file mode 100644
index 17d35ae2c..000000000
--- a/ubuntu/maverick/applications/k3b/debian/trinity.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Description: A class for KDE packages; sets KDE environment variables, etc
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_kde
-_cdbs_class_kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-endif
-
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --without-arts $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/tde"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-common-build-arch common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/usr/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
-common-install-arch common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
-
-clean::
-	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
-
-# This is a convenience target for calling manually.  It's not part of
-# the build process.
-buildprep: clean apply-patches
-	$(MAKE) -f admin/Makefile.common dist
-	debian/rules clean
-
-endif
diff --git a/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk b/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kasablanca/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kasablanca/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kasablanca/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kasablanca/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk b/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kbfx/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbfx/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/kbfx/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kbfx/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kbibtex/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbibtex/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kbibtex/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kbibtex/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kbiff/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbiff/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/kbiff/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kbiff/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kcmautostart/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kcmautostart/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/kcmautostart/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kcmautostart/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kdbg/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdbg/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kdbg/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdbg/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk
index ed93c4763..80176d63e 100644
--- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk b/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kftpgrabber/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk
index 4a098a312..f5d237249 100644
--- a/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kgtk-qt3/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kiosktool/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kkbswitch/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/kkbswitch/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kkbswitch/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/kde.mk b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/klcddimmer/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/klcddimmer/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kmyfirewall/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/kmyfirewall/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kmyfirewall/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/knetload/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetload/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/knetload/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knetload/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/knmap/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knmap/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/knmap/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knmap/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/knutclient/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knutclient/debian/cdbs/kde.mk
index ed93c4763..80176d63e 100644
--- a/ubuntu/maverick/applications/knutclient/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/knutclient/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk b/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk b/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/krecipes/debian/cdbs/kde.mk b/ubuntu/maverick/applications/krecipes/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/krecipes/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/krecipes/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/krename/debian/cdbs/kde.mk b/ubuntu/maverick/applications/krename/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/krename/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/krename/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk b/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kscope/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kscope/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/kscope/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kscope/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/ksensors/debian/cdbs/kde.mk b/ubuntu/maverick/applications/ksensors/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/ksensors/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/ksensors/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kshowmail/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kshowmail/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kshowmail/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kshowmail/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kshutdown/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kshutdown/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kshutdown/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kshutdown/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/cdbs/kde.mk b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/cdbs/kde.mk
index ed93c4763..80176d63e 100644
--- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk b/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/kvpnc/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kvpnc/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/kvpnc/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kvpnc/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/kde.mk b/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/mplayerthumbs/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/piklab/debian/cdbs/kde.mk b/ubuntu/maverick/applications/piklab/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/piklab/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/piklab/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk b/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk
index 4a098a312..f5d237249 100644
--- a/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/rosegarden/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk b/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk
index cebb2d01d..a0f991757 100644
--- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk
index 4a098a312..f5d237249 100644
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdeio-apt/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdeio-ftps/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/kde.mk
index 4a098a312..f5d237249 100644
--- a/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdeio-locate/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/kde.mk
index 6ded9e7fa..7db11361b 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdeio-sword/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdeio-umountwrapper/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/kde.mk
index 4a098a312..f5d237249 100644
--- a/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdenetworkmanager/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdepowersave/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk
index 4a098a312..f5d237249 100644
--- a/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdesvn/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
index ed93c4763..80176d63e 100644
--- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tellico/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tellico/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/tellico/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tellico/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/tork/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tork/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/tork/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/tork/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk b/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk
index 4a098a312..f5d237249 100644
--- a/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/wlassistant/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/dependencies/akode/debian/cdbs/kde.mk b/ubuntu/maverick/dependencies/akode/debian/cdbs/kde.mk
index 5ae45d70b..0d878b139 100644
--- a/ubuntu/maverick/dependencies/akode/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/dependencies/akode/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/usr/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk b/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk b/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk b/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk b/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdebase/debian/cdbs/kde.mk b/ubuntu/maverick/tdebase/debian/cdbs/kde.mk
index 4a098a312..f5d237249 100644
--- a/ubuntu/maverick/tdebase/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdebase/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk b/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk b/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdegames/debian/cdbs/kde.mk b/ubuntu/maverick/tdegames/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/tdegames/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdegames/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk b/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk b/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control
index 39cc88740..20af2f512 100644
--- a/ubuntu/maverick/tdelibs/debian/control
+++ b/ubuntu/maverick/tdelibs/debian/control
@@ -15,7 +15,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 7.0.50~), quilt, autotools
  libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
  libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
  sharutils, texinfo, libogg-dev, libtqtinterface-dev,
- gettext-kde, lsb-release, base-files, sudo, libr-dev,
+ lsb-release, base-files, sudo, libr-dev,
  libudev-dev, cmake, libltdl-dev, libmagic-dev
 Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.3
@@ -88,7 +88,7 @@ Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~),
  libsasl2-dev, libssl-dev, libxcomposite-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
  libavahi-client-dev (>= 0.4), libtqtinterface-dev,
- gettext-kde, libr-dev, libudev-dev, libdbus-1-tqt-dev, binutils-dev
+ libr-dev, libudev-dev, libdbus-1-tqt-dev, binutils-dev
 Provides: tdelibs-trinity-dev
 Description: development files for the TDE core libraries
  This package contains all the headers and other related files needed
diff --git a/ubuntu/maverick/tdelibs/debian/control.in b/ubuntu/maverick/tdelibs/debian/control.in
index e86a31e55..f9be6c82f 100644
--- a/ubuntu/maverick/tdelibs/debian/control.in
+++ b/ubuntu/maverick/tdelibs/debian/control.in
@@ -15,7 +15,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), quilt, autotools-
  libtiff-dev, libavahi-client-dev (>= 0.4),
  libavahi-qt3-dev (>= 0.4), libxml2-dev, libxml2-utils, libxslt1-dev,
  sharutils, texinfo,
- gettext-kde, tdesdk-scripts, lsb-release, base-files, sudo
+ tdesdk-scripts, lsb-release, base-files, sudo
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.7.2
 
@@ -84,7 +84,7 @@ Depends: tdelibs14 (= ${source:Version}), libart-2.0-dev (>= 2.3.17),
  libqt3-mt-dev (>= 3:3.3.5), libsasl2-dev, libssl-dev,
  libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
  libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4),
- gettext-kde, tdesdk-scripts
+ tdesdk-scripts
 Provides: tdelibs-dev
 Replaces: tdebase-dev (<< 4:3.4.0), tdelibs14 (<< 4:3.5.7.dfsg.1-5)
 Description: development files for the TDE core libraries
diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules
index 3f1d030f8..17a3ffda4 100755
--- a/ubuntu/maverick/tdelibs/debian/rules
+++ b/ubuntu/maverick/tdelibs/debian/rules
@@ -102,33 +102,6 @@ ifeq (linux,$(DEB_HOST_ARCH_OS))
 	echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/tdelibs14-trinity-dev.substvars
 endif
 
-common-install-prehook-impl::
-	mkdir -p po
-#	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/usr/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-#	-for file in po/*pot; do \
-#		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-#	done
-
-#	msgcat --use-first tde.pot po/tdelibs.pot > tdelibs.pot-merged
-#	mv -f tdelibs.pot-merged po/tdelibs.pot
-	cp -Rp tde.pot po/tdelibs.pot
-
-	# generate .po files for .desktop etc files
-	if [ -f debian/kubuntu-desktop-i18n/createdesktop.pl ]; then \
-	  sh debian/kubuntu-desktop-i18n/findfiles LIST; \
-	  cat LIST; \
-	  perl debian/kubuntu-desktop-i18n/createdesktop.pl --file-list=LIST --base-dir=. > desktop.$(DEB_SOURCE_PACKAGE).tmp; \
-	  msguniq --to-code=UTF-8 --no-wrap -o desktop.$(DEB_SOURCE_PACKAGE) desktop.$(DEB_SOURCE_PACKAGE).tmp 2>/dev/null; \
-	  python debian/kubuntu-desktop-i18n/msgsplit desktop.$(DEB_SOURCE_PACKAGE); \
-	  mv desktop.$(DEB_SOURCE_PACKAGE) po/desktop_$(DEB_SOURCE_PACKAGE).pot; \
-	  rm -f desktop.$(DEB_SOURCE_PACKAGE) desktop.$(DEB_SOURCE_PACKAGE).tmp; \
-	  # add translation domain to files \
-	  for file in `cat LIST`; do \
-	    echo X-Ubuntu-Gettext-Domain=desktop_$(DEB_SOURCE_PACKAGE) >> $${file}; \
-	  done; \
-	  rm -f LIST; \
-	fi
-
 binary-install/tdelibs14-trinity::
 	mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real
 	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real
diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk b/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk b/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdepim/debian/cdbs/kde.mk b/ubuntu/maverick/tdepim/debian/cdbs/kde.mk
index 4a098a312..f5d237249 100644
--- a/ubuntu/maverick/tdepim/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdepim/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 #	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk b/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk b/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk b/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk b/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk
index 023886fc8..80176d63e 100644
--- a/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk
@@ -75,20 +75,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.
diff --git a/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk b/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk
index 765560c89..1ac26c4b7 100644
--- a/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk
@@ -73,20 +73,12 @@ debian/stamp-kde-apidox:
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
 	touch $@
 
-common-install-prehook-impl::
-	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/opt/trinity/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages	
-	-for file in po/*pot; do \
-		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
-	done
-
 common-install-arch common-install-indep:: common-install-kde-apidox
 common-install-kde-apidox::
 	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
 
 clean::
 	rm -f debian/stamp-kde-apidox
-	rm -rf po/*.pot
 
 # This is a convenience target for calling manually.  It's not part of
 # the build process.