[SCM] ardour3/master: Refresh patches
edwardw-guest at users.alioth.debian.org
edwardw-guest at users.alioth.debian.org
Wed Mar 13 01:19:45 UTC 2013
The following commit has been merged in the master branch:
commit d6e2aa24b1d152a7022c950fa2a87c5c3d582b60
Author: Edward Wang <edward.c.wang at compdigitec.com>
Date: Tue Mar 12 20:34:18 2013 -0400
Refresh patches
diff --git a/debian/patches/02-misspelling.patch b/debian/patches/02-misspelling.patch
deleted file mode 100644
index e3a09e5..0000000
--- a/debian/patches/02-misspelling.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Misspelling patch
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
-Last-Update: 2011-09-28
-Index: ardour3/libs/rubberband/src/FFT.cpp
-===================================================================
---- ardour3.orig/libs/rubberband/src/FFT.cpp 2011-09-27 18:13:20.370434906 +0200
-+++ ardour3/libs/rubberband/src/FFT.cpp 2011-09-28 19:43:50.562980826 +0200
-@@ -1201,7 +1201,7 @@
- switch (m_method) {
-
- case 0:
-- std::cerr << "FFT::FFT(" << size << "): WARNING: Selected implemention not available" << std::endl;
-+ std::cerr << "FFT::FFT(" << size << "): WARNING: Selected implementation not available" << std::endl;
- #ifdef USE_BUILTIN_FFT
- d = new FFTs::D_Cross(size);
- #else
-@@ -1218,7 +1218,7 @@
- }
- d = new FFTs::D_FFTW(size);
- #else
-- std::cerr << "FFT::FFT(" << size << "): WARNING: Selected implemention not available" << std::endl;
-+ std::cerr << "FFT::FFT(" << size << "): WARNING: Selected implementation not available" << std::endl;
- #ifdef USE_BUILTIN_FFT
- d = new FFTs::D_Cross(size);
- #else
-@@ -1236,7 +1236,7 @@
- }
- d = new FFTs::D_KISSFFT(size);
- #else
-- std::cerr << "FFT::FFT(" << size << "): WARNING: Selected implemention not available" << std::endl;
-+ std::cerr << "FFT::FFT(" << size << "): WARNING: Selected implementation not available" << std::endl;
- #ifdef USE_BUILTIN_FFT
- d = new FFTs::D_Cross(size);
- #else
diff --git a/debian/patches/03-misspelling.patch b/debian/patches/03-misspelling.patch
index 666f4e1..3681760 100644
--- a/debian/patches/03-misspelling.patch
+++ b/debian/patches/03-misspelling.patch
@@ -2,11 +2,11 @@ Description: Misspelling patch
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Forwarded: no
Last-Update: 2011-09-28
-Index: ardour3/gtk2_ardour/po/el.po
+Index: pkg-multimedia-ardour3/gtk2_ardour/po/el.po
===================================================================
---- ardour3.orig/gtk2_ardour/po/el.po 2011-12-06 23:25:56.541327380 +0100
-+++ ardour3/gtk2_ardour/po/el.po 2011-12-06 23:31:02.790845982 +0100
-@@ -12949,7 +12949,7 @@
+--- pkg-multimedia-ardour3.orig/gtk2_ardour/po/el.po 2013-03-12 20:31:48.556421521 -0400
++++ pkg-multimedia-ardour3/gtk2_ardour/po/el.po 2013-03-12 20:31:48.540421723 -0400
+@@ -14347,7 +14347,7 @@
#~ msgid "KeyboardTarget: unknown action \"%1\""
#~ msgstr "KeyboardTarget: άγνωστη ενέργεια \"%1\""
@@ -15,11 +15,50 @@ Index: ardour3/gtk2_ardour/po/el.po
#~ msgstr "παραμορφωμένος πομπός δεσμού - αγνοήθηκε"
#~ msgid "ardour: soundfile selector"
-Index: ardour3/gtk2_ardour/po/pt_PT.po
+Index: pkg-multimedia-ardour3/libs/ardour/po/el.po
===================================================================
---- ardour3.orig/gtk2_ardour/po/pt_PT.po 2011-12-06 23:25:56.553327436 +0100
-+++ ardour3/gtk2_ardour/po/pt_PT.po 2011-12-06 23:31:02.794846017 +0100
-@@ -12827,7 +12827,7 @@
+--- pkg-multimedia-ardour3.orig/libs/ardour/po/el.po 2013-03-12 20:31:48.556421521 -0400
++++ pkg-multimedia-ardour3/libs/ardour/po/el.po 2013-03-12 20:32:21.396008672 -0400
+@@ -2809,7 +2809,7 @@
+ #~ msgid "Chunk %1 uses an unknown playlist \"%2\""
+ #~ msgstr "Το κομμάτι %1 χρησιμοποιεί άγνωστη λίστα αναπαρ/γής \"%2\""
+
+-#~ msgid "Chunk %1 contains misformed playlist information"
++#~ msgid "Chunk %1 contains malformed playlist information"
+ #~ msgstr ""
+ #~ "Το κομμάτι %1 περιέχει δύσμορφες πληροφορίες για τη λίστα αναπαρ/γής"
+
+Index: pkg-multimedia-ardour3/libs/ardour/po/it.po
+===================================================================
+--- pkg-multimedia-ardour3.orig/libs/ardour/po/it.po 2013-03-12 20:31:48.556421521 -0400
++++ pkg-multimedia-ardour3/libs/ardour/po/it.po 2013-03-12 20:32:39.755777854 -0400
+@@ -2724,7 +2724,7 @@
+ #~ msgid "Chunk %1 uses an unknown playlist \"%2\""
+ #~ msgstr "Lo spezzone %1 usa una playlist sconosciuta \"%2\""
+
+-#~ msgid "Chunk %1 contains misformed playlist information"
++#~ msgid "Chunk %1 contains malformed playlist information"
+ #~ msgstr "Lo spezzone %1 contiene informazioni sulla playlist mal formate"
+
+ #~ msgid "signal"
+Index: pkg-multimedia-ardour3/libs/ardour/po/nn.po
+===================================================================
+--- pkg-multimedia-ardour3.orig/libs/ardour/po/nn.po 2013-03-12 20:31:48.556421521 -0400
++++ pkg-multimedia-ardour3/libs/ardour/po/nn.po 2013-03-12 20:32:47.259683520 -0400
+@@ -2744,7 +2744,7 @@
+ #~ msgid "Chunk %1 uses an unknown playlist \"%2\""
+ #~ msgstr "Beten %1 bruker ei ukjend speleliste, \"%2\""
+
+-#~ msgid "Chunk %1 contains misformed playlist information"
++#~ msgid "Chunk %1 contains malformed playlist information"
+ #~ msgstr "Beten %1 inneheld feilforma spelelisteinformasjon"
+
+ #~ msgid "signal"
+Index: pkg-multimedia-ardour3/gtk2_ardour/po/pt_PT.po
+===================================================================
+--- pkg-multimedia-ardour3.orig/gtk2_ardour/po/pt_PT.po 2013-03-12 20:31:48.556421521 -0400
++++ pkg-multimedia-ardour3/gtk2_ardour/po/pt_PT.po 2013-03-12 20:31:48.544421673 -0400
+@@ -14239,7 +14239,7 @@
#~ msgid "KeyboardTarget: unknown action \"%1\""
#~ msgstr "KeyboardTarget: acção desconhecida \"%1\""
@@ -28,107 +67,3 @@ Index: ardour3/gtk2_ardour/po/pt_PT.po
#~ msgstr "combinação mal formada - ignorada"
#~ msgid "ardour: soundfile selector"
-Index: ardour3/libs/ardour/po/el.po
-===================================================================
---- ardour3.orig/libs/ardour/po/el.po 2011-12-06 23:25:56.569327516 +0100
-+++ ardour3/libs/ardour/po/el.po 2011-12-06 23:31:02.794846017 +0100
-@@ -1219,7 +1219,7 @@
- msgstr "Το κομμάτι %1 χρησιμοποιεί άγνωστη λίστα αναπαρ/γής \"%2\""
-
- #: named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr "Το κομμάτι %1 περιέχει δύσμορφες πληροφορίες για τη λίστα αναπαρ/γής"
-
- #: operations.cc:24
-Index: ardour3/libs/ardour/po/es.po
-===================================================================
---- ardour3.orig/libs/ardour/po/es.po 2011-12-06 23:25:56.589327613 +0100
-+++ ardour3/libs/ardour/po/es.po 2011-12-06 23:31:02.794846017 +0100
-@@ -1158,7 +1158,7 @@
- msgstr ""
-
- #: named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr ""
-
- #: operations.cc:24
-Index: ardour3/libs/ardour/po/it.po
-===================================================================
---- ardour3.orig/libs/ardour/po/it.po 2011-12-06 23:25:56.617327757 +0100
-+++ ardour3/libs/ardour/po/it.po 2011-12-06 23:31:02.794846017 +0100
-@@ -1188,7 +1188,7 @@
- msgstr "Lo spezzone %1 usa una playlist sconosciuta \"%2\""
-
- #: named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr "Lo spezzone %1 contiene informazioni sulla playlist mal formate"
-
- #: operations.cc:24
-Index: ardour3/libs/ardour/po/nn.po
-===================================================================
---- ardour3.orig/libs/ardour/po/nn.po 2011-12-06 23:25:56.581327573 +0100
-+++ ardour3/libs/ardour/po/nn.po 2011-12-06 23:31:02.798846024 +0100
-@@ -1185,7 +1185,7 @@
- msgstr "Beten %1 bruker ei ukjend speleliste, \"%2\""
-
- #: named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr "Beten %1 inneheld feilforma spelelisteinformasjon"
-
- #: operations.cc:24
-Index: ardour3/libs/ardour/po/pl.po
-===================================================================
---- ardour3.orig/libs/ardour/po/pl.po 2011-12-06 23:25:56.609327717 +0100
-+++ ardour3/libs/ardour/po/pl.po 2011-12-06 23:31:02.798846024 +0100
-@@ -1122,7 +1122,7 @@
- msgstr ""
-
- #: named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr ""
-
- #: operations.cc:24
-Index: ardour3/libs/ardour/po/ru.po
-===================================================================
---- ardour3.orig/libs/ardour/po/ru.po 2011-12-06 23:25:56.601327677 +0100
-+++ ardour3/libs/ardour/po/ru.po 2011-12-06 23:31:02.798846024 +0100
-@@ -1135,7 +1135,7 @@
- msgstr ""
-
- #: named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr ""
-
- #: operations.cc:24
-Index: ardour3/libs/ardour/po/sv.po
-===================================================================
---- ardour3.orig/libs/ardour/po/sv.po 2011-12-06 23:25:56.561327480 +0100
-+++ ardour3/libs/ardour/po/sv.po 2011-12-06 23:31:02.798846024 +0100
-@@ -1128,7 +1128,7 @@
- msgstr ""
-
- #: named_selection.cc:91
--msgid "Chunk %1 contains misformed playlist information"
-+msgid "Chunk %1 contains malformed playlist information"
- msgstr ""
-
- #: operations.cc:24
-Index: ardour3/libs/ardour/named_selection.cc
-===================================================================
---- ardour3.orig/libs/ardour/named_selection.cc 2011-12-06 23:25:56.633327833 +0100
-+++ ardour3/libs/ardour/named_selection.cc 2011-12-06 23:31:02.798846024 +0100
-@@ -88,7 +88,7 @@
- warning << string_compose (_("Chunk %1 uses an unknown playlist \"%2\""), name, property->value()) << endmsg;
- }
- } else {
-- error << string_compose (_("Chunk %1 contains misformed playlist information"), name) << endmsg;
-+ error << string_compose (_("Chunk %1 contains malformed playlist information"), name) << endmsg;
- throw failed_constructor();
- }
- }
diff --git a/debian/patches/04-misspelling.patch b/debian/patches/04-misspelling.patch
deleted file mode 100644
index cfebb76..0000000
--- a/debian/patches/04-misspelling.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Misspelling patch
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: no
-Last-Update: 2011-09-28
-Index: ardour3/gtk2_ardour/about.cc
-===================================================================
---- ardour3.orig/gtk2_ardour/about.cc 2011-12-06 23:25:56.689328110 +0100
-+++ ardour3/gtk2_ardour/about.cc 2011-12-06 23:30:20.374635655 +0100
-@@ -199,7 +199,7 @@
-
- static const char* gpl = X_("\n\
- Ardour comes with NO WARRANTY. It is free software, and you are welcome to redistribute it\n\
--under the terms of the GNU Public License, shown below.\n\
-+under the terms of the GNU General Public License, shown below.\n\
- \n\
- GNU GENERAL PUBLIC LICENSE\n\
- Version 2, June 1991\n\
diff --git a/debian/patches/series b/debian/patches/series
index 8a8d04f..40bf71c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-04-misspelling.patch
03-misspelling.patch
-02-misspelling.patch
01-misspelling.patch
-set-version.patch
--
ardour3 packaging
More information about the pkg-multimedia-commits
mailing list