[SCM] ardour/master: Patches refreshed.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Fri Jun 30 09:21:57 UTC 2017


The following commit has been merged in the master branch:
commit f379d1f194774f6373ce77a62024d9ca8981f97d
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Jun 29 23:23:15 2017 +0200

    Patches refreshed.

diff --git a/debian/patches/0050-log-stdout.patch b/debian/patches/0050-log-stdout.patch
index d7536cb..c3d5d92 100644
--- a/debian/patches/0050-log-stdout.patch
+++ b/debian/patches/0050-log-stdout.patch
@@ -9,7 +9,7 @@ Index: ardour/wscript
 ===================================================================
 --- ardour.orig/wscript
 +++ ardour/wscript
-@@ -1257,6 +1257,15 @@ const char* const ardour_config_info = "
+@@ -1287,6 +1287,15 @@ const char* const ardour_config_info = "
  def build(bld):
      create_stored_revision()
  
diff --git a/debian/patches/0080-more-spelling.patch b/debian/patches/0080-more-spelling.patch
index cd78ab5..46988cd 100644
--- a/debian/patches/0080-more-spelling.patch
+++ b/debian/patches/0080-more-spelling.patch
@@ -11,7 +11,7 @@ Index: ardour/gtk2_ardour/ardour_ui.cc
 ===================================================================
 --- ardour.orig/gtk2_ardour/ardour_ui.cc
 +++ ardour/gtk2_ardour/ardour_ui.cc
-@@ -3806,7 +3806,7 @@ ARDOUR_UI::display_cleanup_results (ARDO
+@@ -3972,7 +3972,7 @@ ARDOUR_UI::display_cleanup_results (ARDO
  				    Gtk::MESSAGE_INFO,
  				    Gtk::BUTTONS_OK);
  		msgd.set_title (_("Clean-up"));
@@ -20,28 +20,6 @@ Index: ardour/gtk2_ardour/ardour_ui.cc
  check for any existing snapshots.\n\
  These may still include regions that\n\
  require some unused files to continue to exist."));
-Index: ardour/gtk2_ardour/gtk2_ardour5.pot
-===================================================================
---- ardour.orig/gtk2_ardour/gtk2_ardour5.pot
-+++ ardour/gtk2_ardour/gtk2_ardour5.pot
-@@ -1378,7 +1378,7 @@ msgstr ""
- 
- #: ardour_ui.cc:3728
- msgid ""
--"If this seems suprising, \n"
-+"If this seems surprising, \n"
- "check for any existing snapshots.\n"
- "These may still include regions that\n"
- "require some unused files to continue to exist."
-@@ -10482,7 +10482,7 @@ msgid ""
- "Local path to the video-server document-root. Only files below this "
- "directory will be accessible by the video-server. If the server run on a "
- "remote host, it should point to a network mounted folder of the server's "
--"docroot or be left empty if it is unvailable. It is used for the local video-"
-+"docroot or be left empty if it is unavailable. It is used for the local video-"
- "monitor and file-browsing when opening/adding a video file."
- msgstr ""
- 
 Index: ardour/gtk2_ardour/po/cs.po
 ===================================================================
 --- ardour.orig/gtk2_ardour/po/cs.po
@@ -68,16 +46,16 @@ Index: ardour/gtk2_ardour/po/de.po
 ===================================================================
 --- ardour.orig/gtk2_ardour/po/de.po
 +++ ardour/gtk2_ardour/po/de.po
-@@ -1579,7 +1579,7 @@ msgstr "Aufräumen"
+@@ -1611,7 +1611,7 @@ msgstr "Aufräumen"
  
- #: ardour_ui.cc:3809
+ #: ardour_ui.cc:3975
  msgid ""
 -"If this seems suprising, \n"
 +"If this seems surprising, \n"
  "check for any existing snapshots.\n"
  "These may still include regions that\n"
  "require some unused files to continue to exist."
-@@ -11186,7 +11186,7 @@ msgid ""
+@@ -11570,7 +11570,7 @@ msgid ""
  "Local path to the video-server document-root. Only files below this "
  "directory will be accessible by the video-server. If the server run on a "
  "remote host, it should point to a network mounted folder of the server's "
@@ -156,16 +134,16 @@ Index: ardour/gtk2_ardour/po/fr.po
 ===================================================================
 --- ardour.orig/gtk2_ardour/po/fr.po
 +++ ardour/gtk2_ardour/po/fr.po
-@@ -1565,7 +1565,7 @@ msgstr "Nettoyer"
+@@ -1582,7 +1582,7 @@ msgstr "Nettoyer"
  
- #: ardour_ui.cc:3728
+ #: ardour_ui.cc:3809
  msgid ""
 -"If this seems suprising, \n"
 +"If this seems surprising, \n"
  "check for any existing snapshots.\n"
  "These may still include regions that\n"
  "require some unused files to continue to exist."
-@@ -11111,7 +11111,7 @@ msgid ""
+@@ -11161,7 +11161,7 @@ msgid ""
  "Local path to the video-server document-root. Only files below this "
  "directory will be accessible by the video-server. If the server run on a "
  "remote host, it should point to a network mounted folder of the server's "
@@ -288,16 +266,16 @@ Index: ardour/gtk2_ardour/po/ru.po
 ===================================================================
 --- ardour.orig/gtk2_ardour/po/ru.po
 +++ ardour/gtk2_ardour/po/ru.po
-@@ -1549,7 +1549,7 @@ msgstr "Очистить"
+@@ -1605,7 +1605,7 @@ msgstr "Очистить"
  
- #: ardour_ui.cc:3728
+ #: ardour_ui.cc:3975
  msgid ""
 -"If this seems suprising, \n"
 +"If this seems surprising, \n"
  "check for any existing snapshots.\n"
  "These may still include regions that\n"
  "require some unused files to continue to exist."
-@@ -11043,7 +11043,7 @@ msgid ""
+@@ -11453,7 +11453,7 @@ msgid ""
  "Local path to the video-server document-root. Only files below this "
  "directory will be accessible by the video-server. If the server run on a "
  "remote host, it should point to a network mounted folder of the server's "
@@ -354,20 +332,20 @@ Index: ardour/gtk2_ardour/rc_option_editor.cc
 ===================================================================
 --- ardour.orig/gtk2_ardour/rc_option_editor.cc
 +++ ardour/gtk2_ardour/rc_option_editor.cc
-@@ -1584,7 +1584,7 @@ public:
- 		t->attach (*l, 1, 2, 3, 4, FILL);
- 		t->attach (_video_server_docroot_entry, 2, 4, 3, 4);
- 		Gtkmm2ext::UI::instance()->set_tip (_video_server_docroot_entry,
--					    _("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unvailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
-+					    _("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unavailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
+@@ -1552,7 +1552,7 @@ class VideoTimelineOptions : public Opti
+ 			t->attach (*l, 1, 2, n, n + 1, FILL);
+ 			t->attach (_video_server_docroot_entry, 2, 4, n, n + 1);
+ 			Gtkmm2ext::UI::instance()->set_tip (_video_server_docroot_entry,
+-					_("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unvailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
++					_("Local path to the video-server document-root. Only files below this directory will be accessible by the video-server. If the server run on a remote host, it should point to a network mounted folder of the server's docroot or be left empty if it is unavailable. It is used for the local video-monitor and file-browsing when opening/adding a video file."));
+ 			++n;
  
- 		t->attach (_show_video_export_info_button, 1, 4, 4, 5);
- 		_show_video_export_info_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::show_video_export_info_toggled));
+ 			l = manage (new Label (""));
 Index: ardour/session_utils/copy-mixer.cc
 ===================================================================
 --- ardour.orig/session_utils/copy-mixer.cc
 +++ ardour/session_utils/copy-mixer.cc
-@@ -241,7 +241,7 @@ static void usage (int status) {
+@@ -239,7 +239,7 @@ static void usage (int status) {
    -d, --debug                print pre-processed XML for each route\n\
    -l, --log-messages         display libardour log messages\n\
    -s, --snapshot <name>      create a new snapshot in dst\n\
diff --git a/debian/patches/060-warn-video-timeline.patch b/debian/patches/060-warn-video-timeline.patch
index 415370f..318a73d 100644
--- a/debian/patches/060-warn-video-timeline.patch
+++ b/debian/patches/060-warn-video-timeline.patch
@@ -5,9 +5,11 @@ Forwarded: not-needed
 Last-Update: 2016-10-18
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: ardour/gtk2_ardour/transcode_ffmpeg.cc
+===================================================================
 --- ardour.orig/gtk2_ardour/transcode_ffmpeg.cc
 +++ ardour/gtk2_ardour/transcode_ffmpeg.cc
-@@ -65,7 +65,9 @@
+@@ -65,7 +65,9 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::s
  					"symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n"
  					"\n"
  					"see also http://manual.ardour.org/video-timeline/setup/"
@@ -18,9 +20,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		return;
  	}
  	ffexecok = true;
+Index: ardour/gtk2_ardour/video_server_dialog.cc
+===================================================================
 --- ardour.orig/gtk2_ardour/video_server_dialog.cc
 +++ ardour/gtk2_ardour/video_server_dialog.cc
-@@ -98,6 +98,7 @@
+@@ -98,6 +98,7 @@ VideoServerDialog::VideoServerDialog (Se
  						"\n"
  						"see also http://manual.ardour.org/video-timeline/setup/"
  					 ), PROGRAM_NAME)
@@ -28,9 +32,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  			<< endmsg;
  	}
  
+Index: ardour/gtk2_ardour/video_timeline.cc
+===================================================================
 --- ardour.orig/gtk2_ardour/video_timeline.cc
 +++ ardour/gtk2_ardour/video_timeline.cc
-@@ -731,6 +731,7 @@
+@@ -723,6 +723,7 @@ VideoTimeLine::find_xjadeo () {
  				"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/")

-- 
ardour Debian packaging



More information about the pkg-multimedia-commits mailing list