[SCM] ardour/master: Patches refreshed.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Mon Aug 21 05:35:18 UTC 2017
The following commit has been merged in the master branch:
commit 57c502baa9407269ae952c5eeb024f41b2a36845
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Sun Aug 20 19:29:20 2017 +0200
Patches refreshed.
diff --git a/debian/patches/0050-log-stdout.patch b/debian/patches/0050-log-stdout.patch
index c3d5d92..d4677f9 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
-@@ -1287,6 +1287,15 @@ const char* const ardour_config_info = "
+@@ -1297,6 +1297,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 46988cd..a6903c7 100644
--- a/debian/patches/0080-more-spelling.patch
+++ b/debian/patches/0080-more-spelling.patch
@@ -7,24 +7,11 @@ Forwarded: yes
Last-Update: 2016-10-18
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: ardour/gtk2_ardour/ardour_ui.cc
-===================================================================
---- ardour.orig/gtk2_ardour/ardour_ui.cc
-+++ ardour/gtk2_ardour/ardour_ui.cc
-@@ -3972,7 +3972,7 @@ ARDOUR_UI::display_cleanup_results (ARDO
- Gtk::MESSAGE_INFO,
- Gtk::BUTTONS_OK);
- msgd.set_title (_("Clean-up"));
-- msgd.set_secondary_text (_("If this seems suprising, \n\
-+ msgd.set_secondary_text (_("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."));
Index: ardour/gtk2_ardour/po/cs.po
===================================================================
--- ardour.orig/gtk2_ardour/po/cs.po
+++ ardour/gtk2_ardour/po/cs.po
-@@ -1501,7 +1501,7 @@ msgstr "Udělat pořádek"
+@@ -1517,7 +1517,7 @@ msgstr "Udělat pořádek"
#: ardour_ui.cc:3728
msgid ""
@@ -33,7 +20,7 @@ Index: ardour/gtk2_ardour/po/cs.po
"check for any existing snapshots.\n"
"These may still include regions that\n"
"require some unused files to continue to exist."
-@@ -10975,7 +10975,7 @@ msgid ""
+@@ -11073,7 +11073,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 "
@@ -41,7 +28,7 @@ Index: ardour/gtk2_ardour/po/cs.po
+"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 ""
- "Místní cesta ke kořenu dokumentu (docroot) videoserveru. Videoserver bude "
+ "Místní cesta ke kořenu dokumentu (docroot) obrazového serveru. Obrazový "
Index: ardour/gtk2_ardour/po/de.po
===================================================================
--- ardour.orig/gtk2_ardour/po/de.po
@@ -262,33 +249,11 @@ Index: ardour/gtk2_ardour/po/pt_PT.po
"monitor and file-browsing when opening/adding a video file."
msgstr ""
-Index: ardour/gtk2_ardour/po/ru.po
-===================================================================
---- ardour.orig/gtk2_ardour/po/ru.po
-+++ ardour/gtk2_ardour/po/ru.po
-@@ -1605,7 +1605,7 @@ msgstr "Очистить"
-
- #: 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."
-@@ -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 "
--"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/sv.po
===================================================================
--- ardour.orig/gtk2_ardour/po/sv.po
+++ ardour/gtk2_ardour/po/sv.po
-@@ -1369,7 +1369,7 @@ msgstr ""
+@@ -1397,7 +1397,7 @@ msgstr ""
#: ardour_ui.cc:3728
msgid ""
@@ -297,7 +262,7 @@ Index: ardour/gtk2_ardour/po/sv.po
"check for any existing snapshots.\n"
"These may still include regions that\n"
"require some unused files to continue to exist."
-@@ -10509,7 +10509,7 @@ msgid ""
+@@ -10537,7 +10537,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 "
@@ -306,41 +271,6 @@ Index: ardour/gtk2_ardour/po/sv.po
"monitor and file-browsing when opening/adding a video file."
msgstr ""
-Index: ardour/gtk2_ardour/po/zh.po
-===================================================================
---- ardour.orig/gtk2_ardour/po/zh.po
-+++ ardour/gtk2_ardour/po/zh.po
-@@ -1516,7 +1516,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."
-@@ -10937,7 +10937,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/rc_option_editor.cc
-===================================================================
---- ardour.orig/gtk2_ardour/rc_option_editor.cc
-+++ ardour/gtk2_ardour/rc_option_editor.cc
-@@ -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;
-
- l = manage (new Label (""));
Index: ardour/session_utils/copy-mixer.cc
===================================================================
--- ardour.orig/session_utils/copy-mixer.cc
diff --git a/debian/patches/0090-even-more-spelling.patch b/debian/patches/0090-even-more-spelling.patch
index 53f4b33..af3de53 100644
--- a/debian/patches/0090-even-more-spelling.patch
+++ b/debian/patches/0090-even-more-spelling.patch
@@ -2,45 +2,6 @@ Description: more spelling fixes
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Forwarded: Paul Davis <paul at linuxaudiosystems.com>
-Index: ardour/gtk2_ardour/po/de.po
-===================================================================
---- ardour.orig/gtk2_ardour/po/de.po
-+++ ardour/gtk2_ardour/po/de.po
-@@ -12466,7 +12466,7 @@ msgid "Create markers where xruns occur"
- msgstr "Bei xrun Marker erzeugen"
-
- #: rc_option_editor.cc:3096
--msgid "External Syncronization"
-+msgid "External Synchronization"
- msgstr "Externe Synchronisation"
-
- #: rc_option_editor.cc:3100
-Index: ardour/gtk2_ardour/po/ja.po
-===================================================================
---- ardour.orig/gtk2_ardour/po/ja.po
-+++ ardour/gtk2_ardour/po/ja.po
-@@ -12364,7 +12364,7 @@ msgid "Create markers where xruns occur"
- msgstr "オーバー/アンダー・ランが発生した箇所にマーカーを作成"
-
- #: rc_option_editor.cc:3096
--msgid "External Syncronization"
-+msgid "External Synchronization"
- msgstr "外部同期"
-
- #: rc_option_editor.cc:3100
-Index: ardour/gtk2_ardour/po/ru.po
-===================================================================
---- ardour.orig/gtk2_ardour/po/ru.po
-+++ ardour/gtk2_ardour/po/ru.po
-@@ -12324,7 +12324,7 @@ msgid "Create markers where xruns occur"
- msgstr "Создавать маркеры в точках рассинхронизации"
-
- #: rc_option_editor.cc:3096
--msgid "External Syncronization"
-+msgid "External Synchronization"
- msgstr ""
-
- #: rc_option_editor.cc:3100
Index: ardour/libs/audiographer/src/general/sample_format_converter.cc
===================================================================
--- ardour.orig/libs/audiographer/src/general/sample_format_converter.cc
@@ -54,16 +15,3 @@ Index: ardour/libs/audiographer/src/general/sample_format_converter.cc
% frames % data_out_size));
}
}
-Index: ardour/gtk2_ardour/rc_option_editor.cc
-===================================================================
---- ardour.orig/gtk2_ardour/rc_option_editor.cc
-+++ ardour/gtk2_ardour/rc_option_editor.cc
-@@ -3093,7 +3093,7 @@ RCOptionEditor::RCOptionEditor ()
-
- /* SYNC */
-
-- add_option (_("Sync"), new OptionEditorHeading (_("External Syncronization")));
-+ add_option (_("Sync"), new OptionEditorHeading (_("External Synchronization")));
-
- _sync_source = new ComboOption<SyncSource> (
- "sync-source",
diff --git a/debian/patches/060-warn-video-timeline.patch b/debian/patches/060-warn-video-timeline.patch
index 318a73d..d95cdf8 100644
--- a/debian/patches/060-warn-video-timeline.patch
+++ b/debian/patches/060-warn-video-timeline.patch
@@ -24,7 +24,7 @@ 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 @@ VideoServerDialog::VideoServerDialog (Se
+@@ -103,6 +103,7 @@ VideoServerDialog::VideoServerDialog (Se
"\n"
"see also http://manual.ardour.org/video-timeline/setup/"
), PROGRAM_NAME)
@@ -36,7 +36,7 @@ Index: ardour/gtk2_ardour/video_timeline.cc
===================================================================
--- ardour.orig/gtk2_ardour/video_timeline.cc
+++ ardour/gtk2_ardour/video_timeline.cc
-@@ -723,6 +723,7 @@ VideoTimeLine::find_xjadeo () {
+@@ -718,6 +718,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