From f24915471ea396c53670df51b2affc4af74373bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 15 Sep 2013 20:29:47 +0200 Subject: Switch patch system from simple to quilt on Debian and Ubuntu --- ubuntu/maverick/dependencies/tqt3/debian/control | 2 +- ubuntu/maverick/dependencies/tqt3/debian/rules | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ubuntu/maverick/dependencies/tqt3/debian') diff --git a/ubuntu/maverick/dependencies/tqt3/debian/control b/ubuntu/maverick/dependencies/tqt3/debian/control index 1655a1357..b524aa513 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/control +++ b/ubuntu/maverick/dependencies/tqt3/debian/control @@ -2,7 +2,7 @@ Source: tqt-x11-free Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Sune Vuorela , Fathi Boudra , Modestas Vainius -Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4), +Build-Depends: cdbs, debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, diff --git a/ubuntu/maverick/dependencies/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules index d2d66f6a7..b91e34413 100755 --- a/ubuntu/maverick/dependencies/tqt3/debian/rules +++ b/ubuntu/maverick/dependencies/tqt3/debian/rules @@ -33,7 +33,7 @@ endif #sparc endif #hurd # quilt stuff -include /usr/share/quilt/quilt.make +include /usr/share/cdbs/1/rules/patchsys-quilt.mk # build variables (directorys) DEBIAN = $(shell pwd)/debian @@ -127,7 +127,7 @@ build: libqt-thread-stamp touch build-stamp -libqt-thread-stamp: $(QUILT_STAMPFN) +libqt-thread-stamp: post-patches @echo "QTDIR is ${QTDIR}" @@ -175,7 +175,7 @@ libqt-thread-stamp: $(QUILT_STAMPFN) touch libqt-thread-stamp -clean: unpatch +clean:: dh_testdir @@ -468,4 +468,4 @@ binary-arch: build install dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS) binary: binary-indep binary-arch -.PHONY: build binary-indep binary-arch binary install clean patch unpatch +.PHONY: build binary-indep binary-arch binary install clean -- cgit v1.2.1