Fix quilt conversion issues on Debian and Ubuntu

(cherry picked from commit 27db939546)
v3.5.13-sru
Slávek Banko 11 years ago
parent f025c10ab2
commit 02e5d6d9bc

@ -28,6 +28,8 @@ endif
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
post-patches::
dh_testdir
config.status: post-patches
dh_testdir

@ -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

@ -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

@ -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,

@ -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

@ -28,6 +28,8 @@ endif
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
post-patches::
dh_testdir
config.status: post-patches
dh_testdir

@ -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

@ -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

@ -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,

@ -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

@ -28,6 +28,8 @@ endif
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
post-patches::
dh_testdir
config.status: post-patches
dh_testdir

@ -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

@ -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

@ -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,

@ -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

Loading…
Cancel
Save