[Demudi-commits] r1530 - in ardour/trunk/debian: . patches

free-guest at alioth.debian.org free-guest at alioth.debian.org
Fri Aug 3 14:17:20 UTC 2007


Author: free-guest
Date: 2007-08-03 14:17:19 +0000 (Fri, 03 Aug 2007)
New Revision: 1530

Modified:
   ardour/trunk/debian/ardour-altivec.examples
   ardour/trunk/debian/ardour-i686.examples
   ardour/trunk/debian/ardour-opt.examples
   ardour/trunk/debian/ardour.examples
   ardour/trunk/debian/changelog
   ardour/trunk/debian/patches/80_ardourino.patch
Log:
releasing version 1:2.0.4-1

Modified: ardour/trunk/debian/ardour-altivec.examples
===================================================================
--- ardour/trunk/debian/ardour-altivec.examples	2007-08-03 03:04:32 UTC (rev 1529)
+++ ardour/trunk/debian/ardour-altivec.examples	2007-08-03 14:17:19 UTC (rev 1530)
@@ -1,3 +1 @@
-ardour.rc
 ardour_system.rc
-gtk2_ardour/ardour2_ui.rc

Modified: ardour/trunk/debian/ardour-i686.examples
===================================================================
--- ardour/trunk/debian/ardour-i686.examples	2007-08-03 03:04:32 UTC (rev 1529)
+++ ardour/trunk/debian/ardour-i686.examples	2007-08-03 14:17:19 UTC (rev 1530)
@@ -1,3 +1 @@
-ardour.rc
 ardour_system.rc
-gtk2_ardour/ardour2_ui.rc

Modified: ardour/trunk/debian/ardour-opt.examples
===================================================================
--- ardour/trunk/debian/ardour-opt.examples	2007-08-03 03:04:32 UTC (rev 1529)
+++ ardour/trunk/debian/ardour-opt.examples	2007-08-03 14:17:19 UTC (rev 1530)
@@ -1,3 +1 @@
-ardour.rc
 ardour_system.rc
-gtk2_ardour/ardour2_ui.rc

Modified: ardour/trunk/debian/ardour.examples
===================================================================
--- ardour/trunk/debian/ardour.examples	2007-08-03 03:04:32 UTC (rev 1529)
+++ ardour/trunk/debian/ardour.examples	2007-08-03 14:17:19 UTC (rev 1530)
@@ -1,3 +1,2 @@
-ardour.rc
 ardour_system.rc
-gtk2_ardour/ardour2_ui.rc
+

Modified: ardour/trunk/debian/changelog
===================================================================
--- ardour/trunk/debian/changelog	2007-08-03 03:04:32 UTC (rev 1529)
+++ ardour/trunk/debian/changelog	2007-08-03 14:17:19 UTC (rev 1530)
@@ -1,9 +1,10 @@
-ardour (1:2.0.3-3) unstable; urgency=low
+ardour (1:2.0.4-1) unstable; urgency=low
 
+  * New upstream release
   * Include pre-redirect in ardourino
   * Added ardourino template
 
- -- Free Ekanayaka <freee at debian.org>  Sat, 28 Jul 2007 12:48:58 +0200
+ -- Free Ekanayaka <freee at debian.org>  Wed,  1 Aug 2007 00:21:08 +0200
 
 ardour (1:2.0.3-2) unstable; urgency=low
 

Modified: ardour/trunk/debian/patches/80_ardourino.patch
===================================================================
--- ardour/trunk/debian/patches/80_ardourino.patch	2007-08-03 03:04:32 UTC (rev 1529)
+++ ardour/trunk/debian/patches/80_ardourino.patch	2007-08-03 14:17:19 UTC (rev 1530)
@@ -1,6 +1,6 @@
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/ardour_ui2.cc ardour-2.0.3/gtk2_ardour/ardour_ui2.cc
---- ardour-2.0.3.orig/gtk2_ardour/ardour_ui2.cc	2007-05-10 13:30:27.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/ardour_ui2.cc	2007-07-25 17:53:30.000000000 +0200
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/ardour_ui2.cc ardour-2.0.4/gtk2_ardour/ardour_ui2.cc
+--- ardour-2.0.4.orig/gtk2_ardour/ardour_ui2.cc	2007-07-05 15:03:11.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/ardour_ui2.cc	2007-08-01 00:28:33.000000000 +0200
 @@ -98,7 +98,9 @@
  	shuttle_fract = 0;
  	shuttle_box.queue_draw ();
@@ -184,10 +184,10 @@
  	toggle_box->pack_start (*io_box, false, false);
  	
  	/* desensitize */
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/ardour_ui.cc ardour-2.0.3/gtk2_ardour/ardour_ui.cc
---- ardour-2.0.3.orig/gtk2_ardour/ardour_ui.cc	2007-06-29 17:20:45.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/ardour_ui.cc	2007-07-25 17:53:30.000000000 +0200
-@@ -147,7 +147,9 @@
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/ardour_ui.cc ardour-2.0.4/gtk2_ardour/ardour_ui.cc
+--- ardour-2.0.4.orig/gtk2_ardour/ardour_ui.cc	2007-07-31 18:50:47.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/ardour_ui.cc	2007-08-01 00:28:33.000000000 +0200
+@@ -148,7 +148,9 @@
  
  	  auditioning_alert_button (_("AUDITION")),
  	  solo_alert_button (_("SOLO")),
@@ -198,7 +198,7 @@
  {
  	using namespace Gtk::Menu_Helpers;
  
-@@ -220,7 +222,9 @@
+@@ -221,7 +223,9 @@
  	engine->Stopped.connect (mem_fun(*this, &ARDOUR_UI::engine_stopped));
  	engine->Running.connect (mem_fun(*this, &ARDOUR_UI::engine_running));
  	engine->Halted.connect (mem_fun(*this, &ARDOUR_UI::engine_halted));
@@ -209,7 +209,7 @@
  
         	ActionManager::init ();
  	new_session_dialog = new NewSessionDialog();
-@@ -271,12 +275,14 @@
+@@ -272,12 +276,14 @@
  
  	/* start the time-of-day-clock */
  	
@@ -230,7 +230,7 @@
  
  	starting.connect (mem_fun(*this, &ARDOUR_UI::startup));
  	stopping.connect (mem_fun(*this, &ARDOUR_UI::shutdown));
-@@ -639,9 +645,11 @@
+@@ -641,9 +647,11 @@
  gint
  ARDOUR_UI::every_second ()
  {
@@ -245,7 +245,7 @@
  	return TRUE;
  }
  
-@@ -1435,7 +1443,9 @@
+@@ -1437,7 +1445,9 @@
  	ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, false);
  	ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, true);
  
@@ -256,7 +256,7 @@
  
  	MessageDialog msg (*editor, 
  			   _("\
-@@ -2512,7 +2522,9 @@
+@@ -2520,7 +2530,9 @@
  			msg.run ();
  		}
  
@@ -267,7 +267,7 @@
  	}
  }
  
-@@ -2525,7 +2537,9 @@
+@@ -2533,7 +2545,9 @@
  			msg.run ();
  		}
  
@@ -278,9 +278,9 @@
  	}
  }
  
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/ardour_ui_dialogs.cc ardour-2.0.3/gtk2_ardour/ardour_ui_dialogs.cc
---- ardour-2.0.3.orig/gtk2_ardour/ardour_ui_dialogs.cc	2007-05-10 13:30:27.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/ardour_ui_dialogs.cc	2007-07-25 17:53:30.000000000 +0200
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/ardour_ui_dialogs.cc ardour-2.0.4/gtk2_ardour/ardour_ui_dialogs.cc
+--- ardour-2.0.4.orig/gtk2_ardour/ardour_ui_dialogs.cc	2007-07-05 15:03:11.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/ardour_ui_dialogs.cc	2007-08-01 00:28:33.000000000 +0200
 @@ -110,8 +110,10 @@
  	setup_session_options ();
  
@@ -321,9 +321,9 @@
  
  	return 0;
  }
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/ardour_ui_ed.cc ardour-2.0.3/gtk2_ardour/ardour_ui_ed.cc
---- ardour-2.0.3.orig/gtk2_ardour/ardour_ui_ed.cc	2007-06-29 17:16:26.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/ardour_ui_ed.cc	2007-07-25 17:53:30.000000000 +0200
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/ardour_ui_ed.cc ardour-2.0.4/gtk2_ardour/ardour_ui_ed.cc
+--- ardour-2.0.4.orig/gtk2_ardour/ardour_ui_ed.cc	2007-07-19 17:28:45.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/ardour_ui_ed.cc	2007-08-01 00:30:33.000000000 +0200
 @@ -316,7 +316,9 @@
  	ActionManager::transport_sensitive_actions.push_back (act);
  
@@ -335,7 +335,7 @@
  	ActionManager::session_sensitive_actions.push_back (act);
  
  	act = ActionManager::register_action (common_actions, X_("ToggleRecordEnableTrack1"), _("Toggle Record Enable Track1"), bind (mem_fun(*this, &ARDOUR_UI::toggle_record_enable),  0U));
-@@ -612,7 +614,9 @@
+@@ -615,7 +617,9 @@
  
  			if (ract && ract->get_active()) {
  				engine->request_buffer_size (nframes);
@@ -346,83 +346,42 @@
  			}
  		}
  	}
-@@ -703,34 +707,38 @@
- 	 */
- 	Gtk::Settings::get_default()->property_gtk_can_change_accels() = true;	
- 	
--	wall_clock_box.add (wall_clock_label);
--	wall_clock_box.set_name ("WallClock");
--	wall_clock_label.set_name ("WallClock");
--
--	disk_space_box.add (disk_space_label);
--	disk_space_box.set_name ("WallClock");
--	disk_space_label.set_name ("WallClock");
--
--	cpu_load_box.add (cpu_load_label);
--	cpu_load_box.set_name ("CPULoad");
--	cpu_load_label.set_name ("CPULoad");
--
--	buffer_load_box.add (buffer_load_label);
--	buffer_load_box.set_name ("BufferLoad");
--	buffer_load_label.set_name ("BufferLoad");
--
--	sample_rate_box.add (sample_rate_label);
--	sample_rate_box.set_name ("SampleRate");
--	sample_rate_label.set_name ("SampleRate");
-+	if (!ardourino) {
-+	  wall_clock_box.add (wall_clock_label);
-+	  wall_clock_box.set_name ("WallClock");
-+	  wall_clock_label.set_name ("WallClock");
-+
-+	  disk_space_box.add (disk_space_label);
-+	  disk_space_box.set_name ("WallClock");
-+	  disk_space_label.set_name ("WallClock");
-+
-+	  cpu_load_box.add (cpu_load_label);
-+	  cpu_load_box.set_name ("CPULoad");
-+	  cpu_load_label.set_name ("CPULoad");
-+
-+	  buffer_load_box.add (buffer_load_label);
-+	  buffer_load_box.set_name ("BufferLoad");
-+	  buffer_load_label.set_name ("BufferLoad");
-+
-+	  sample_rate_box.add (sample_rate_label);
-+	  sample_rate_box.set_name ("SampleRate");
-+	  sample_rate_label.set_name ("SampleRate");
+@@ -709,6 +713,7 @@
+ 	// so use this instead ...
+ 	gtk_settings_set_long_property (gtk_settings_get_default(), "gtk-can-change-accels", 1, "Ardour:designers");
+ 
++ 	if (!ardourino) {
+ 	wall_clock_box.add (wall_clock_label);
+ 	wall_clock_box.set_name ("WallClock");
+ 	wall_clock_label.set_name ("WallClock");
+@@ -728,12 +733,15 @@
+ 	sample_rate_box.add (sample_rate_label);
+ 	sample_rate_box.set_name ("SampleRate");
+ 	sample_rate_label.set_name ("SampleRate");
 +	}
  
  	menu_hbox.pack_start (*menu_bar, true, true);
--	if (!Profile->get_small_screen()) {
--		menu_hbox.pack_end (wall_clock_box, false, false, 2);
--		menu_hbox.pack_end (disk_space_box, false, false, 4);
--	}
--	menu_hbox.pack_end (cpu_load_box, false, false, 4);
--	menu_hbox.pack_end (buffer_load_box, false, false, 4);
--	menu_hbox.pack_end (sample_rate_box, false, false, 4);
-+	if (!ardourino) {
-+	  if (!Profile->get_small_screen()) {
-+	    menu_hbox.pack_end (wall_clock_box, false, false, 2);
-+	    menu_hbox.pack_end (disk_space_box, false, false, 4);
-+	  }
-+	  menu_hbox.pack_end (cpu_load_box, false, false, 4);
-+	  menu_hbox.pack_end (buffer_load_box, false, false, 4);
-+	  menu_hbox.pack_end (sample_rate_box, false, false, 4);
++ 	if (!ardourino) {
+ 	if (!Profile->get_small_screen()) {
+ 		menu_hbox.pack_end (wall_clock_box, false, false, 2);
+ 		menu_hbox.pack_end (disk_space_box, false, false, 4);
+ 	}
 +	}
+ 	menu_hbox.pack_end (cpu_load_box, false, false, 4);
+ 	menu_hbox.pack_end (buffer_load_box, false, false, 4);
+ 	menu_hbox.pack_end (sample_rate_box, false, false, 4);
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/ardour_ui.h ardour-2.0.4/gtk2_ardour/ardour_ui.h
+--- ardour-2.0.4.orig/gtk2_ardour/ardour_ui.h	2007-07-31 18:50:31.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/ardour_ui.h	2007-08-01 00:28:33.000000000 +0200
+@@ -409,6 +409,7 @@
  
- 	menu_bar_base.set_name ("MainMenuBar");
- 	menu_bar_base.add (menu_hbox);
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/ardour_ui.h ardour-2.0.3/gtk2_ardour/ardour_ui.h
---- ardour-2.0.3.orig/gtk2_ardour/ardour_ui.h	2007-06-29 17:16:39.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/ardour_ui.h	2007-07-25 17:53:30.000000000 +0200
-@@ -404,6 +404,7 @@
- 
  	void sync_option_changed ();
  	void toggle_time_master ();
 +
  	void toggle_video_sync ();
  
  	Gtk::DrawingArea  shuttle_box;
-@@ -713,6 +714,7 @@
+@@ -722,6 +723,7 @@
  	void check_memory_locking ();
  
  	void audioengine_setup ();
@@ -430,9 +389,9 @@
  };
  
  #endif /* __ardour_gui_h__ */
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/ardour_ui_options.cc ardour-2.0.3/gtk2_ardour/ardour_ui_options.cc
---- ardour-2.0.3.orig/gtk2_ardour/ardour_ui_options.cc	2007-05-31 23:27:20.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/ardour_ui_options.cc	2007-07-27 13:40:44.000000000 +0200
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/ardour_ui_options.cc ardour-2.0.4/gtk2_ardour/ardour_ui_options.cc
+--- ardour-2.0.4.orig/gtk2_ardour/ardour_ui_options.cc	2007-07-16 23:26:46.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/ardour_ui_options.cc	2007-08-01 00:28:33.000000000 +0200
 @@ -42,7 +42,9 @@
  void
  ARDOUR_UI::toggle_time_master ()
@@ -444,7 +403,7 @@
  }
  
  void
-@@ -501,7 +503,9 @@
+@@ -516,7 +518,9 @@
  	}
  	positional_sync_strings.push_back (slave_source_to_string (JACK));
  	
@@ -455,7 +414,7 @@
  }
  
  void
-@@ -965,7 +969,9 @@
+@@ -984,7 +988,9 @@
  	} else if (PARAM_IS ("clicking")) {
  		ActionManager::map_some_state ("Transport", "ToggleClick", &Configuration::get_clicking);
  	} else if (PARAM_IS ("jack-time-master")) {
@@ -466,10 +425,10 @@
  	} else if (PARAM_IS ("plugins-stop-with-transport")) {
  		ActionManager::map_some_state ("options",  "StopPluginsWithTransport", &Configuration::get_plugins_stop_with_transport);
  	} else if (PARAM_IS ("latched-record-enable")) {
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/editor.cc ardour-2.0.3/gtk2_ardour/editor.cc
---- ardour-2.0.3.orig/gtk2_ardour/editor.cc	2007-05-30 19:23:07.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/editor.cc	2007-07-28 12:35:18.000000000 +0200
-@@ -74,6 +74,7 @@
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/editor.cc ardour-2.0.4/gtk2_ardour/editor.cc
+--- ardour-2.0.4.orig/gtk2_ardour/editor.cc	2007-07-20 18:02:54.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/editor.cc	2007-08-01 00:28:33.000000000 +0200
+@@ -76,6 +76,7 @@
  #include "canvas_impl.h"
  #include "actions.h"
  #include "gui_thread.h"
@@ -477,7 +436,7 @@
  
  #ifdef FFT_ANALYSIS
  #include "analysis_window.h"
-@@ -211,8 +212,8 @@
+@@ -212,8 +213,8 @@
  
  	  /* nudge */
  
@@ -488,7 +447,7 @@
  {
  	constructed = false;
  
-@@ -2583,38 +2584,40 @@
+@@ -2606,38 +2607,40 @@
  
  	/* Edit Cursor / Snap */
  
@@ -557,7 +516,7 @@
  
  	/* Pack everything in... */
  
-@@ -2637,21 +2640,22 @@
+@@ -2660,21 +2663,22 @@
  	toolbar_hbox.set_border_width (1);
  
  	toolbar_hbox.pack_start (*mouse_mode_tearoff, false, false);
@@ -586,20 +545,20 @@
  }
  
  int
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/editor.h ardour-2.0.3/gtk2_ardour/editor.h
---- ardour-2.0.3.orig/gtk2_ardour/editor.h	2007-05-30 19:34:29.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/editor.h	2007-07-25 17:53:30.000000000 +0200
-@@ -1851,6 +1851,7 @@
- 	Glib::RefPtr<Gtk::Action>              redo_action;
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/editor.h ardour-2.0.4/gtk2_ardour/editor.h
+--- ardour-2.0.4.orig/gtk2_ardour/editor.h	2007-07-20 18:02:54.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/editor.h	2007-08-01 00:31:14.000000000 +0200
+@@ -1857,6 +1857,7 @@
  
  	void history_changed ();
-+	bool ardourino;
+ 	void color_handler ();
++ 	bool ardourino;
  };
  
  #endif /* __ardour_editor_h__ */
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/export_dialog.cc ardour-2.0.3/gtk2_ardour/export_dialog.cc
---- ardour-2.0.3.orig/gtk2_ardour/export_dialog.cc	2007-05-10 13:30:27.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/export_dialog.cc	2007-07-27 15:55:39.000000000 +0200
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/export_dialog.cc ardour-2.0.4/gtk2_ardour/export_dialog.cc
+--- ardour-2.0.4.orig/gtk2_ardour/export_dialog.cc	2007-05-10 13:30:27.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/export_dialog.cc	2007-08-01 00:28:33.000000000 +0200
 @@ -43,6 +43,7 @@
  #include "ardour_ui.h"
  #include "public_editor.h"
@@ -629,9 +588,9 @@
  				row[exp_cols.port] = route->output (i);
  			} else {
  				TreeModel::iterator iter = track_list->append();
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/mixer_strip.cc ardour-2.0.3/gtk2_ardour/mixer_strip.cc
---- ardour-2.0.3.orig/gtk2_ardour/mixer_strip.cc	2007-05-31 16:20:09.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/mixer_strip.cc	2007-07-27 13:17:45.000000000 +0200
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/mixer_strip.cc ardour-2.0.4/gtk2_ardour/mixer_strip.cc
+--- ardour-2.0.4.orig/gtk2_ardour/mixer_strip.cc	2007-05-31 16:20:09.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/mixer_strip.cc	2007-08-01 00:28:33.000000000 +0200
 @@ -56,6 +56,7 @@
  #include "io_selector.h"
  #include "utils.h"
@@ -827,9 +786,9 @@
  			speed_spinner.set_sensitive (true);
  			break;
  		}
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/new_session_dialog.cc ardour-2.0.3/gtk2_ardour/new_session_dialog.cc
---- ardour-2.0.3.orig/gtk2_ardour/new_session_dialog.cc	2007-05-16 04:42:43.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/new_session_dialog.cc	2007-07-28 11:53:26.000000000 +0200
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/new_session_dialog.cc ardour-2.0.4/gtk2_ardour/new_session_dialog.cc
+--- ardour-2.0.4.orig/gtk2_ardour/new_session_dialog.cc	2007-05-16 04:42:43.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/new_session_dialog.cc	2007-08-01 00:28:33.000000000 +0200
 @@ -74,6 +74,10 @@
  	m_folder = Gtk::manage(new class Gtk::FileChooserButton(Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
  	session_template_label = Gtk::manage(new class Gtk::Label(_("Template :")));
@@ -841,9 +800,9 @@
  	m_create_control_bus = Gtk::manage(new class Gtk::CheckButton(_("Create Monitor Bus")));
  	
  	Gtk::Adjustment *m_control_bus_channel_count_adj = Gtk::manage(new class Gtk::Adjustment(2, 0, 100, 1, 10, 10));
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/opts.cc ardour-2.0.3/gtk2_ardour/opts.cc
---- ardour-2.0.3.orig/gtk2_ardour/opts.cc	2007-05-10 13:30:27.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/opts.cc	2007-07-25 17:53:30.000000000 +0200
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/opts.cc ardour-2.0.4/gtk2_ardour/opts.cc
+--- ardour-2.0.4.orig/gtk2_ardour/opts.cc	2007-05-10 13:30:27.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/opts.cc	2007-08-01 00:28:33.000000000 +0200
 @@ -37,6 +37,7 @@
  char* GTK_ARDOUR::curvetest_file = 0;
  bool GTK_ARDOUR::try_hw_optimization = true;
@@ -879,9 +838,9 @@
  		default:
  			return print_help(execname);
  		}
-diff -x '*.bindings' -x ardour-2.0.3 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.3.orig/gtk2_ardour/opts.h ardour-2.0.3/gtk2_ardour/opts.h
---- ardour-2.0.3.orig/gtk2_ardour/opts.h	2007-05-10 13:30:27.000000000 +0200
-+++ ardour-2.0.3/gtk2_ardour/opts.h	2007-07-25 17:53:30.000000000 +0200
+diff -x '*.bindings' -x ardour-2.0.4 -x '*.sh' -x '*.pot' -x '*.os' -x '*.mo' -x '*~' -x '*.po' -x '*.o' -Naur ardour-2.0.4.orig/gtk2_ardour/opts.h ardour-2.0.4/gtk2_ardour/opts.h
+--- ardour-2.0.4.orig/gtk2_ardour/opts.h	2007-05-10 13:30:27.000000000 +0200
++++ ardour-2.0.4/gtk2_ardour/opts.h	2007-08-01 00:28:33.000000000 +0200
 @@ -37,6 +37,7 @@
  extern bool   try_hw_optimization;
  extern bool   use_gtk_theme;




More information about the Demudi-commits mailing list