[SCM] ardour/master: Added note about ardour-video-timeline

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 31ee7181fd88f1227e20b9d825cede0c3437ac84
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Tue Oct 18 11:26:34 2016 +0200

    Added note about ardour-video-timeline
    
    to the warning messages...

diff --git a/debian/patches/060-warn-video-timeline.patch b/debian/patches/060-warn-video-timeline.patch
new file mode 100644
index 0000000..415370f
--- /dev/null
+++ b/debian/patches/060-warn-video-timeline.patch
@@ -0,0 +1,40 @@
+Description: Tell the user to install ardour-video-timeline
+ to get rid of the harvid/xjadeo/ffmpeg messages.
+Author: Debian
+Forwarded: not-needed
+Last-Update: 2016-10-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- ardour.orig/gtk2_ardour/transcode_ffmpeg.cc
++++ ardour/gtk2_ardour/transcode_ffmpeg.cc
+@@ -65,7 +65,9 @@
+ 					"symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n"
+ 					"\n"
+ 					"see also http://manual.ardour.org/video-timeline/setup/"
+-				 ), PROGRAM_NAME) << endmsg;
++				 ), PROGRAM_NAME)
++			<< "\n\nInstall the 'ardour-video-timeline' Debian package!\n"
++			<< endmsg;
+ 		return;
+ 	}
+ 	ffexecok = true;
+--- ardour.orig/gtk2_ardour/video_server_dialog.cc
++++ ardour/gtk2_ardour/video_server_dialog.cc
+@@ -98,6 +98,7 @@
+ 						"\n"
+ 						"see also http://manual.ardour.org/video-timeline/setup/"
+ 					 ), PROGRAM_NAME)
++			<< "\n\nInstall the 'ardour-video-timeline' Debian package!\n"
+ 			<< endmsg;
+ 	}
+ 
+--- ardour.orig/gtk2_ardour/video_timeline.cc
++++ ardour/gtk2_ardour/video_timeline.cc
+@@ -731,6 +731,7 @@
+ 				"It should point to an application compatible with xjadeo's remote-control interface 'xjremote').\n"
+ 				"\n"
+ 				"see also http://manual.ardour.org/video-timeline/setup/")
++			<< "\n\nInstall the 'ardour-video-timeline' Debian package!\n"
+ 			<< endmsg;
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d1bbbeb..47db5c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 0010-waf.patch
 0030-wscript.patch
 0050-log-stdout.patch
+060-warn-video-timeline.patch
 0070-spelling.patch

-- 
ardour Debian packaging