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 /debian/lenny/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 'debian/lenny/dependencies')
14 files changed, 14 insertions, 13 deletions
diff --git a/debian/lenny/dependencies/arts/debian/control b/debian/lenny/dependencies/arts/debian/control index fcdd49cff..371c8efc3 100644 --- a/debian/lenny/dependencies/arts/debian/control +++ b/debian/lenny/dependencies/arts/debian/control @@ -4,7 +4,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Qt/TDE Maintainers <debian-qt-tde@lists.debian.org> Priority: optional Uploaders: Adeodato Simó <dato@net.com.org.es>, Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu> -Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), +Build-Depends: cdbs (>= 0.4.48), debhelper (>= 6), quilt, docbook-to-man, gawk, gettext, sharutils, texinfo, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libmad0-dev, diff --git a/debian/lenny/dependencies/arts/debian/patches/series b/debian/lenny/dependencies/arts/debian/patches/series new file mode 100644 index 000000000..59e055db8 --- /dev/null +++ b/debian/lenny/dependencies/arts/debian/patches/series @@ -0,0 +1 @@ +12_cleanup_artsc-config.diff diff --git a/debian/lenny/dependencies/arts/debian/rules b/debian/lenny/dependencies/arts/debian/rules index 4c8adccc6..496fc2ad4 100755 --- a/debian/lenny/dependencies/arts/debian/rules +++ b/debian/lenny/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/debian/lenny/dependencies/dbus-1-tqt/debian/control b/debian/lenny/dependencies/dbus-1-tqt/debian/control index 9a6e652a4..87a4a7d4e 100644 --- a/debian/lenny/dependencies/dbus-1-tqt/debian/control +++ b/debian/lenny/dependencies/dbus-1-tqt/debian/control @@ -2,7 +2,7 @@ Source: dbus-1-tqt Section: devel Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake Standards-Version: 3.8.3 Package: libdbus-1-tqt-dev diff --git a/debian/lenny/dependencies/dbus-1-tqt/debian/patches/series b/debian/lenny/dependencies/dbus-1-tqt/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/lenny/dependencies/dbus-1-tqt/debian/patches/series diff --git a/debian/lenny/dependencies/dbus-1-tqt/debian/rules b/debian/lenny/dependencies/dbus-1-tqt/debian/rules index 3b86de7db..0585b8d86 100755 --- a/debian/lenny/dependencies/dbus-1-tqt/debian/rules +++ b/debian/lenny/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/debian/lenny/dependencies/dbus-tqt/debian/control b/debian/lenny/dependencies/dbus-tqt/debian/control index ca76e783a..bf5949881 100644 --- a/debian/lenny/dependencies/dbus-tqt/debian/control +++ b/debian/lenny/dependencies/dbus-tqt/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org> Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Dröge <slomo@ubuntu.com> -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), quilt, libtqtinterface-dev, libdbus-1-dev (>= 0.90), cmake Standards-Version: 3.8.3 Package: libdbus-tqt-1-dev diff --git a/debian/lenny/dependencies/dbus-tqt/debian/patches/series b/debian/lenny/dependencies/dbus-tqt/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/lenny/dependencies/dbus-tqt/debian/patches/series diff --git a/debian/lenny/dependencies/dbus-tqt/debian/rules b/debian/lenny/dependencies/dbus-tqt/debian/rules index a59bed76e..26bf6c196 100755 --- a/debian/lenny/dependencies/dbus-tqt/debian/rules +++ b/debian/lenny/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/debian/lenny/dependencies/qt3/debian/control b/debian/lenny/dependencies/qt3/debian/control index d469c66cf..aee89f140 100644 --- a/debian/lenny/dependencies/qt3/debian/control +++ b/debian/lenny/dependencies/qt3/debian/control @@ -2,7 +2,7 @@ Source: qt-x11-free Maintainer: Debian 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/debian/lenny/dependencies/qt3/debian/rules b/debian/lenny/dependencies/qt3/debian/rules index e3e754911..c526c0750 100755 --- a/debian/lenny/dependencies/qt3/debian/rules +++ b/debian/lenny/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/debian/lenny/dependencies/tqtinterface/debian/control b/debian/lenny/dependencies/tqtinterface/debian/control index c7717809b..312dc7ee2 100644 --- a/debian/lenny/dependencies/tqtinterface/debian/control +++ b/debian/lenny/dependencies/tqtinterface/debian/control @@ -2,7 +2,7 @@ Source: libtqtinterface Section: kde Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Build-Depends: debhelper (>> 4.0.0), libqt3-mt-dev, qt3-apps-dev, cmake, cdbs +Build-Depends: debhelper (>> 4.0.0), quilt, libqt3-mt-dev, qt3-apps-dev, cmake, cdbs Standards-Version: 3.8.4 Package: libtqtinterface diff --git a/debian/lenny/dependencies/tqtinterface/debian/patches/series b/debian/lenny/dependencies/tqtinterface/debian/patches/series new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/debian/lenny/dependencies/tqtinterface/debian/patches/series diff --git a/debian/lenny/dependencies/tqtinterface/debian/rules b/debian/lenny/dependencies/tqtinterface/debian/rules index 208d4bed4..e93b85777 100755 --- a/debian/lenny/dependencies/tqtinterface/debian/rules +++ b/debian/lenny/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 |