summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-09 16:03:35 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-09 16:03:35 +0200
commitbebae6d706c1484b05ae4c77ee6f14a10b4dac73 (patch)
tree2619751cbd4d94bc7deebf61cf21a16427180464
parent1b09f53e53b546f242e46bdfde4ff8e5b38165c0 (diff)
downloadtde-packaging-bebae6d706c1484b05ae4c77ee6f14a10b4dac73.tar.gz
tde-packaging-bebae6d706c1484b05ae4c77ee6f14a10b4dac73.zip
Fix kcpuload FTBFS on Debian and Ubuntu
-rwxr-xr-xdebian/lenny/applications/kcpuload/debian/rules9
-rwxr-xr-xdebian/squeeze/applications/kcpuload/debian/rules9
-rwxr-xr-xdebian/wheezy/applications/kcpuload/debian/rules9
-rwxr-xr-xubuntu/maverick/applications/kcpuload/debian/rules9
-rwxr-xr-xubuntu/precise/applications/kcpuload/debian/rules9
-rwxr-xr-xubuntu/raring/applications/kcpuload/debian/rules9
6 files changed, 6 insertions, 48 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
diff --git a/ubuntu/maverick/applications/kcpuload/debian/rules b/ubuntu/maverick/applications/kcpuload/debian/rules
index 37d2cf8ee..385c24313 100755
--- a/ubuntu/maverick/applications/kcpuload/debian/rules
+++ b/ubuntu/maverick/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/ubuntu/precise/applications/kcpuload/debian/rules b/ubuntu/precise/applications/kcpuload/debian/rules
index 37d2cf8ee..385c24313 100755
--- a/ubuntu/precise/applications/kcpuload/debian/rules
+++ b/ubuntu/precise/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/ubuntu/raring/applications/kcpuload/debian/rules b/ubuntu/raring/applications/kcpuload/debian/rules
index 37d2cf8ee..385c24313 100755
--- a/ubuntu/raring/applications/kcpuload/debian/rules
+++ b/ubuntu/raring/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