diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-09-16 01:55:07 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-09-16 01:55:07 +0200 |
| commit | 27db9395460b4fb8919d5f725e84fa24704803aa (patch) | |
| tree | fbd9ff9c6a9735cefa9c0b9d239be2a529d24f6b /ubuntu/precise/libraries/mlt | |
| parent | f24915471ea396c53670df51b2affc4af74373bf (diff) | |
| download | tde-packaging-27db9395460b4fb8919d5f725e84fa24704803aa.tar.gz tde-packaging-27db9395460b4fb8919d5f725e84fa24704803aa.zip | |
Fix quilt conversion issues on Debian and Ubuntu
Diffstat (limited to 'ubuntu/precise/libraries/mlt')
| -rw-r--r-- | ubuntu/precise/libraries/mlt/debian/control | 2 | ||||
| -rwxr-xr-x | ubuntu/precise/libraries/mlt/debian/rules | 13 |
2 files changed, 8 insertions, 7 deletions
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 <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, 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 |