From 27db9395460b4fb8919d5f725e84fa24704803aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 16 Sep 2013 01:55:07 +0200 Subject: Fix quilt conversion issues on Debian and Ubuntu --- ubuntu/maverick/applications/basket/debian/rules | 2 ++ ubuntu/maverick/applications/piklab/debian/rules | 3 +++ ubuntu/maverick/dependencies/libcaldav/debian/rules | 3 +++ ubuntu/maverick/dependencies/libcarddav/debian/rules | 3 +++ ubuntu/maverick/dependencies/qt3/debian/rules | 3 +++ ubuntu/maverick/dependencies/tqt3/debian/rules | 3 +++ ubuntu/maverick/libraries/mlt/debian/control | 2 +- ubuntu/maverick/libraries/mlt/debian/rules | 13 +++++++------ ubuntu/precise/applications/basket/debian/rules | 2 ++ ubuntu/precise/applications/piklab/debian/rules | 3 +++ ubuntu/precise/dependencies/libcaldav/debian/rules | 3 +++ ubuntu/precise/dependencies/libcarddav/debian/rules | 3 +++ ubuntu/precise/dependencies/qt3/debian/rules | 3 +++ ubuntu/precise/dependencies/tqt3/debian/rules | 3 +++ ubuntu/precise/libraries/mlt/debian/control | 2 +- ubuntu/precise/libraries/mlt/debian/rules | 13 +++++++------ ubuntu/raring/applications/basket/debian/rules | 2 ++ ubuntu/raring/applications/piklab/debian/rules | 3 +++ ubuntu/raring/dependencies/libcaldav/debian/rules | 3 +++ ubuntu/raring/dependencies/libcarddav/debian/rules | 3 +++ ubuntu/raring/dependencies/qt3/debian/rules | 3 +++ ubuntu/raring/dependencies/tqt3/debian/rules | 3 +++ ubuntu/raring/libraries/mlt/debian/control | 2 +- ubuntu/raring/libraries/mlt/debian/rules | 13 +++++++------ 24 files changed, 75 insertions(+), 21 deletions(-) (limited to 'ubuntu') diff --git a/ubuntu/maverick/applications/basket/debian/rules b/ubuntu/maverick/applications/basket/debian/rules index 4afb63bdd..4e6833463 100755 --- a/ubuntu/maverick/applications/basket/debian/rules +++ b/ubuntu/maverick/applications/basket/debian/rules @@ -28,6 +28,8 @@ endif include /usr/share/cdbs/1/rules/patchsys-quilt.mk +post-patches:: + dh_testdir config.status: post-patches dh_testdir diff --git a/ubuntu/maverick/applications/piklab/debian/rules b/ubuntu/maverick/applications/piklab/debian/rules index d15b8b977..347c2e51c 100755 --- a/ubuntu/maverick/applications/piklab/debian/rules +++ b/ubuntu/maverick/applications/piklab/debian/rules @@ -28,6 +28,9 @@ endif include /usr/share/cdbs/1/rules/patchsys-quilt.mk +post-patches:: + dh_testdir + config: post-patches config-stamp config-stamp: configure dh_testdir diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/rules b/ubuntu/maverick/dependencies/libcaldav/debian/rules index 0d067bc3d..7402cb8c0 100755 --- a/ubuntu/maverick/dependencies/libcaldav/debian/rules +++ b/ubuntu/maverick/dependencies/libcaldav/debian/rules @@ -28,6 +28,9 @@ no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) +post-patches:: + dh_testdir + build: post-patches build-stamp build-stamp: dh_testdir diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/rules b/ubuntu/maverick/dependencies/libcarddav/debian/rules index b22fbca64..0bd40b5ed 100755 --- a/ubuntu/maverick/dependencies/libcarddav/debian/rules +++ b/ubuntu/maverick/dependencies/libcarddav/debian/rules @@ -28,6 +28,9 @@ no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) +post-patches:: + dh_testdir + build: post-patches build-stamp build-stamp: dh_testdir diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules index 57dce235a..d4e5f00cf 100755 --- a/ubuntu/maverick/dependencies/qt3/debian/rules +++ b/ubuntu/maverick/dependencies/qt3/debian/rules @@ -119,6 +119,9 @@ ifeq ($(DEB_HOST_ARCH),arm) CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT endif +post-patches:: + dh_testdir + build: libqt-thread-stamp touch build-stamp diff --git a/ubuntu/maverick/dependencies/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules index b91e34413..7e78b635b 100755 --- a/ubuntu/maverick/dependencies/tqt3/debian/rules +++ b/ubuntu/maverick/dependencies/tqt3/debian/rules @@ -123,6 +123,9 @@ ifeq ($(DEB_HOST_ARCH),arm) CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT endif +post-patches:: + dh_testdir + build: libqt-thread-stamp touch build-stamp diff --git a/ubuntu/maverick/libraries/mlt/debian/control b/ubuntu/maverick/libraries/mlt/debian/control index 39663b5c6..7751ebe09 100644 --- a/ubuntu/maverick/libraries/mlt/debian/control +++ b/ubuntu/maverick/libraries/mlt/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Maintainer: Christian Marillat Homepage: http://mlt.sourceforge.net/ Standards-Version: 3.8.3 -Build-Depends: debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0), +Build-Depends: cdbs, debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0), libvorbis-dev, libsdl-dev | libsdl1.2-dev, libgtk2.0-dev, libjack-dev, quilt, libsamplerate-dev, libmad0-dev, tdelibs14-trinity-dev, imagemagick, ffmpeg, libflac-dev, libavcodec-dev, libxml2-dev, ladspa-sdk, libavutil-dev, libxcursor-dev, diff --git a/ubuntu/maverick/libraries/mlt/debian/rules b/ubuntu/maverick/libraries/mlt/debian/rules index ce607fb77..cca48ead0 100755 --- a/ubuntu/maverick/libraries/mlt/debian/rules +++ b/ubuntu/maverick/libraries/mlt/debian/rules @@ -44,11 +44,14 @@ ifeq "$(DEBIAN_ARCH)" "amd64" CONFIGURE_OPTS = --enable-motion-est endif -configure: configure-stamp -configure-stamp: +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +post-patches:: dh_testdir - QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 +configure: configure-stamp +configure-stamp: post-patches + dh_testdir CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --enable-gpl \ --luma-compress --disable-mmx $(CONFIGURE_OPTS) \ @@ -65,15 +68,13 @@ build-stamp: touch build-stamp -clean: +clean:: dh_testdir dh_testroot rm -f build-stamp configure-stamp [ ! -f config.mak ] || $(MAKE) dist-clean - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 - dh_clean *.pc src/modules/gtk2/config.h config.log find -name config.mak | xargs -r rm diff --git a/ubuntu/precise/applications/basket/debian/rules b/ubuntu/precise/applications/basket/debian/rules index 4afb63bdd..4e6833463 100755 --- a/ubuntu/precise/applications/basket/debian/rules +++ b/ubuntu/precise/applications/basket/debian/rules @@ -28,6 +28,8 @@ endif include /usr/share/cdbs/1/rules/patchsys-quilt.mk +post-patches:: + dh_testdir config.status: post-patches dh_testdir diff --git a/ubuntu/precise/applications/piklab/debian/rules b/ubuntu/precise/applications/piklab/debian/rules index d15b8b977..347c2e51c 100755 --- a/ubuntu/precise/applications/piklab/debian/rules +++ b/ubuntu/precise/applications/piklab/debian/rules @@ -28,6 +28,9 @@ endif include /usr/share/cdbs/1/rules/patchsys-quilt.mk +post-patches:: + dh_testdir + config: post-patches config-stamp config-stamp: configure dh_testdir diff --git a/ubuntu/precise/dependencies/libcaldav/debian/rules b/ubuntu/precise/dependencies/libcaldav/debian/rules index 0d067bc3d..7402cb8c0 100755 --- a/ubuntu/precise/dependencies/libcaldav/debian/rules +++ b/ubuntu/precise/dependencies/libcaldav/debian/rules @@ -28,6 +28,9 @@ no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) +post-patches:: + dh_testdir + build: post-patches build-stamp build-stamp: dh_testdir diff --git a/ubuntu/precise/dependencies/libcarddav/debian/rules b/ubuntu/precise/dependencies/libcarddav/debian/rules index b22fbca64..0bd40b5ed 100755 --- a/ubuntu/precise/dependencies/libcarddav/debian/rules +++ b/ubuntu/precise/dependencies/libcarddav/debian/rules @@ -28,6 +28,9 @@ no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) +post-patches:: + dh_testdir + build: post-patches build-stamp build-stamp: dh_testdir diff --git a/ubuntu/precise/dependencies/qt3/debian/rules b/ubuntu/precise/dependencies/qt3/debian/rules index 57dce235a..d4e5f00cf 100755 --- a/ubuntu/precise/dependencies/qt3/debian/rules +++ b/ubuntu/precise/dependencies/qt3/debian/rules @@ -119,6 +119,9 @@ ifeq ($(DEB_HOST_ARCH),arm) CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT endif +post-patches:: + dh_testdir + build: libqt-thread-stamp touch build-stamp diff --git a/ubuntu/precise/dependencies/tqt3/debian/rules b/ubuntu/precise/dependencies/tqt3/debian/rules index b91e34413..7e78b635b 100755 --- a/ubuntu/precise/dependencies/tqt3/debian/rules +++ b/ubuntu/precise/dependencies/tqt3/debian/rules @@ -123,6 +123,9 @@ ifeq ($(DEB_HOST_ARCH),arm) CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT endif +post-patches:: + dh_testdir + build: libqt-thread-stamp touch build-stamp diff --git a/ubuntu/precise/libraries/mlt/debian/control b/ubuntu/precise/libraries/mlt/debian/control index 39663b5c6..7751ebe09 100644 --- a/ubuntu/precise/libraries/mlt/debian/control +++ b/ubuntu/precise/libraries/mlt/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Maintainer: Christian Marillat Homepage: http://mlt.sourceforge.net/ Standards-Version: 3.8.3 -Build-Depends: debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0), +Build-Depends: cdbs, debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0), libvorbis-dev, libsdl-dev | libsdl1.2-dev, libgtk2.0-dev, libjack-dev, quilt, libsamplerate-dev, libmad0-dev, tdelibs14-trinity-dev, imagemagick, ffmpeg, libflac-dev, libavcodec-dev, libxml2-dev, ladspa-sdk, libavutil-dev, libxcursor-dev, diff --git a/ubuntu/precise/libraries/mlt/debian/rules b/ubuntu/precise/libraries/mlt/debian/rules index ce607fb77..cca48ead0 100755 --- a/ubuntu/precise/libraries/mlt/debian/rules +++ b/ubuntu/precise/libraries/mlt/debian/rules @@ -44,11 +44,14 @@ ifeq "$(DEBIAN_ARCH)" "amd64" CONFIGURE_OPTS = --enable-motion-est endif -configure: configure-stamp -configure-stamp: +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +post-patches:: dh_testdir - QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 +configure: configure-stamp +configure-stamp: post-patches + dh_testdir CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --enable-gpl \ --luma-compress --disable-mmx $(CONFIGURE_OPTS) \ @@ -65,15 +68,13 @@ build-stamp: touch build-stamp -clean: +clean:: dh_testdir dh_testroot rm -f build-stamp configure-stamp [ ! -f config.mak ] || $(MAKE) dist-clean - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 - dh_clean *.pc src/modules/gtk2/config.h config.log find -name config.mak | xargs -r rm diff --git a/ubuntu/raring/applications/basket/debian/rules b/ubuntu/raring/applications/basket/debian/rules index 4afb63bdd..4e6833463 100755 --- a/ubuntu/raring/applications/basket/debian/rules +++ b/ubuntu/raring/applications/basket/debian/rules @@ -28,6 +28,8 @@ endif include /usr/share/cdbs/1/rules/patchsys-quilt.mk +post-patches:: + dh_testdir config.status: post-patches dh_testdir diff --git a/ubuntu/raring/applications/piklab/debian/rules b/ubuntu/raring/applications/piklab/debian/rules index d15b8b977..347c2e51c 100755 --- a/ubuntu/raring/applications/piklab/debian/rules +++ b/ubuntu/raring/applications/piklab/debian/rules @@ -28,6 +28,9 @@ endif include /usr/share/cdbs/1/rules/patchsys-quilt.mk +post-patches:: + dh_testdir + config: post-patches config-stamp config-stamp: configure dh_testdir diff --git a/ubuntu/raring/dependencies/libcaldav/debian/rules b/ubuntu/raring/dependencies/libcaldav/debian/rules index 0d067bc3d..7402cb8c0 100755 --- a/ubuntu/raring/dependencies/libcaldav/debian/rules +++ b/ubuntu/raring/dependencies/libcaldav/debian/rules @@ -28,6 +28,9 @@ no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) +post-patches:: + dh_testdir + build: post-patches build-stamp build-stamp: dh_testdir diff --git a/ubuntu/raring/dependencies/libcarddav/debian/rules b/ubuntu/raring/dependencies/libcarddav/debian/rules index b22fbca64..0bd40b5ed 100755 --- a/ubuntu/raring/dependencies/libcarddav/debian/rules +++ b/ubuntu/raring/dependencies/libcarddav/debian/rules @@ -28,6 +28,9 @@ no_auto_tools = ACLOCAL="`pwd`/missing aclocal" \ make_flags = moduledir=/usr/lib/gdk-imlib2 $(no_auto_tools) +post-patches:: + dh_testdir + build: post-patches build-stamp build-stamp: dh_testdir diff --git a/ubuntu/raring/dependencies/qt3/debian/rules b/ubuntu/raring/dependencies/qt3/debian/rules index 57dce235a..d4e5f00cf 100755 --- a/ubuntu/raring/dependencies/qt3/debian/rules +++ b/ubuntu/raring/dependencies/qt3/debian/rules @@ -119,6 +119,9 @@ ifeq ($(DEB_HOST_ARCH),arm) CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT endif +post-patches:: + dh_testdir + build: libqt-thread-stamp touch build-stamp diff --git a/ubuntu/raring/dependencies/tqt3/debian/rules b/ubuntu/raring/dependencies/tqt3/debian/rules index b91e34413..7e78b635b 100755 --- a/ubuntu/raring/dependencies/tqt3/debian/rules +++ b/ubuntu/raring/dependencies/tqt3/debian/rules @@ -123,6 +123,9 @@ ifeq ($(DEB_HOST_ARCH),arm) CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT endif +post-patches:: + dh_testdir + build: libqt-thread-stamp touch build-stamp diff --git a/ubuntu/raring/libraries/mlt/debian/control b/ubuntu/raring/libraries/mlt/debian/control index 39663b5c6..7751ebe09 100644 --- a/ubuntu/raring/libraries/mlt/debian/control +++ b/ubuntu/raring/libraries/mlt/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Maintainer: Christian Marillat Homepage: http://mlt.sourceforge.net/ Standards-Version: 3.8.3 -Build-Depends: debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0), +Build-Depends: cdbs, debhelper (>= 5), libdv4-dev, libquicktime-dev (>= 2:1.0.0), libvorbis-dev, libsdl-dev | libsdl1.2-dev, libgtk2.0-dev, libjack-dev, quilt, libsamplerate-dev, libmad0-dev, tdelibs14-trinity-dev, imagemagick, ffmpeg, libflac-dev, libavcodec-dev, libxml2-dev, ladspa-sdk, libavutil-dev, libxcursor-dev, diff --git a/ubuntu/raring/libraries/mlt/debian/rules b/ubuntu/raring/libraries/mlt/debian/rules index ce607fb77..cca48ead0 100755 --- a/ubuntu/raring/libraries/mlt/debian/rules +++ b/ubuntu/raring/libraries/mlt/debian/rules @@ -44,11 +44,14 @@ ifeq "$(DEBIAN_ARCH)" "amd64" CONFIGURE_OPTS = --enable-motion-est endif -configure: configure-stamp -configure-stamp: +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +post-patches:: dh_testdir - QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 +configure: configure-stamp +configure-stamp: post-patches + dh_testdir CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --enable-gpl \ --luma-compress --disable-mmx $(CONFIGURE_OPTS) \ @@ -65,15 +68,13 @@ build-stamp: touch build-stamp -clean: +clean:: dh_testdir dh_testroot rm -f build-stamp configure-stamp [ ! -f config.mak ] || $(MAKE) dist-clean - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 - dh_clean *.pc src/modules/gtk2/config.h config.log find -name config.mak | xargs -r rm -- cgit v1.2.1