summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-08-23 01:19:53 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-08-27 19:45:46 +0200
commitd4752ab3504cf2654e1f28b66ec466430709fd5b (patch)
tree9f259f9e88cc047b4f5a0c827e70b43aa4410674
parent2d7182e2df83eab066033417333f9e086b07838b (diff)
downloadtde-packaging-d4752ab3504cf2654e1f28b66ec466430709fd5b.tar.gz
tde-packaging-d4752ab3504cf2654e1f28b66ec466430709fd5b.zip
Superseded former way of managing patches for mlt on Debian and Ubuntu
-rwxr-xr-xdebian/squeeze/libraries/mlt/debian/rules4
-rwxr-xr-xubuntu/maverick/libraries/mlt/debian/rules4
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/squeeze/libraries/mlt/debian/rules b/debian/squeeze/libraries/mlt/debian/rules
index 771793fff..b4b16188a 100755
--- a/debian/squeeze/libraries/mlt/debian/rules
+++ b/debian/squeeze/libraries/mlt/debian/rules
@@ -45,7 +45,7 @@ configure: configure-stamp
configure-stamp:
dh_testdir
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ #QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
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) \
@@ -69,7 +69,7 @@ clean:
[ ! -f config.mak ] || $(MAKE) dist-clean
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ #QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
dh_clean *.pc src/modules/gtk2/config.h config.log
diff --git a/ubuntu/maverick/libraries/mlt/debian/rules b/ubuntu/maverick/libraries/mlt/debian/rules
index 771793fff..b4b16188a 100755
--- a/ubuntu/maverick/libraries/mlt/debian/rules
+++ b/ubuntu/maverick/libraries/mlt/debian/rules
@@ -45,7 +45,7 @@ configure: configure-stamp
configure-stamp:
dh_testdir
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ #QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
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) \
@@ -69,7 +69,7 @@ clean:
[ ! -f config.mak ] || $(MAKE) dist-clean
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ #QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
dh_clean *.pc src/modules/gtk2/config.h config.log