[SCM] ardour/master: Patches refreshed/removed.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Sat Dec 3 13:56:03 UTC 2016
The following commit has been merged in the master branch:
commit f3ffa854be3dc36cab7b91b300b19065b7958a33
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Sat Dec 3 14:55:54 2016 +0100
Patches refreshed/removed.
diff --git a/debian/patches/0050-log-stdout.patch b/debian/patches/0050-log-stdout.patch
index 9f87fa1..d7536cb 100644
--- a/debian/patches/0050-log-stdout.patch
+++ b/debian/patches/0050-log-stdout.patch
@@ -5,9 +5,11 @@ Description: Log waf messages to stdout, not stderr
by printing to stdout.
Author: Felipe Sateler <fsateler at debian.org>
Forwarded: no
+Index: ardour/wscript
+===================================================================
--- ardour.orig/wscript
+++ ardour/wscript
-@@ -1235,6 +1235,15 @@
+@@ -1257,6 +1257,15 @@ const char* const ardour_config_info = "
def build(bld):
create_stored_revision()
diff --git a/debian/patches/0070-spelling.patch b/debian/patches/0070-spelling.patch
deleted file mode 100644
index 58df1f5..0000000
--- a/debian/patches/0070-spelling.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Fix spelling
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: Paul Davis <paul at linuxaudiosystems.com>
-Applied-Upstream: https://github.com/Ardour/ardour/commit/69cbcb84a66cfc48d734692ae0f2f8d8bee4f5b5
-Last-Updated: 2016-10-17
---- ardour.orig/libs/backends/alsa/zita-alsa-pcmi.cc
-+++ ardour/libs/backends/alsa/zita-alsa-pcmi.cc
-@@ -735,7 +735,7 @@
- snd_pcm_hw_params_get_channels_max (hwpar, nchan);
- if (*nchan > 1024)
- {
-- if (_debug & DEBUG_INIT) fprintf (stderr, "Alsa_pcmi: detected more than 1024 %s channnels, reset to 2.\n",
-+ if (_debug & DEBUG_INIT) fprintf (stderr, "Alsa_pcmi: detected more than 1024 %s channels, reset to 2.\n",
- sname);
- *nchan = 2;
- }
---- ardour.orig/libs/ardour/audio_backend.cc
-+++ ardour/libs/ardour/audio_backend.cc
-@@ -80,7 +80,7 @@
- case OutputChannelCountNotSupportedError:
- return _("Output channel count configuration not supported");
- case AquireRealtimePermissionError:
-- return _("Unable to aquire realtime permissions");
-+ return _("Unable to acquire realtime permissions");
- case SettingAudioThreadPriorityError:
- return _("Setting audio device thread priorities failed");
- case SettingMIDIThreadPriorityError:
---- ardour.orig/libs/ardour/file_source.cc
-+++ ardour/libs/ardour/file_source.cc
-@@ -433,7 +433,7 @@
- if (cnt > 1) {
-
- error << string_compose (
-- _("FileSource: \"%1\" is ambigous when searching\n\t"), pathstr) << endmsg;
-+ _("FileSource: \"%1\" is ambiguous when searching\n\t"), pathstr) << endmsg;
- goto out;
-
- } else if (cnt == 0) {
---- ardour.orig/libs/audiographer/src/general/sr_converter.cc
-+++ ardour/libs/audiographer/src/general/sr_converter.cc
-@@ -192,7 +192,7 @@
-
- if (throw_level (ThrowProcess) && src_data.output_frames_gen == 0 && leftover_frames) {
- throw Exception (*this, boost::str (boost::format
-- ("No output frames genereated with %1% leftover frames")
-+ ("No output frames generated with %1% leftover frames")
- % leftover_frames));
- }
-
diff --git a/debian/patches/0080-more-spelling.patch b/debian/patches/0080-more-spelling.patch
index 64af863..cd78ab5 100644
--- a/debian/patches/0080-more-spelling.patch
+++ b/debian/patches/0080-more-spelling.patch
@@ -7,9 +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
-@@ -3806,7 +3806,7 @@
+@@ -3806,7 +3806,7 @@ ARDOUR_UI::display_cleanup_results (ARDO
Gtk::MESSAGE_INFO,
Gtk::BUTTONS_OK);
msgd.set_title (_("Clean-up"));
@@ -18,9 +20,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
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 @@
+@@ -1378,7 +1378,7 @@ msgstr ""
#: ardour_ui.cc:3728
msgid ""
@@ -29,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"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 @@
+@@ -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 "
@@ -38,9 +42,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"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
+++ ardour/gtk2_ardour/po/cs.po
-@@ -1501,7 +1501,7 @@
+@@ -1501,7 +1501,7 @@ msgstr "Udělat pořádek"
#: ardour_ui.cc:3728
msgid ""
@@ -49,7 +55,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"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 @@
+@@ -10975,7 +10975,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 "
@@ -58,18 +64,20 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"monitor and file-browsing when opening/adding a video file."
msgstr ""
"Místní cesta ke kořenu dokumentu (docroot) videoserveru. Videoserver bude "
+Index: ardour/gtk2_ardour/po/de.po
+===================================================================
--- ardour.orig/gtk2_ardour/po/de.po
+++ ardour/gtk2_ardour/po/de.po
-@@ -1558,7 +1558,7 @@
+@@ -1579,7 +1579,7 @@ msgstr "Aufräumen"
- #: 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."
-@@ -11109,7 +11109,7 @@
+@@ -11186,7 +11186,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 "
@@ -78,9 +86,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"monitor and file-browsing when opening/adding a video file."
msgstr ""
"Lokaler Pfad zum document-root des Videoservers. Nur Dateien unterhalb "
+Index: ardour/gtk2_ardour/po/el.po
+===================================================================
--- ardour.orig/gtk2_ardour/po/el.po
+++ ardour/gtk2_ardour/po/el.po
-@@ -1368,7 +1368,7 @@
+@@ -1368,7 +1368,7 @@ msgstr ""
#: ardour_ui.cc:3728
msgid ""
@@ -89,7 +99,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"check for any existing snapshots.\n"
"These may still include regions that\n"
"require some unused files to continue to exist."
-@@ -10514,7 +10514,7 @@
+@@ -10514,7 +10514,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 "
@@ -98,9 +108,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"monitor and file-browsing when opening/adding a video file."
msgstr ""
+Index: ardour/gtk2_ardour/po/en_GB.po
+===================================================================
--- ardour.orig/gtk2_ardour/po/en_GB.po
+++ ardour/gtk2_ardour/po/en_GB.po
-@@ -1372,7 +1372,7 @@
+@@ -1372,7 +1372,7 @@ msgstr ""
#: ardour_ui.cc:3728
msgid ""
@@ -109,7 +121,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"check for any existing snapshots.\n"
"These may still include regions that\n"
"require some unused files to continue to exist."
-@@ -10495,7 +10495,7 @@
+@@ -10495,7 +10495,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 "
@@ -118,9 +130,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"monitor and file-browsing when opening/adding a video file."
msgstr ""
+Index: ardour/gtk2_ardour/po/es.po
+===================================================================
--- ardour.orig/gtk2_ardour/po/es.po
+++ ardour/gtk2_ardour/po/es.po
-@@ -1479,7 +1479,7 @@
+@@ -1479,7 +1479,7 @@ msgstr "Purgar"
#: ardour_ui.cc:3728
msgid ""
@@ -129,7 +143,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"check for any existing snapshots.\n"
"These may still include regions that\n"
"require some unused files to continue to exist."
-@@ -10911,7 +10911,7 @@
+@@ -10911,7 +10911,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 "
@@ -138,9 +152,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"monitor and file-browsing when opening/adding a video file."
msgstr ""
+Index: ardour/gtk2_ardour/po/fr.po
+===================================================================
--- ardour.orig/gtk2_ardour/po/fr.po
+++ ardour/gtk2_ardour/po/fr.po
-@@ -1564,7 +1564,7 @@
+@@ -1565,7 +1565,7 @@ msgstr "Nettoyer"
#: ardour_ui.cc:3728
msgid ""
@@ -149,7 +165,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"check for any existing snapshots.\n"
"These may still include regions that\n"
"require some unused files to continue to exist."
-@@ -11108,7 +11108,7 @@
+@@ -11111,7 +11111,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 "
@@ -158,9 +174,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"monitor and file-browsing when opening/adding a video file."
msgstr ""
"Chemin local vers le répertoire-racine du serveur vidéo. Seuls les fichiers "
+Index: ardour/gtk2_ardour/po/it.po
+===================================================================
--- ardour.orig/gtk2_ardour/po/it.po
+++ ardour/gtk2_ardour/po/it.po
-@@ -1442,7 +1442,7 @@
+@@ -1442,7 +1442,7 @@ msgstr "Pulisci"
#: ardour_ui.cc:3728
msgid ""
@@ -169,7 +187,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"check for any existing snapshots.\n"
"These may still include regions that\n"
"require some unused files to continue to exist."
-@@ -10837,7 +10837,7 @@
+@@ -10837,7 +10837,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 "
@@ -178,9 +196,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"monitor and file-browsing when opening/adding a video file."
msgstr ""
"Percorso locale alla cartella principale del server video. Soltanto i file "
+Index: ardour/gtk2_ardour/po/nn.po
+===================================================================
--- ardour.orig/gtk2_ardour/po/nn.po
+++ ardour/gtk2_ardour/po/nn.po
-@@ -1452,7 +1452,7 @@
+@@ -1452,7 +1452,7 @@ msgstr "Opprydding"
#: ardour_ui.cc:3728
msgid ""
@@ -189,7 +209,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"check for any existing snapshots.\n"
"These may still include regions that\n"
"require some unused files to continue to exist."
-@@ -10750,7 +10750,7 @@
+@@ -10750,7 +10750,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 "
@@ -198,9 +218,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"monitor and file-browsing when opening/adding a video file."
msgstr ""
+Index: ardour/gtk2_ardour/po/pl.po
+===================================================================
--- ardour.orig/gtk2_ardour/po/pl.po
+++ ardour/gtk2_ardour/po/pl.po
-@@ -1386,7 +1386,7 @@
+@@ -1386,7 +1386,7 @@ msgstr ""
#: ardour_ui.cc:3728
msgid ""
@@ -209,7 +231,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"check for any existing snapshots.\n"
"These may still include regions that\n"
"require some unused files to continue to exist."
-@@ -10536,7 +10536,7 @@
+@@ -10536,7 +10536,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 "
@@ -218,9 +240,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"monitor and file-browsing when opening/adding a video file."
msgstr ""
+Index: ardour/gtk2_ardour/po/pt.po
+===================================================================
--- ardour.orig/gtk2_ardour/po/pt.po
+++ ardour/gtk2_ardour/po/pt.po
-@@ -1394,7 +1394,7 @@
+@@ -1394,7 +1394,7 @@ msgstr "Limpeza"
#: ardour_ui.cc:3728
msgid ""
@@ -229,7 +253,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"check for any existing snapshots.\n"
"These may still include regions that\n"
"require some unused files to continue to exist."
-@@ -10533,7 +10533,7 @@
+@@ -10533,7 +10533,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 "
@@ -238,9 +262,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"monitor and file-browsing when opening/adding a video file."
msgstr ""
+Index: ardour/gtk2_ardour/po/pt_PT.po
+===================================================================
--- ardour.orig/gtk2_ardour/po/pt_PT.po
+++ ardour/gtk2_ardour/po/pt_PT.po
-@@ -1370,7 +1370,7 @@
+@@ -1370,7 +1370,7 @@ msgstr ""
#: ardour_ui.cc:3728
msgid ""
@@ -249,7 +275,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"check for any existing snapshots.\n"
"These may still include regions that\n"
"require some unused files to continue to exist."
-@@ -10507,7 +10507,7 @@
+@@ -10507,7 +10507,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 "
@@ -258,9 +284,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"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
-@@ -1549,7 +1549,7 @@
+@@ -1549,7 +1549,7 @@ msgstr "Очистить"
#: ardour_ui.cc:3728
msgid ""
@@ -269,7 +297,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"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 @@
+@@ -11043,7 +11043,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 "
@@ -278,9 +306,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"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 @@
+@@ -1369,7 +1369,7 @@ msgstr ""
#: ardour_ui.cc:3728
msgid ""
@@ -289,7 +319,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"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 @@
+@@ -10509,7 +10509,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 "
@@ -298,9 +328,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"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 @@
+@@ -1516,7 +1516,7 @@ msgstr "清空"
#: ardour_ui.cc:3728
msgid ""
@@ -309,7 +341,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"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 @@
+@@ -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 "
@@ -318,9 +350,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"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
-@@ -1582,7 +1582,7 @@
+@@ -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,
@@ -329,9 +363,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
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));
+Index: ardour/session_utils/copy-mixer.cc
+===================================================================
--- ardour.orig/session_utils/copy-mixer.cc
+++ ardour/session_utils/copy-mixer.cc
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,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/series b/debian/patches/series
index eb0dcc3..4f38968 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@
0030-wscript.patch
0050-log-stdout.patch
060-warn-video-timeline.patch
-0070-spelling.patch
0080-more-spelling.patch
--
ardour Debian packaging
More information about the pkg-multimedia-commits
mailing list