[SCM] ardour/master: quilt refresh 0100-fix-typos.patch

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Mon Feb 22 21:12:12 UTC 2016 

The following commit has been merged in the master branch:
commit f93ef156fb0dde142622e5990f5c5668d6c99c5c
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Feb 22 20:38:24 2016 +0100

    quilt refresh 0100-fix-typos.patch
    
    This also needs to be forwarded to upstream.

diff --git a/debian/patches/0100-fix-typos.patch b/debian/patches/0100-fix-typos.patch
index 04b6b2d..2b81a72 100644
--- a/debian/patches/0100-fix-typos.patch
+++ b/debian/patches/0100-fix-typos.patch
@@ -6,9 +6,11 @@ Author: IOhannes m zmölnig
 Last-Update: 2016-01-15
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: ardour/gtk2_ardour/editor_drag.cc
+===================================================================
 --- ardour.orig/gtk2_ardour/editor_drag.cc
 +++ ardour/gtk2_ardour/editor_drag.cc
-@@ -4126,9 +4126,9 @@
+@@ -4126,9 +4126,9 @@ MarkerDrag::finished (GdkEvent* event, b
  }
  
  void
@@ -20,7 +22,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		return;
  	}
  
-@@ -4382,9 +4382,9 @@
+@@ -4382,9 +4382,9 @@ LineDrag::motion (GdkEvent* event, bool
  }
  
  void
@@ -32,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		motion (event, false);
  		_line->end_drag (false, 0);
  		_editor->commit_reversible_command ();
-@@ -5357,9 +5357,9 @@
+@@ -5361,9 +5361,9 @@ RangeMarkerBarDrag::finished (GdkEvent*
  }
  
  void
@@ -44,9 +46,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		_drag_rect->hide ();
  	}
  }
+Index: ardour/gtk2_ardour/editor_ops.cc
+===================================================================
 --- ardour.orig/gtk2_ardour/editor_ops.cc
 +++ ardour/gtk2_ardour/editor_ops.cc
-@@ -4512,7 +4512,7 @@
+@@ -4567,7 +4567,7 @@ Editor::cut_copy_regions (CutCopyOp op,
  
  		list<boost::shared_ptr<Playlist> > foo;
  
@@ -55,20 +59,24 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  		for (vector<PlaylistMapping>::iterator i = pmap.begin(); i != pmap.end(); ++i) {
  			if ((*i).pl) {
+Index: ardour/gtk2_ardour/midi_region_view.cc
+===================================================================
 --- ardour.orig/gtk2_ardour/midi_region_view.cc
 +++ ardour/gtk2_ardour/midi_region_view.cc
-@@ -535,7 +535,7 @@
+@@ -536,7 +536,7 @@ MidiRegionView::button_release (GdkEvent
  
  		switch (editor.current_mouse_mode()) {
  		case MouseRange:
 -			/* no motion occured - simple click */
 +			/* no motion occurred - simple click */
- 			clear_selection ();
+ 			clear_editor_note_selection ();
  			_mouse_changed_selection = true;
  			break;
+Index: ardour/libs/ardour/export_handler.cc
+===================================================================
 --- ardour.orig/libs/ardour/export_handler.cc
 +++ ardour/libs/ardour/export_handler.cc
-@@ -500,10 +500,10 @@
+@@ -517,10 +517,10 @@ ExportHandler::export_cd_marker_file (Ex
  		}
  
  	} catch (std::exception& e) {
@@ -81,9 +89,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		::g_unlink (filepath.c_str());
  	}
  }
+Index: ardour/libs/ardour/playlist.cc
+===================================================================
 --- ardour.orig/libs/ardour/playlist.cc
 +++ ardour/libs/ardour/playlist.cc
-@@ -3142,7 +3142,7 @@
+@@ -3173,7 +3173,7 @@ Playlist::uncombine (boost::shared_ptr<R
  		}
  
  		/* check to see how the original region (in the
@@ -92,9 +102,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		 * with the new state of the compound region.
  		 */
  
+Index: ardour/libs/ardour/po/cs.po
+===================================================================
 --- ardour.orig/libs/ardour/po/cs.po
 +++ ardour/libs/ardour/po/cs.po
-@@ -594,7 +594,7 @@
+@@ -594,7 +594,7 @@ msgid "Editor: cannot open \"%1\" as exp
  msgstr "Editor: Nelze otevřít \"%1\" jako soubor vyvedení pro značku CD"
  
  #: export_handler.cc:492 export_handler.cc:495
@@ -103,9 +115,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  msgstr "Při zápisu souboru TOC/CUE se vyskytla chyba:%1"
  
  #: export_handler.cc:744 export_handler.cc:802
+Index: ardour/libs/ardour/po/el.po
+===================================================================
 --- ardour.orig/libs/ardour/po/el.po
 +++ ardour/libs/ardour/po/el.po
-@@ -581,7 +581,7 @@
+@@ -581,7 +581,7 @@ msgid "Editor: cannot open \"%1\" as exp
  msgstr ""
  
  #: export_handler.cc:492 export_handler.cc:495
@@ -114,9 +128,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  msgstr ""
  
  #: export_handler.cc:744 export_handler.cc:802
+Index: ardour/libs/ardour/po/en_GB.po
+===================================================================
 --- ardour.orig/libs/ardour/po/en_GB.po
 +++ ardour/libs/ardour/po/en_GB.po
-@@ -577,7 +577,7 @@
+@@ -577,7 +577,7 @@ msgid "Editor: cannot open \"%1\" as exp
  msgstr ""
  
  #: export_handler.cc:492 export_handler.cc:495
@@ -125,9 +141,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  msgstr ""
  
  #: export_handler.cc:744 export_handler.cc:802
+Index: ardour/libs/ardour/po/es.po
+===================================================================
 --- ardour.orig/libs/ardour/po/es.po
 +++ ardour/libs/ardour/po/es.po
-@@ -581,7 +581,7 @@
+@@ -581,7 +581,7 @@ msgid "Editor: cannot open \"%1\" as exp
  msgstr ""
  
  #: export_handler.cc:492 export_handler.cc:495
@@ -136,9 +154,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  msgstr ""
  
  #: export_handler.cc:744 export_handler.cc:802
+Index: ardour/libs/ardour/po/fr.po
+===================================================================
 --- ardour.orig/libs/ardour/po/fr.po
 +++ ardour/libs/ardour/po/fr.po
-@@ -601,7 +601,7 @@
+@@ -601,7 +601,7 @@ msgstr ""
  "de CD"
  
  #: export_handler.cc:492 export_handler.cc:495
@@ -147,9 +167,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  msgstr "Erreur lors de l'écriture du fichier TOC/CUE : %1"
  
  #: export_handler.cc:744 export_handler.cc:802
+Index: ardour/libs/ardour/po/it.po
+===================================================================
 --- ardour.orig/libs/ardour/po/it.po
 +++ ardour/libs/ardour/po/it.po
-@@ -569,7 +569,7 @@
+@@ -569,7 +569,7 @@ msgid "Editor: cannot open \"%1\" as exp
  msgstr ""
  
  #: export_handler.cc:492 export_handler.cc:495
@@ -158,9 +180,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  msgstr ""
  
  #: export_handler.cc:744 export_handler.cc:802
+Index: ardour/libs/ardour/po/nn.po
+===================================================================
 --- ardour.orig/libs/ardour/po/nn.po
 +++ ardour/libs/ardour/po/nn.po
-@@ -586,7 +586,7 @@
+@@ -586,7 +586,7 @@ msgid "Editor: cannot open \"%1\" as exp
  msgstr "Redigering: greier ikkje opna \"%1\" som eksportfil for CD-markørfil"
  
  #: export_handler.cc:492 export_handler.cc:495
@@ -169,9 +193,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  msgstr ""
  
  #: export_handler.cc:744 export_handler.cc:802
+Index: ardour/libs/ardour/po/pl.po
+===================================================================
 --- ardour.orig/libs/ardour/po/pl.po
 +++ ardour/libs/ardour/po/pl.po
-@@ -564,7 +564,7 @@
+@@ -564,7 +564,7 @@ msgid "Editor: cannot open \"%1\" as exp
  msgstr ""
  
  #: export_handler.cc:492 export_handler.cc:495
@@ -180,9 +206,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  msgstr ""
  
  #: export_handler.cc:744 export_handler.cc:802
+Index: ardour/libs/ardour/po/sv.po
+===================================================================
 --- ardour.orig/libs/ardour/po/sv.po
 +++ ardour/libs/ardour/po/sv.po
-@@ -564,7 +564,7 @@
+@@ -564,7 +564,7 @@ msgid "Editor: cannot open \"%1\" as exp
  msgstr ""
  
  #: export_handler.cc:492 export_handler.cc:495
@@ -191,9 +219,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  msgstr ""
  
  #: export_handler.cc:744 export_handler.cc:802
+Index: ardour/libs/audiographer/src/general/sr_converter.cc
+===================================================================
 --- ardour.orig/libs/audiographer/src/general/sr_converter.cc
 +++ ardour/libs/audiographer/src/general/sr_converter.cc
-@@ -87,7 +87,7 @@
+@@ -89,7 +89,7 @@ SampleRateConverter::allocate_buffers (f
  		max_leftover_frames = 4 * max_frames;
  		leftover_data = (float *) realloc (leftover_data, max_leftover_frames * sizeof (float));
  		if (throw_level (ThrowObject) && !leftover_data) {
@@ -202,7 +232,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		}
  
  		max_frames_in = max_frames;
-@@ -162,7 +162,7 @@
+@@ -164,7 +164,7 @@ SampleRateConverter::process (ProcessCon
  		err = src_process (src_state, &src_data);
  		if (throw_level (ThrowProcess) && err) {
  			throw Exception (*this, str (format
@@ -211,9 +241,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  			% src_strerror (err)));
  		}
  
+Index: ardour/libs/canvas/canvas.cc
+===================================================================
 --- ardour.orig/libs/canvas/canvas.cc
 +++ ardour/libs/canvas/canvas.cc
-@@ -1161,7 +1161,7 @@
+@@ -1161,7 +1161,7 @@ GtkCanvas::start_tooltip_timeout (Item*
  bool
  GtkCanvas::really_start_tooltip_timeout ()
  {
@@ -222,9 +254,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	 * wait 1 second and if the timeout isn't cancelled, show the tooltip.
  	 */
  
+Index: ardour/libs/pbd/msvc/msvc_poll.cc
+===================================================================
 --- ardour.orig/libs/pbd/msvc/msvc_poll.cc
 +++ ardour/libs/pbd/msvc/msvc_poll.cc
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ int   ret = 0;
  
  					if (0 > pos)
  					{
@@ -233,9 +267,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  						ret = (-1);
  						fds[loop].revents = POLLERR;
  						if (fds[loop].events & POLLRDNORM)
+Index: ardour/tools/jacktest.c
+===================================================================
 --- ardour.orig/tools/jacktest.c
 +++ ardour/tools/jacktest.c
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ jack_port_t *input_port;
  jack_port_t *output_port;
  jack_client_t *client;
  int loopsize = 25000;
@@ -244,7 +280,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  int consecutive_xruns = 0;
  float first_xrun = 0.0f;
  float last_load = 0.0f;
-@@ -59,14 +59,14 @@
+@@ -59,14 +59,14 @@ process (jack_nframes_t nframes, void *a
  		printf ("loopsize = %d\n", loopsize);
  	}
  
@@ -261,7 +297,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  	if (consecutive_xruns >= 10) {
  		fprintf (stderr, "Stopping with load = %f (first xrun at %f)\n", last_load, first_xrun);
-@@ -90,8 +90,8 @@
+@@ -90,8 +90,8 @@ jack_shutdown (void *arg)
  int
  jack_xrun (void *arg)
  {
@@ -272,9 +308,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	return 0;
  }
  
+Index: ardour/libs/midi++2/parser.cc
+===================================================================
 --- ardour.orig/libs/midi++2/parser.cc
 +++ ardour/libs/midi++2/parser.cc
-@@ -100,7 +100,7 @@
+@@ -100,7 +100,7 @@ Parser::midi_event_type_name (eventType
  		return "active sense";
  
  	default:
@@ -283,9 +321,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	}
  }
  
+Index: ardour/libs/appleutility/CoreAudio/PublicUtility/CAAtomic.h
+===================================================================
 --- ardour.orig/libs/appleutility/CoreAudio/PublicUtility/CAAtomic.h
 +++ ardour/libs/appleutility/CoreAudio/PublicUtility/CAAtomic.h
-@@ -80,7 +80,7 @@
+@@ -80,7 +80,7 @@ inline SInt32 CAAtomicAdd32Barrier(SInt3
  #if TARGET_OS_WIN32
  	long lRetVal = InterlockedExchangeAdd((volatile long*)theValue, theAmt);
  	// InterlockedExchangeAdd returns the original value which differs from OSX version. 
@@ -294,9 +334,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	// to keep it sync with OSX.
  	return lRetVal + theAmt;
  #else
+Index: ardour/libs/ardour/po/de.po
+===================================================================
 --- ardour.orig/libs/ardour/po/de.po
 +++ ardour/libs/ardour/po/de.po
-@@ -790,7 +790,7 @@
+@@ -790,7 +790,7 @@ msgstr ""
  "Adresse oder Passwort falsch?"
  
  #: export_handler.cc:503 export_handler.cc:506
@@ -305,9 +347,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  msgstr "beim Schreiben einer TOC/CUE Datei trat ein Fehler auf:%1"
  
  #: export_handler.cc:796 export_handler.cc:854
+Index: ardour/libs/ardour/po/ru.po
+===================================================================
 --- ardour.orig/libs/ardour/po/ru.po
 +++ ardour/libs/ardour/po/ru.po
-@@ -792,7 +792,7 @@
+@@ -792,7 +792,7 @@ msgstr ""
  "пароль неверны.\n"
  
  #: export_handler.cc:503 export_handler.cc:506
@@ -316,9 +360,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  msgstr "Произошла ошибка при записи TOC/CUE файла: %1"
  
  #: export_handler.cc:796 export_handler.cc:854
+Index: ardour/gtk2_ardour/monitor_section.cc
+===================================================================
 --- ardour.orig/gtk2_ardour/monitor_section.cc
 +++ ardour/gtk2_ardour/monitor_section.cc
-@@ -184,7 +184,7 @@
+@@ -182,7 +182,7 @@ MonitorSection::MonitorSection (Session*
  	/* Processor Box hide/shos */
  	toggle_processorbox_button.set_text (_("Processors"));
  	toggle_processorbox_button.set_name (X_("monitor section processors toggle"));
@@ -327,9 +373,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  	proctoggle = ToggleAction::create ();
  	toggle_processorbox_button.set_related_action (proctoggle);
+Index: ardour/gtk2_ardour/po/ru.po
+===================================================================
 --- ardour.orig/gtk2_ardour/po/ru.po
 +++ ardour/gtk2_ardour/po/ru.po
-@@ -8518,7 +8518,7 @@
+@@ -8518,7 +8518,7 @@ msgid "Processors"
  msgstr "Обработчики"
  
  #: monitor_section.cc:189

-- 
ardour Debian packaging

More information about the pkg-multimedia-commits mailing list