← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ardour/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/90_ardour-x-change.patch

  • Committer: Package Import Robot
  • Author(s): Felipe Sateler, Jaromír Mikeš, Felipe Sateler
  • Date: 2014-05-22 14:39:25 UTC
  • mfrom: (29 sid)
  • mto: This revision was merged to the branch mainline in revision 30.
  • Revision ID: package-import@ubuntu.com-20140522143925-vwqfo9287pmkrroe
Tags: 1:2.8.16+git20131003-3
* Team upload

[ Jaromír Mikeš ]
* Add -dbg package

[ Felipe Sateler ]
* Upload to experimental

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/90_ardour-x-change.patch
1
 
--- a/gtk2_ardour/SConscript
2
 
+++ b/gtk2_ardour/SConscript
3
 
@@ -178,6 +178,7 @@
 
1
Index: ardour/gtk2_ardour/SConscript
 
2
===================================================================
 
3
--- ardour.orig/gtk2_ardour/SConscript  2013-10-01 22:33:01.132131930 +0200
 
4
+++ ardour/gtk2_ardour/SConscript       2013-10-01 22:33:01.128131930 +0200
 
5
@@ -180,6 +180,7 @@
4
6
 imageframe_time_axis_group.cc
5
7
 imageframe_time_axis_view.cc
6
8
 imageframe_view.cc
8
10
 io_selector.cc
9
11
 keyboard.cc
10
12
 keyeditor.cc
11
 
--- /dev/null
12
 
+++ b/gtk2_ardour/import_helper_aaf.cc
 
13
Index: ardour/gtk2_ardour/import_helper_aaf.cc
 
14
===================================================================
 
15
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
 
16
+++ ardour/gtk2_ardour/import_helper_aaf.cc     2013-10-01 22:33:01.128131930 +0200
13
17
@@ -0,0 +1,1389 @@
14
18
+/*
15
19
+    Copyright (C) 2005 Paul Davis
1400
1404
+/***************************************************************
1401
1405
+*                                                              *
1402
1406
+****************************************************************/
1403
 
--- /dev/null
1404
 
+++ b/gtk2_ardour/import_helper_aaf.h
 
1407
Index: ardour/gtk2_ardour/import_helper_aaf.h
 
1408
===================================================================
 
1409
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
 
1410
+++ ardour/gtk2_ardour/import_helper_aaf.h      2013-10-01 22:33:01.128131930 +0200
1405
1411
@@ -0,0 +1,81 @@
1406
1412
+/*
1407
1413
+    Copyright (C) 2005 Paul Davis
1484
1490
+}
1485
1491
+
1486
1492
+#endif // IMPORT_HELPER_AAF_H
1487
 
--- a/gtk2_ardour/new_session_dialog.cc
1488
 
+++ b/gtk2_ardour/new_session_dialog.cc
 
1493
Index: ardour/gtk2_ardour/new_session_dialog.cc
 
1494
===================================================================
 
1495
--- ardour.orig/gtk2_ardour/new_session_dialog.cc       2013-10-01 22:33:01.132131930 +0200
 
1496
+++ ardour/gtk2_ardour/new_session_dialog.cc    2013-10-01 22:33:01.128131930 +0200
1489
1497
@@ -1,5 +1,5 @@
1490
1498
 /*
1491
1499
-    Copyright (C) 2005 Paul Davis 
1759
1767
 }
1760
1768
 
1761
1769
 void
1762
 
--- a/gtk2_ardour/new_session_dialog.h
1763
 
+++ b/gtk2_ardour/new_session_dialog.h
 
1770
Index: ardour/gtk2_ardour/new_session_dialog.h
 
1771
===================================================================
 
1772
--- ardour.orig/gtk2_ardour/new_session_dialog.h        2013-10-01 22:33:01.132131930 +0200
 
1773
+++ ardour/gtk2_ardour/new_session_dialog.h     2013-10-01 22:33:01.128131930 +0200
1764
1774
@@ -1,5 +1,5 @@
1765
1775
 /*
1766
1776
-    Copyright (C) 2005 Paul Davis 
1830
1840
 
1831
1841
        sigc::connection ic_connection;
1832
1842
        void engine_interface_chosen();
1833
 
--- /dev/null
1834
 
+++ b/libs/ardour/ardour/ax_errors.h
 
1843
Index: ardour/libs/ardour/ardour/ax_errors.h
 
1844
===================================================================
 
1845
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
 
1846
+++ ardour/libs/ardour/ardour/ax_errors.h       2013-10-01 22:33:01.128131930 +0200
1835
1847
@@ -0,0 +1,40 @@
1836
1848
+/* ax_errors.h
1837
1849
+