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/raring/dependencies/arts/debian/control | 2 +- ubuntu/raring/dependencies/arts/debian/patches/series | 1 + ubuntu/raring/dependencies/arts/debian/rules | 2 +- ubuntu/raring/dependencies/dbus-1-tqt/debian/control | 2 +- ubuntu/raring/dependencies/dbus-1-tqt/debian/patches/series | 0 ubuntu/raring/dependencies/dbus-1-tqt/debian/rules | 2 +- ubuntu/raring/dependencies/dbus-tqt/debian/control | 2 +- ubuntu/raring/dependencies/dbus-tqt/debian/patches/series | 0 ubuntu/raring/dependencies/dbus-tqt/debian/rules | 2 +- ubuntu/raring/dependencies/libart-lgpl/debian/control | 2 +- ubuntu/raring/dependencies/libart-lgpl/debian/patches/series | 0 ubuntu/raring/dependencies/libart-lgpl/debian/rules | 2 +- ubuntu/raring/dependencies/libcaldav/debian/control | 2 +- ubuntu/raring/dependencies/libcaldav/debian/patches/series | 0 ubuntu/raring/dependencies/libcaldav/debian/rules | 6 +++--- ubuntu/raring/dependencies/libcarddav/debian/control | 2 +- ubuntu/raring/dependencies/libcarddav/debian/patches/series | 0 ubuntu/raring/dependencies/libcarddav/debian/rules | 6 +++--- ubuntu/raring/dependencies/python-tqt/debian/patches/series | 2 +- ubuntu/raring/dependencies/qt3/debian/control | 2 +- ubuntu/raring/dependencies/qt3/debian/rules | 8 ++++---- ubuntu/raring/dependencies/sip4-tqt/debian/patches/series | 4 ++-- .../sip4-tqt/debian/patches/siputils_objdir_module_fix.diff | 10 +++++----- ubuntu/raring/dependencies/tqt3/debian/control | 2 +- ubuntu/raring/dependencies/tqt3/debian/rules | 8 ++++---- ubuntu/raring/dependencies/tqtinterface/debian/control | 2 +- ubuntu/raring/dependencies/tqtinterface/debian/patches/series | 0 ubuntu/raring/dependencies/tqtinterface/debian/rules | 2 +- 28 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 ubuntu/raring/dependencies/arts/debian/patches/series create mode 100644 ubuntu/raring/dependencies/dbus-1-tqt/debian/patches/series create mode 100644 ubuntu/raring/dependencies/dbus-tqt/debian/patches/series create mode 100644 ubuntu/raring/dependencies/libart-lgpl/debian/patches/series create mode 100644 ubuntu/raring/dependencies/libcaldav/debian/patches/series create mode 100644 ubuntu/raring/dependencies/libcarddav/debian/patches/series create mode 100644 ubuntu/raring/dependencies/tqtinterface/debian/patches/series (limited to 'ubuntu/raring/dependencies') diff --git a/ubuntu/raring/dependencies/arts/debian/control b/ubuntu/raring/dependencies/arts/debian/control index c535e2af4..dcffcfc0f 100644 --- a/ubuntu/raring/dependencies/arts/debian/control +++ b/ubuntu/raring/dependencies/arts/debian/control @@ -4,7 +4,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/TDE Maintainers Priority: optional Uploaders: Adeodato Sim , Ana Beatriz Guerrero Lopez , Fathi Boudra , Modestas Vainius -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/ubuntu/raring/dependencies/arts/debian/patches/series b/ubuntu/raring/dependencies/arts/debian/patches/series new file mode 100644 index 000000000..59e055db8 --- /dev/null +++ b/ubuntu/raring/dependencies/arts/debian/patches/series @@ -0,0 +1 @@ +12_cleanup_artsc-config.diff diff --git a/ubuntu/raring/dependencies/arts/debian/rules b/ubuntu/raring/dependencies/arts/debian/rules index 1b4911297..8886acad3 100755 --- a/ubuntu/raring/dependencies/arts/debian/rules +++ b/ubuntu/raring/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/raring/dependencies/dbus-1-tqt/debian/control b/ubuntu/raring/dependencies/dbus-1-tqt/debian/control index 36e73bbb1..6c1b0c969 100644 --- a/ubuntu/raring/dependencies/dbus-1-tqt/debian/control +++ b/ubuntu/raring/dependencies/dbus-1-tqt/debian/control @@ -2,7 +2,7 @@ Source: dbus-1-tqt Section: devel Priority: optional Maintainer: Timothy Pearson -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/ubuntu/raring/dependencies/dbus-1-tqt/debian/patches/series b/ubuntu/raring/dependencies/dbus-1-tqt/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/raring/dependencies/dbus-1-tqt/debian/rules b/ubuntu/raring/dependencies/dbus-1-tqt/debian/rules index 3b86de7db..0585b8d86 100755 --- a/ubuntu/raring/dependencies/dbus-1-tqt/debian/rules +++ b/ubuntu/raring/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/raring/dependencies/dbus-tqt/debian/control b/ubuntu/raring/dependencies/dbus-tqt/debian/control index cdf2d334a..7c5dbc0c4 100644 --- a/ubuntu/raring/dependencies/dbus-tqt/debian/control +++ b/ubuntu/raring/dependencies/dbus-tqt/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Utopia Maintenance Team Uploaders: Sjoerd Simons , Sebastian Drge -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/ubuntu/raring/dependencies/dbus-tqt/debian/patches/series b/ubuntu/raring/dependencies/dbus-tqt/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/raring/dependencies/dbus-tqt/debian/rules b/ubuntu/raring/dependencies/dbus-tqt/debian/rules index a59bed76e..26bf6c196 100755 --- a/ubuntu/raring/dependencies/dbus-tqt/debian/rules +++ b/ubuntu/raring/dependencies/dbus-tqt/debian/rules @@ -3,7 +3,7 @@ # Copyright © 2003 Daniel Stone # Copyright © 2006 Sjoerd Simons -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/raring/dependencies/libart-lgpl/debian/control b/ubuntu/raring/dependencies/libart-lgpl/debian/control index 02714617a..8eb77091b 100644 --- a/ubuntu/raring/dependencies/libart-lgpl/debian/control +++ b/ubuntu/raring/dependencies/libart-lgpl/debian/control @@ -9,7 +9,7 @@ Priority: optional Maintainer: Josselin Mouette Uploaders: Debian GNOME Maintainers , Loic Minier , Sebastian Dröge , Sebastien Bacher Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 5), +Build-Depends: debhelper (>= 5), quilt, gnome-pkg-tools (>= 0.7), cdbs, dpkg-dev (>= 1.13.19), diff --git a/ubuntu/raring/dependencies/libart-lgpl/debian/patches/series b/ubuntu/raring/dependencies/libart-lgpl/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/raring/dependencies/libart-lgpl/debian/rules b/ubuntu/raring/dependencies/libart-lgpl/debian/rules index 2751eb1f2..add68d0c4 100755 --- a/ubuntu/raring/dependencies/libart-lgpl/debian/rules +++ b/ubuntu/raring/dependencies/libart-lgpl/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.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 /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk diff --git a/ubuntu/raring/dependencies/libcaldav/debian/control b/ubuntu/raring/dependencies/libcaldav/debian/control index 6051e6de1..8ba2fed15 100644 --- a/ubuntu/raring/dependencies/libcaldav/debian/control +++ b/ubuntu/raring/dependencies/libcaldav/debian/control @@ -1,5 +1,5 @@ Source: libcaldav -Build-Depends: debhelper (>= 5), quilt, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), quilt, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev, automake, autoconf, libtool, libltdl-dev Section: graphics Priority: optional Maintainer: Timothy Pearson diff --git a/ubuntu/raring/dependencies/libcaldav/debian/patches/series b/ubuntu/raring/dependencies/libcaldav/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/raring/dependencies/libcaldav/debian/rules b/ubuntu/raring/dependencies/libcaldav/debian/rules index fb72a35e7..0d067bc3d 100755 --- a/ubuntu/raring/dependencies/libcaldav/debian/rules +++ b/ubuntu/raring/dependencies/libcaldav/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -include /usr/share/quilt/quilt.make +include /usr/share/cdbs/1/rules/patchsys-quilt.mk # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -28,7 +28,7 @@ no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) -build: $(QUILT_STAMPFN) build-stamp +build: post-patches build-stamp build-stamp: dh_testdir ./autogen.sh @@ -38,7 +38,7 @@ build-stamp: touch build-stamp -clean: unpatch +clean:: dh_testdir dh_testroot rm -f build-stamp diff --git a/ubuntu/raring/dependencies/libcarddav/debian/control b/ubuntu/raring/dependencies/libcarddav/debian/control index 7bf8ff1dc..7e3b740bb 100644 --- a/ubuntu/raring/dependencies/libcarddav/debian/control +++ b/ubuntu/raring/dependencies/libcarddav/debian/control @@ -1,5 +1,5 @@ Source: libcarddav -Build-Depends: debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 5), libcurl4-gnutls-dev, libglib2.0-dev, quilt, automake, autoconf, libtool, libltdl-dev Section: graphics Priority: optional Maintainer: Timothy Pearson diff --git a/ubuntu/raring/dependencies/libcarddav/debian/patches/series b/ubuntu/raring/dependencies/libcarddav/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/raring/dependencies/libcarddav/debian/rules b/ubuntu/raring/dependencies/libcarddav/debian/rules index 24bdcbc93..b22fbca64 100755 --- a/ubuntu/raring/dependencies/libcarddav/debian/rules +++ b/ubuntu/raring/dependencies/libcarddav/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -include /usr/share/quilt/quilt.make +include /usr/share/cdbs/1/rules/patchsys-quilt.mk # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -28,7 +28,7 @@ no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) -build: $(QUILT_STAMPFN) build-stamp +build: post-patches build-stamp build-stamp: dh_testdir ./autogen.sh @@ -38,7 +38,7 @@ build-stamp: touch build-stamp -clean: unpatch +clean:: dh_testdir dh_testroot rm -f build-stamp diff --git a/ubuntu/raring/dependencies/python-tqt/debian/patches/series b/ubuntu/raring/dependencies/python-tqt/debian/patches/series index 15bc57c10..573069d8d 100644 --- a/ubuntu/raring/dependencies/python-tqt/debian/patches/series +++ b/ubuntu/raring/dependencies/python-tqt/debian/patches/series @@ -1 +1 @@ -debian_configure_changes.diff +# debian_configure_changes.diff diff --git a/ubuntu/raring/dependencies/qt3/debian/control b/ubuntu/raring/dependencies/qt3/debian/control index 7641cffbf..37bf73e65 100644 --- a/ubuntu/raring/dependencies/qt3/debian/control +++ b/ubuntu/raring/dependencies/qt3/debian/control @@ -2,7 +2,7 @@ Source: qt-x11-free Maintainer: Kubuntu Developers 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/raring/dependencies/qt3/debian/rules b/ubuntu/raring/dependencies/qt3/debian/rules index 7ede42ad9..57dce235a 100755 --- a/ubuntu/raring/dependencies/qt3/debian/rules +++ b/ubuntu/raring/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/raring/dependencies/sip4-tqt/debian/patches/series b/ubuntu/raring/dependencies/sip4-tqt/debian/patches/series index c42871d34..0b31a69ff 100644 --- a/ubuntu/raring/dependencies/sip4-tqt/debian/patches/series +++ b/ubuntu/raring/dependencies/sip4-tqt/debian/patches/series @@ -1,2 +1,2 @@ -siputils_debian_changes.diff -siputils_objdir_module_fix.diff +# siputils_debian_changes.diff +# siputils_objdir_module_fix.diff diff --git a/ubuntu/raring/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff b/ubuntu/raring/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff index a9d580737..3c4570b21 100644 --- a/ubuntu/raring/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff +++ b/ubuntu/raring/dependencies/sip4-tqt/debian/patches/siputils_objdir_module_fix.diff @@ -1,8 +1,8 @@ -Index: sip4-qt3-4.10/siputils.py +Index: b/siputils.py =================================================================== ---- sip4-qt3-4.10.orig/siputils.py 2010-01-26 23:45:34.144734105 +0100 -+++ sip4-qt3-4.10/siputils.py 2010-01-26 23:46:51.605699383 +0100 -@@ -1546,9 +1546,12 @@ +--- a/siputils.py ++++ b/siputils.py +@@ -1547,9 +1547,12 @@ mfile.write("\n$(OFILES): $(HFILES)\n") for mf in self._build["tqmoc_headers"].split(): @@ -14,5 +14,5 @@ Index: sip4-qt3-4.10/siputils.py + mf = os.path.join(self._src_dir, mf) + mfile.write("\n%s: %s\n" % (cpp, mf)) - mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf)) + mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf)) diff --git a/ubuntu/raring/dependencies/tqt3/debian/control b/ubuntu/raring/dependencies/tqt3/debian/control index 1655a1357..b524aa513 100644 --- a/ubuntu/raring/dependencies/tqt3/debian/control +++ b/ubuntu/raring/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/raring/dependencies/tqt3/debian/rules b/ubuntu/raring/dependencies/tqt3/debian/rules index d2d66f6a7..b91e34413 100755 --- a/ubuntu/raring/dependencies/tqt3/debian/rules +++ b/ubuntu/raring/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 diff --git a/ubuntu/raring/dependencies/tqtinterface/debian/control b/ubuntu/raring/dependencies/tqtinterface/debian/control index 4996e799f..c671091c9 100644 --- a/ubuntu/raring/dependencies/tqtinterface/debian/control +++ b/ubuntu/raring/dependencies/tqtinterface/debian/control @@ -2,7 +2,7 @@ Source: libtqtinterface Section: tde Priority: optional Maintainer: Timothy Pearson -Build-Depends: debhelper (>> 4.0.0), libtqt3-mt-dev, tqt3-apps-dev, cmake, cdbs +Build-Depends: debhelper (>> 4.0.0), quilt, libtqt3-mt-dev, tqt3-apps-dev, cmake, cdbs Standards-Version: 3.8.4 Package: libtqtinterface diff --git a/ubuntu/raring/dependencies/tqtinterface/debian/patches/series b/ubuntu/raring/dependencies/tqtinterface/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/ubuntu/raring/dependencies/tqtinterface/debian/rules b/ubuntu/raring/dependencies/tqtinterface/debian/rules index 5d8f4cb4c..051e7e40f 100755 --- a/ubuntu/raring/dependencies/tqtinterface/debian/rules +++ b/ubuntu/raring/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 -- cgit v1.2.1