[SCM] ardour/master: Refreshed 90_ardour-x-change.patch

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 164fe2e9278c124fc58b27359f02bead68a23275
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Oct 4 01:33:00 2011 +0200

    Refreshed 90_ardour-x-change.patch

diff --git a/debian/patches/90_ardour-x-change.patch b/debian/patches/90_ardour-x-change.patch
index cd18833..46d13ce 100644
--- a/debian/patches/90_ardour-x-change.patch
+++ b/debian/patches/90_ardour-x-change.patch
@@ -1,5 +1,7 @@
---- a/gtk2_ardour/SConscript
-+++ b/gtk2_ardour/SConscript
+Index: ardour/gtk2_ardour/SConscript
+===================================================================
+--- ardour.orig/gtk2_ardour/SConscript	2011-10-04 00:17:40.536136197 +0200
++++ ardour/gtk2_ardour/SConscript	2011-10-04 00:34:47.734256071 +0200
 @@ -178,6 +178,7 @@
  imageframe_time_axis_group.cc
  imageframe_time_axis_view.cc
@@ -8,8 +10,10 @@
  io_selector.cc
  keyboard.cc
  keyeditor.cc
---- /dev/null
-+++ b/gtk2_ardour/import_helper_aaf.cc
+Index: ardour/gtk2_ardour/import_helper_aaf.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ardour/gtk2_ardour/import_helper_aaf.cc	2011-10-04 00:34:47.734256071 +0200
 @@ -0,0 +1,1389 @@
 +/*
 +    Copyright (C) 2005 Paul Davis
@@ -1400,8 +1404,10 @@
 +/***************************************************************
 +*                                                              *
 +****************************************************************/
---- /dev/null
-+++ b/gtk2_ardour/import_helper_aaf.h
+Index: ardour/gtk2_ardour/import_helper_aaf.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ardour/gtk2_ardour/import_helper_aaf.h	2011-10-04 00:34:47.734256071 +0200
 @@ -0,0 +1,81 @@
 +/*
 +    Copyright (C) 2005 Paul Davis
@@ -1484,8 +1490,10 @@
 +}
 +
 +#endif // IMPORT_HELPER_AAF_H
---- a/gtk2_ardour/new_session_dialog.cc
-+++ b/gtk2_ardour/new_session_dialog.cc
+Index: ardour/gtk2_ardour/new_session_dialog.cc
+===================================================================
+--- ardour.orig/gtk2_ardour/new_session_dialog.cc	2011-10-04 00:17:40.608134102 +0200
++++ ardour/gtk2_ardour/new_session_dialog.cc	2011-10-04 00:34:47.738255955 +0200
 @@ -1,5 +1,5 @@
  /*
 -    Copyright (C) 2005 Paul Davis 
@@ -1759,8 +1767,10 @@
  }
  
  void
---- a/gtk2_ardour/new_session_dialog.h
-+++ b/gtk2_ardour/new_session_dialog.h
+Index: ardour/gtk2_ardour/new_session_dialog.h
+===================================================================
+--- ardour.orig/gtk2_ardour/new_session_dialog.h	2011-10-04 00:17:40.608134102 +0200
++++ ardour/gtk2_ardour/new_session_dialog.h	2011-10-04 00:38:03.312566903 +0200
 @@ -1,5 +1,5 @@
  /*
 -    Copyright (C) 2005 Paul Davis 
@@ -1824,14 +1834,16 @@
  	    }
 @@ -217,6 +217,7 @@
  	bool have_engine;
- 	Glib::ustring engine_page_session_folder;
- 	Glib::ustring engine_page_session_name;
-+    string m_filename;
+ 	std::string engine_page_session_folder;
+ 	std::string engine_page_session_name;
++	string m_filename;
  
  	sigc::connection ic_connection;
  	void engine_interface_chosen();
---- /dev/null
-+++ b/libs/ardour/ardour/ax_errors.h
+Index: ardour/libs/ardour/ardour/ax_errors.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ardour/libs/ardour/ardour/ax_errors.h	2011-10-04 00:34:47.738255955 +0200
 @@ -0,0 +1,40 @@
 +/* ax_errors.h
 +

-- 
ardour Debian packaging