From ddaf0efdd2a002981c53e70867b3ab5f898d5034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 30 Jul 2012 20:55:50 +0200 Subject: Superseded former way of managing patches for knetload on Debian and Ubuntu --- debian/squeeze/applications/knetload/debian/control | 2 +- debian/squeeze/applications/knetload/debian/rules | 20 -------------------- ubuntu/maverick/applications/knetload/debian/control | 2 +- ubuntu/maverick/applications/knetload/debian/rules | 20 -------------------- 4 files changed, 2 insertions(+), 42 deletions(-) diff --git a/debian/squeeze/applications/knetload/debian/control b/debian/squeeze/applications/knetload/debian/control index 65d5b4b4d..176db71ef 100644 --- a/debian/squeeze/applications/knetload/debian/control +++ b/debian/squeeze/applications/knetload/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 (>= 4:3.4.2), automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>> 4.0.0), quilt, kdelibs4-trinity-dev (>= 4:3.4.2), automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: knetload-trinity diff --git a/debian/squeeze/applications/knetload/debian/rules b/debian/squeeze/applications/knetload/debian/rules index c0beba707..c34d627a4 100755 --- a/debian/squeeze/applications/knetload/debian/rules +++ b/debian/squeeze/applications/knetload/debian/rules @@ -50,16 +50,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 ] || \ @@ -98,16 +88,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/knetload/debian/control b/ubuntu/maverick/applications/knetload/debian/control index 294fc1aa8..e038f8962 100644 --- a/ubuntu/maverick/applications/knetload/debian/control +++ b/ubuntu/maverick/applications/knetload/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 (>= 4:3.4.2), automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>> 4.0.0), quilt, kdelibs4-trinity-dev (>= 4:3.4.2), automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: knetload-trinity diff --git a/ubuntu/maverick/applications/knetload/debian/rules b/ubuntu/maverick/applications/knetload/debian/rules index c0beba707..c34d627a4 100755 --- a/ubuntu/maverick/applications/knetload/debian/rules +++ b/ubuntu/maverick/applications/knetload/debian/rules @@ -50,16 +50,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 ] || \ @@ -98,16 +88,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) -- cgit v1.2.1