Fix quilt conversion issues on Debian and Ubuntu

(cherry picked from commit 27db9395460b4fb8919d5f725e84fa24704803aa)

15 files changed, 48 insertions, 21 deletions

diff --git a/debian/lenny/applications/basket/debian/rules b/debian/lenny/applications/basket/debian/rules
index cb18fa380..5d7db2b77 100755
--- a/debian/lenny/applications/basket/debian/rules
+++ b/debian/lenny/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/debian/lenny/applications/piklab/debian/rules b/debian/lenny/applications/piklab/debian/rules
index 650dfcc80..c80346f93 100755
--- a/debian/lenny/applications/piklab/debian/rules
+++ b/debian/lenny/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/debian/lenny/dependencies/qt3/debian/rules b/debian/lenny/dependencies/qt3/debian/rules
index c526c0750..26e68399b 100755
--- a/debian/lenny/dependencies/qt3/debian/rules
+++ b/debian/lenny/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/debian/lenny/libraries/mlt/debian/control b/debian/lenny/libraries/mlt/debian/control
index 6b7c0ce9b..5671c4cc0 100644
--- a/debian/lenny/libraries/mlt/debian/control
+++ b/debian/lenny/libraries/mlt/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Maintainer: Christian Marillat <marillat@debian.org>
 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, kdelibs4-trinity-dev, imagemagick, ffmpeg, libflac-dev,
  libavcodec-dev, libxml2-dev, ladspa-sdk, libavutil-dev, libxcursor-dev,
diff --git a/debian/lenny/libraries/mlt/debian/rules b/debian/lenny/libraries/mlt/debian/rules
index 2613c3225..9f63014e4 100755
--- a/debian/lenny/libraries/mlt/debian/rules
+++ b/debian/lenny/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/kde ./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/debian/squeeze/applications/basket/debian/rules b/debian/squeeze/applications/basket/debian/rules
index 1de38c154..200c5baf7 100755
--- a/debian/squeeze/applications/basket/debian/rules
+++ b/debian/squeeze/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/debian/squeeze/applications/piklab/debian/rules b/debian/squeeze/applications/piklab/debian/rules
index 416588f8a..4fd3da4c2 100755
--- a/debian/squeeze/applications/piklab/debian/rules
+++ b/debian/squeeze/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/debian/squeeze/dependencies/qt3/debian/rules b/debian/squeeze/dependencies/qt3/debian/rules
index 1b4954261..ab08954aa 100755
--- a/debian/squeeze/dependencies/qt3/debian/rules
+++ b/debian/squeeze/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/debian/squeeze/libraries/mlt/debian/control b/debian/squeeze/libraries/mlt/debian/control
index 6b7c0ce9b..5671c4cc0 100644
--- a/debian/squeeze/libraries/mlt/debian/control
+++ b/debian/squeeze/libraries/mlt/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Maintainer: Christian Marillat <marillat@debian.org>
 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, kdelibs4-trinity-dev, imagemagick, ffmpeg, libflac-dev,
  libavcodec-dev, libxml2-dev, ladspa-sdk, libavutil-dev, libxcursor-dev,
diff --git a/debian/squeeze/libraries/mlt/debian/rules b/debian/squeeze/libraries/mlt/debian/rules
index d45bb4be3..80bbbcdc7 100755
--- a/debian/squeeze/libraries/mlt/debian/rules
+++ b/debian/squeeze/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/kde ./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/maverick/applications/basket/debian/rules b/ubuntu/maverick/applications/basket/debian/rules
index 1de38c154..200c5baf7 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 416588f8a..4fd3da4c2 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/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules
index 1b4954261..ab08954aa 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/libraries/mlt/debian/control b/ubuntu/maverick/libraries/mlt/debian/control
index b55371a4d..aae91273f 100644
--- a/ubuntu/maverick/libraries/mlt/debian/control
+++ b/ubuntu/maverick/libraries/mlt/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Maintainer: Christian Marillat <marillat@debian.org>
 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, kdelibs4-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 d45bb4be3..80bbbcdc7 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/kde ./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