Fix kcpuload FTBFS on Debian and Ubuntu

3 files changed, 3 insertions, 24 deletions

diff --git a/debian/lenny/applications/kcpuload/debian/rules b/debian/lenny/applications/kcpuload/debian/rules
index 37d2cf8ee..385c24313 100755
--- a/debian/lenny/applications/kcpuload/debian/rules
+++ b/debian/lenny/applications/kcpuload/debian/rules
@@ -45,11 +45,6 @@ ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux)
   #export CXXFLAGS=-O3 -march=i686 -ffast-math -finline-functions
 endif
 
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -104,7 +99,7 @@ debian-clean:
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp debian/debiandirs
+	rm -f build-stamp configure-stamp
 
 	# Remove Debian specific patches
 	if test -f patch-stamp; then \
@@ -169,8 +164,6 @@ binary-common:
 	dh_testroot
 	dh_installchangelogs kcpuload/ChangeLog
 	dh_installdocs
-	mkdir -p debian/kcpuload-trinity/opt/trinity/share/doc
-	mv debian/kcpuload-trinity/usr/share/doc/tde debian/kcpuload-trinity/opt/trinity/share/doc/
 	rm -fr debian/kcpuload-trinity/usr/share/doc-base
 	dh_installexamples
 	dh_installmanpages
diff --git a/debian/squeeze/applications/kcpuload/debian/rules b/debian/squeeze/applications/kcpuload/debian/rules
index 37d2cf8ee..385c24313 100755
--- a/debian/squeeze/applications/kcpuload/debian/rules
+++ b/debian/squeeze/applications/kcpuload/debian/rules
@@ -45,11 +45,6 @@ ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux)
   #export CXXFLAGS=-O3 -march=i686 -ffast-math -finline-functions
 endif
 
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -104,7 +99,7 @@ debian-clean:
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp debian/debiandirs
+	rm -f build-stamp configure-stamp
 
 	# Remove Debian specific patches
 	if test -f patch-stamp; then \
@@ -169,8 +164,6 @@ binary-common:
 	dh_testroot
 	dh_installchangelogs kcpuload/ChangeLog
 	dh_installdocs
-	mkdir -p debian/kcpuload-trinity/opt/trinity/share/doc
-	mv debian/kcpuload-trinity/usr/share/doc/tde debian/kcpuload-trinity/opt/trinity/share/doc/
 	rm -fr debian/kcpuload-trinity/usr/share/doc-base
 	dh_installexamples
 	dh_installmanpages
diff --git a/debian/wheezy/applications/kcpuload/debian/rules b/debian/wheezy/applications/kcpuload/debian/rules
index 37d2cf8ee..385c24313 100755
--- a/debian/wheezy/applications/kcpuload/debian/rules
+++ b/debian/wheezy/applications/kcpuload/debian/rules
@@ -45,11 +45,6 @@ ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux)
   #export CXXFLAGS=-O3 -march=i686 -ffast-math -finline-functions
 endif
 
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -104,7 +99,7 @@ debian-clean:
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp debian/debiandirs
+	rm -f build-stamp configure-stamp
 
 	# Remove Debian specific patches
 	if test -f patch-stamp; then \
@@ -169,8 +164,6 @@ binary-common:
 	dh_testroot
 	dh_installchangelogs kcpuload/ChangeLog
 	dh_installdocs
-	mkdir -p debian/kcpuload-trinity/opt/trinity/share/doc
-	mv debian/kcpuload-trinity/usr/share/doc/tde debian/kcpuload-trinity/opt/trinity/share/doc/
 	rm -fr debian/kcpuload-trinity/usr/share/doc-base
 	dh_installexamples
 	dh_installmanpages