From 1269cdc27929655ded012f533b1755b417b17cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 21 Jul 2012 13:19:55 +0200 Subject: Removed former way of managing patches for knights on Debian and Ubuntu (cherry picked from commit 3f5a4a6e2f3282f95ec1c49e081f4a745e156d72) --- debian/lenny/applications/knights/debian/control | 2 +- debian/lenny/applications/knights/debian/rules | 7 ++----- debian/squeeze/applications/knights/debian/control | 2 +- debian/squeeze/applications/knights/debian/rules | 7 ++----- ubuntu/maverick/applications/knights/debian/control | 2 +- ubuntu/maverick/applications/knights/debian/rules | 7 ++----- 6 files changed, 9 insertions(+), 18 deletions(-) diff --git a/debian/lenny/applications/knights/debian/control b/debian/lenny/applications/knights/debian/control index a86c5632b..685b0a804 100644 --- a/debian/lenny/applications/knights/debian/control +++ b/debian/lenny/applications/knights/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Jose Carlos Medeiros Uploaders: Ola Lundqvist -Build-Depends: debhelper (>= 5.0.0), kdelibs4-trinity-dev, poxml, dpatch, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, poxml, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://knights.sourceforge.net/ diff --git a/debian/lenny/applications/knights/debian/rules b/debian/lenny/applications/knights/debian/rules index d7e8330c7..85ac2af45 100755 --- a/debian/lenny/applications/knights/debian/rules +++ b/debian/lenny/applications/knights/debian/rules @@ -18,7 +18,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -include /usr/share/dpatch/dpatch.make CFLAGS = -Wall -g @@ -37,7 +36,7 @@ debian/knights.xpm: media/hi32-app-knights.png convert $< $@ -config.status: configure patch +config.status: configure dh_testdir ! [ -f /usr/share/libtool/ltmain.sh ] || \ @@ -61,9 +60,7 @@ build-stamp: config.status debian/knights.xpm $(MAKE) touch build-stamp -clean: clean-patched unpatch - -clean-patched: +clean: dh_testdir dh_testroot rm -f po/de.gmo diff --git a/debian/squeeze/applications/knights/debian/control b/debian/squeeze/applications/knights/debian/control index a86c5632b..685b0a804 100644 --- a/debian/squeeze/applications/knights/debian/control +++ b/debian/squeeze/applications/knights/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Jose Carlos Medeiros Uploaders: Ola Lundqvist -Build-Depends: debhelper (>= 5.0.0), kdelibs4-trinity-dev, poxml, dpatch, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, poxml, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://knights.sourceforge.net/ diff --git a/debian/squeeze/applications/knights/debian/rules b/debian/squeeze/applications/knights/debian/rules index d7e8330c7..85ac2af45 100755 --- a/debian/squeeze/applications/knights/debian/rules +++ b/debian/squeeze/applications/knights/debian/rules @@ -18,7 +18,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -include /usr/share/dpatch/dpatch.make CFLAGS = -Wall -g @@ -37,7 +36,7 @@ debian/knights.xpm: media/hi32-app-knights.png convert $< $@ -config.status: configure patch +config.status: configure dh_testdir ! [ -f /usr/share/libtool/ltmain.sh ] || \ @@ -61,9 +60,7 @@ build-stamp: config.status debian/knights.xpm $(MAKE) touch build-stamp -clean: clean-patched unpatch - -clean-patched: +clean: dh_testdir dh_testroot rm -f po/de.gmo diff --git a/ubuntu/maverick/applications/knights/debian/control b/ubuntu/maverick/applications/knights/debian/control index 8c7cc33a4..bce9cd8f4 100644 --- a/ubuntu/maverick/applications/knights/debian/control +++ b/ubuntu/maverick/applications/knights/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Jose Carlos Medeiros Uploaders: Ola Lundqvist -Build-Depends: debhelper (>= 5.0.0), kdelibs4-trinity-dev, poxml, dpatch, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: debhelper (>= 5.0.0), quilt, kdelibs4-trinity-dev, poxml, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Homepage: http://knights.sourceforge.net/ diff --git a/ubuntu/maverick/applications/knights/debian/rules b/ubuntu/maverick/applications/knights/debian/rules index d7e8330c7..85ac2af45 100755 --- a/ubuntu/maverick/applications/knights/debian/rules +++ b/ubuntu/maverick/applications/knights/debian/rules @@ -18,7 +18,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -include /usr/share/dpatch/dpatch.make CFLAGS = -Wall -g @@ -37,7 +36,7 @@ debian/knights.xpm: media/hi32-app-knights.png convert $< $@ -config.status: configure patch +config.status: configure dh_testdir ! [ -f /usr/share/libtool/ltmain.sh ] || \ @@ -61,9 +60,7 @@ build-stamp: config.status debian/knights.xpm $(MAKE) touch build-stamp -clean: clean-patched unpatch - -clean-patched: +clean: dh_testdir dh_testroot rm -f po/de.gmo -- cgit v1.2.1