[SCM] lives/master: Fix build system race that broke parallel building
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sun May 10 13:23:39 UTC 2015
The following commit has been merged in the master branch:
commit 0c2921db5022022d1b16378399664dc365526e5b
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date: Sun May 10 14:19:41 2015 +0100
Fix build system race that broke parallel building
Thanks: Colin Watson for patch.
Closes: #778649 #732205
diff --git a/debian/patches/parallel-build.patch b/debian/patches/parallel-build.patch
new file mode 100644
index 0000000..f22758c
--- /dev/null
+++ b/debian/patches/parallel-build.patch
@@ -0,0 +1,17 @@
+Description: Fix build system race that broke parallel building
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: no
+Last-Update: 2014-07-16
+
+Index: b/lives-plugins/plugins/effects/compound/Makefile.am
+===================================================================
+--- a/lives-plugins/plugins/effects/compound/Makefile.am
++++ b/lives-plugins/plugins/effects/compound/Makefile.am
+@@ -7,6 +7,7 @@
+ EXTRA_DIST = $(compoundscripts_DATA) data icons
+
+ install-data-local:
++ mkdir -p "$(DESTDIR)$(compoundscriptsdir)"
+ cp -rf icons/ "$(DESTDIR)$(compoundscriptsdir)"
+ $(MAKE) -i install-data-local-remove-vcs-files
+
diff --git a/debian/patches/series b/debian/patches/series
index 4b273e0..3e12d82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01-cdda2wav_to_icedax.patch
02-drop_py3_multiencoder.patch
03-libav10.patch
+parallel-build.patch
--
lives packaging
More information about the pkg-multimedia-commits
mailing list