summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2012-07-21 13:19:55 +0200
committerSlávek Banko <[email protected]>2012-07-21 13:19:55 +0200
commit3f5a4a6e2f3282f95ec1c49e081f4a745e156d72 (patch)
tree3d2a32910093ad715bd38e340d4ef863ba12a70b /debian
parent90754b5d0b0b4eca0438cff909fa816a4b110a9f (diff)
downloadtde-packaging-3f5a4a6e2f3282f95ec1c49e081f4a745e156d72.tar.gz
tde-packaging-3f5a4a6e2f3282f95ec1c49e081f4a745e156d72.zip
Removed former way of managing patches for knights on Debian and Ubuntu
Diffstat (limited to 'debian')
-rw-r--r--debian/lenny/applications/knights/debian/control2
-rwxr-xr-xdebian/lenny/applications/knights/debian/rules7
-rw-r--r--debian/squeeze/applications/knights/debian/control2
-rwxr-xr-xdebian/squeeze/applications/knights/debian/rules7
4 files changed, 6 insertions, 12 deletions
diff --git a/debian/lenny/applications/knights/debian/control b/debian/lenny/applications/knights/debian/control
index 0e64bc23f..8c281d27e 100644
--- a/debian/lenny/applications/knights/debian/control
+++ b/debian/lenny/applications/knights/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <[email protected]>
XSBC-Original-Maintainer: Jose Carlos Medeiros <[email protected]>
Uploaders: Ola Lundqvist <[email protected]>
-Build-Depends: debhelper (>= 5.0.0), tdelibs4-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, tdelibs4-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 fc447c09a..7bbbd796f 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 0e64bc23f..8c281d27e 100644
--- a/debian/squeeze/applications/knights/debian/control
+++ b/debian/squeeze/applications/knights/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <[email protected]>
XSBC-Original-Maintainer: Jose Carlos Medeiros <[email protected]>
Uploaders: Ola Lundqvist <[email protected]>
-Build-Depends: debhelper (>= 5.0.0), tdelibs4-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, tdelibs4-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 fc447c09a..7bbbd796f 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