From afcb665a82e683faf764d47e240101309427d620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 30 Jul 2012 01:39:24 +0200 Subject: [PATCH] Superseded former way of managing patches for kcpuload on Debian and Ubuntu --- .../applications/kcpuload/debian/control | 2 +- .../applications/kcpuload/debian/rules | 20 ------------------- .../applications/kcpuload/debian/control | 2 +- .../applications/kcpuload/debian/rules | 20 ------------------- 4 files changed, 2 insertions(+), 42 deletions(-) diff --git a/debian/squeeze/applications/kcpuload/debian/control b/debian/squeeze/applications/kcpuload/debian/control index 2b2dd5b40..94ab1c0f9 100644 --- a/debian/squeeze/applications/kcpuload/debian/control +++ b/debian/squeeze/applications/kcpuload/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Helen Faulkner -Build-Depends: debhelper (>> 4.0.0), kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>> 4.0.0), quilt, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kcpuload-trinity diff --git a/debian/squeeze/applications/kcpuload/debian/rules b/debian/squeeze/applications/kcpuload/debian/rules index 2ab783f6d..18a8a4988 100755 --- a/debian/squeeze/applications/kcpuload/debian/rules +++ b/debian/squeeze/applications/kcpuload/debian/rules @@ -51,16 +51,6 @@ configure: configure-stamp configure-stamp: dh_testdir - # Apply Debian specific patches - if test ! -f patch-stamp; then \ - for patch in $(CURDIR)/debian/patches/*.diff ;\ - do \ - echo APPLYING PATCH\: $${patch##*/};\ - patch -p1 < $$patch ;\ - done ;\ - touch patch-stamp ;\ - fi - ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -103,16 +93,6 @@ clean: dh_testroot rm -f build-stamp configure-stamp debian/debiandirs - # Remove Debian specific patches - if test -f patch-stamp; then \ - for patch in $(CURDIR)/debian/patches/*.diff ;\ - do \ - echo REMOVING PATCH\: $${patch##*/};\ - patch -p1 -R < $$patch ;\ - done ;\ - rm -f patch-stamp ;\ - fi - # Remove build tree rm -rf $(objdir) diff --git a/ubuntu/maverick/applications/kcpuload/debian/control b/ubuntu/maverick/applications/kcpuload/debian/control index 637198e25..e96b24251 100644 --- a/ubuntu/maverick/applications/kcpuload/debian/control +++ b/ubuntu/maverick/applications/kcpuload/debian/control @@ -3,7 +3,7 @@ Section: kde Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Helen Faulkner -Build-Depends: debhelper (>> 4.0.0), kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>> 4.0.0), quilt, kdelibs4-trinity-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kcpuload-trinity diff --git a/ubuntu/maverick/applications/kcpuload/debian/rules b/ubuntu/maverick/applications/kcpuload/debian/rules index 2ab783f6d..18a8a4988 100755 --- a/ubuntu/maverick/applications/kcpuload/debian/rules +++ b/ubuntu/maverick/applications/kcpuload/debian/rules @@ -51,16 +51,6 @@ configure: configure-stamp configure-stamp: dh_testdir - # Apply Debian specific patches - if test ! -f patch-stamp; then \ - for patch in $(CURDIR)/debian/patches/*.diff ;\ - do \ - echo APPLYING PATCH\: $${patch##*/};\ - patch -p1 < $$patch ;\ - done ;\ - touch patch-stamp ;\ - fi - ! [ -f /usr/share/libtool/ltmain.sh ] || \ cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ @@ -103,16 +93,6 @@ clean: dh_testroot rm -f build-stamp configure-stamp debian/debiandirs - # Remove Debian specific patches - if test -f patch-stamp; then \ - for patch in $(CURDIR)/debian/patches/*.diff ;\ - do \ - echo REMOVING PATCH\: $${patch##*/};\ - patch -p1 -R < $$patch ;\ - done ;\ - rm -f patch-stamp ;\ - fi - # Remove build tree rm -rf $(objdir)