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> | 2017-07-18 00:29:41 +0200 |
commit | 02e5d6d9bcc02748d9082d5027a011962bab245d (patch) | |
tree | 2ae82410e688efeee3526b7f127287e3ffcaf0fa /ubuntu/maverick/libraries/mlt/debian/rules | |
parent | f025c10ab2c705f3b86669b3dae1817c0cdd6d1d (diff) | |
download | tde-packaging-02e5d6d9bcc02748d9082d5027a011962bab245d.tar.gz tde-packaging-02e5d6d9bcc02748d9082d5027a011962bab245d.zip |
Fix quilt conversion issues on Debian and Ubuntu
(cherry picked from commit 27db9395460b4fb8919d5f725e84fa24704803aa)
Diffstat (limited to 'ubuntu/maverick/libraries/mlt/debian/rules')
-rwxr-xr-x | ubuntu/maverick/libraries/mlt/debian/rules | 13 |
1 files changed, 7 insertions, 6 deletions
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 |