diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-15 20:29:47 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-07-18 00:23:09 +0200 |
| commit | f025c10ab2c705f3b86669b3dae1817c0cdd6d1d (patch) | |
| tree | e9ca489d65a931d999e375719a0ddd5d670b77f6 /ubuntu/maverick/dependencies | |
| parent | 17ce56f2601667a7515bbe21b4754cdb51f0d650 (diff) | |
| download | tde-packaging-f025c10ab2c705f3b86669b3dae1817c0cdd6d1d.tar.gz tde-packaging-f025c10ab2c705f3b86669b3dae1817c0cdd6d1d.zip | |
Switch patch system from simple to quilt on Debian and Ubuntu
(cherry picked from commit f24915471ea396c53670df51b2affc4af74373bf)
Diffstat (limited to 'ubuntu/maverick/dependencies')
9 files changed, 9 insertions, 9 deletions
diff --git a/ubuntu/maverick/dependencies/arts/debian/rules b/ubuntu/maverick/dependencies/arts/debian/rules index 9c6b3f289..2e7e5c14f 100755 --- a/ubuntu/maverick/dependencies/arts/debian/rules +++ b/ubuntu/maverick/dependencies/arts/debian/rules @@ -10,7 +10,7 @@ export LD_LIBRARY_PATH include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -#include /usr/share/cdbs/1/rules/simple-patchsys.mk +#include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/patches/series diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules index 6a0f5bbed..ffe1bf6e7 100755 --- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -#include /usr/share/cdbs/1/rules/simple-patchsys.mk +#include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series b/ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/patches/series diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules b/ubuntu/maverick/dependencies/dbus-tqt/debian/rules index 3edd7c59c..71f625c30 100755 --- a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/rules @@ -3,7 +3,7 @@ # Copyright © 2003 Daniel Stone <daniels@debian.org> # Copyright © 2006 Sjoerd Simons <sjoerd@debian.org> -#include /usr/share/cdbs/1/rules/simple-patchsys.mk +#include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk diff --git a/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/maverick/dependencies/qt3/debian/control index 6095ea953..d6215cbc3 100644 --- a/ubuntu/maverick/dependencies/qt3/debian/control +++ b/ubuntu/maverick/dependencies/qt3/debian/control @@ -2,7 +2,7 @@ Source: qt-x11-free Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com> XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -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/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules index 09124ab8b..1b4954261 100755 --- a/ubuntu/maverick/dependencies/qt3/debian/rules +++ b/ubuntu/maverick/dependencies/qt3/debian/rules @@ -29,7 +29,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 @@ -123,7 +123,7 @@ build: libqt-thread-stamp touch build-stamp -libqt-thread-stamp: $(QUILT_STAMPFN) +libqt-thread-stamp: post-patches @echo "QTDIR is ${QTDIR}" @@ -171,7 +171,7 @@ libqt-thread-stamp: $(QUILT_STAMPFN) touch libqt-thread-stamp -clean: unpatch +clean:: dh_testdir @@ -475,4 +475,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 diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/patches/series b/ubuntu/maverick/dependencies/tqtinterface/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ubuntu/maverick/dependencies/tqtinterface/debian/patches/series diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/rules b/ubuntu/maverick/dependencies/tqtinterface/debian/rules index ed3f07a6d..464100180 100755 --- a/ubuntu/maverick/dependencies/tqtinterface/debian/rules +++ b/ubuntu/maverick/dependencies/tqtinterface/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk -#include /usr/share/cdbs/1/rules/simple-patchsys.mk +#include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk DEB_KDE_APIDOX := yes |