[SCM] ardour/master: Refreshed patches
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Mon Jan 18 21:15:38 UTC 2016
The following commit has been merged in the master branch:
commit 3b33b051bfd5558f2c632138bf324a8de51934a3
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Mon Jan 18 21:20:11 2016 +0100
Refreshed patches
diff --git a/debian/patches/0010-waf.patch b/debian/patches/0010-waf.patch
index 3865bde..faf691e 100644
--- a/debian/patches/0010-waf.patch
+++ b/debian/patches/0010-waf.patch
@@ -15,7 +15,7 @@ Bug-Debian: http://bugs.debian.org/654477
Last-Update: 2015-04-19
--- /dev/null
-+++ b/waf-light
++++ ardour/waf-light
@@ -0,0 +1,163 @@
+#!/usr/bin/env python
+# encoding: ISO8859-1
@@ -181,7 +181,7 @@ Last-Update: 2015-04-19
+ Scripting.waf_entry_point(cwd, VERSION, wafdir)
+
--- /dev/null
-+++ b/waflib/ansiterm.py
++++ ardour/waflib/ansiterm.py
@@ -0,0 +1,177 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -361,7 +361,7 @@ Last-Update: 2015-04-19
+ sys.stderr=sys.stdout=AnsiTerm()
+ os.environ['TERM']='vt100'
--- /dev/null
-+++ b/waflib/Build.py
++++ ardour/waflib/Build.py
@@ -0,0 +1,731 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -1095,7 +1095,7 @@ Last-Update: 2015-04-19
+BuildContext.store=Utils.nogc(BuildContext.store)
+BuildContext.restore=Utils.nogc(BuildContext.restore)
--- /dev/null
-+++ b/waflib/ConfigSet.py
++++ ardour/waflib/ConfigSet.py
@@ -0,0 +1,151 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -1249,7 +1249,7 @@ Last-Update: 2015-04-19
+ def revert(self):
+ self.table=self.undo_stack.pop(-1)
--- /dev/null
-+++ b/waflib/Configure.py
++++ ardour/waflib/Configure.py
@@ -0,0 +1,315 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -1568,7 +1568,7 @@ Last-Update: 2015-04-19
+conf(find_perl_program)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Context.py
++++ ardour/waflib/Context.py
@@ -0,0 +1,299 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -1870,7 +1870,7 @@ Last-Update: 2015-04-19
+ Context.tools[tool]=ret
+ return ret
--- /dev/null
-+++ b/waflib/Errors.py
++++ ardour/waflib/Errors.py
@@ -0,0 +1,37 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -1910,7 +1910,7 @@ Last-Update: 2015-04-19
+class TaskNotReady(WafError):
+ pass
--- /dev/null
-+++ b/waflib/extras/autowaf.py
++++ ardour/waflib/extras/autowaf.py
@@ -0,0 +1,490 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -2404,7 +2404,7 @@ Last-Update: 2015-04-19
+before('apply_link')(version_lib)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/extras/doxygen.py
++++ ardour/waflib/extras/doxygen.py
@@ -0,0 +1,117 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -2525,14 +2525,14 @@ Last-Update: 2015-04-19
+feature('doxygen')(process_doxy)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/extras/__init__.py
++++ ardour/waflib/extras/__init__.py
@@ -0,0 +1,4 @@
+#! /usr/bin/env python
+# encoding: utf-8
+# WARNING! Do not edit! http://waf.googlecode.com/git/docs/wafbook/single.html#_obtaining_the_waf_file
+
--- /dev/null
-+++ b/waflib/extras/misc.py
++++ ardour/waflib/extras/misc.py
@@ -0,0 +1,288 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -2824,7 +2824,7 @@ Last-Update: 2015-04-19
+after_method('init_cmd_output')(apply_cmd_output)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/fixpy2.py
++++ ardour/waflib/fixpy2.py
@@ -0,0 +1,50 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -2878,14 +2878,14 @@ Last-Update: 2015-04-19
+subst('Runner.py')(r4)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/__init__.py
++++ ardour/waflib/__init__.py
@@ -0,0 +1,4 @@
+#! /usr/bin/env python
+# encoding: utf-8
+# WARNING! Do not edit! http://waf.googlecode.com/git/docs/wafbook/single.html#_obtaining_the_waf_file
+
--- /dev/null
-+++ b/waflib/Logs.py
++++ ardour/waflib/Logs.py
@@ -0,0 +1,149 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -3037,7 +3037,7 @@ Last-Update: 2015-04-19
+def pprint(col,str,label='',sep='\n'):
+ sys.stderr.write("%s%s%s %s%s"%(colors(col),str,colors.NORMAL,label,sep))
--- /dev/null
-+++ b/waflib/Node.py
++++ ardour/waflib/Node.py
@@ -0,0 +1,506 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -3546,7 +3546,7 @@ Last-Update: 2015-04-19
+class Nod3(Node):
+ pass
--- /dev/null
-+++ b/waflib/Options.py
++++ ardour/waflib/Options.py
@@ -0,0 +1,134 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -3683,7 +3683,7 @@ Last-Update: 2015-04-19
+ super(OptionsContext,self).execute()
+ self.parse_args()
--- /dev/null
-+++ b/waflib/Runner.py
++++ ardour/waflib/Runner.py
@@ -0,0 +1,197 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -3883,7 +3883,7 @@ Last-Update: 2015-04-19
+ assert(self.count==0 or self.stop)
+ self.free_task_pool()
--- /dev/null
-+++ b/waflib/Scripting.py
++++ ardour/waflib/Scripting.py
@@ -0,0 +1,367 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -4253,7 +4253,7 @@ Last-Update: 2015-04-19
+ return execute
+Build.BuildContext.execute=autoconfigure(Build.BuildContext.execute)
--- /dev/null
-+++ b/waflib/TaskGen.py
++++ ardour/waflib/TaskGen.py
@@ -0,0 +1,353 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -4610,7 +4610,7 @@ Last-Update: 2015-04-19
+before_method('process_source','process_rule')(process_subst)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Task.py
++++ ardour/waflib/Task.py
@@ -0,0 +1,672 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -5285,7 +5285,7 @@ Last-Update: 2015-04-19
+ cls.runnable_status=runnable_status
+ return cls
--- /dev/null
-+++ b/waflib/Tools/ar.py
++++ ardour/waflib/Tools/ar.py
@@ -0,0 +1,12 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -5301,7 +5301,7 @@ Last-Update: 2015-04-19
+conf(find_ar)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/asm.py
++++ ardour/waflib/Tools/asm.py
@@ -0,0 +1,25 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -5330,7 +5330,7 @@ Last-Update: 2015-04-19
+extension('.s','.S','.asm','.ASM','.spp','.SPP')(asm_hook)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/bison.py
++++ ardour/waflib/Tools/bison.py
@@ -0,0 +1,29 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -5363,7 +5363,7 @@ Last-Update: 2015-04-19
+extension('.y','.yc','.yy')(big_bison)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/c_aliases.py
++++ ardour/waflib/Tools/c_aliases.py
@@ -0,0 +1,56 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -5423,7 +5423,7 @@ Last-Update: 2015-04-19
+conf(objects)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/c_config.py
++++ ardour/waflib/Tools/c_config.py
@@ -0,0 +1,713 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -6140,7 +6140,7 @@ Last-Update: 2015-04-19
+conf(multicheck)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/ccroot.py
++++ ardour/waflib/Tools/ccroot.py
@@ -0,0 +1,375 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -6519,7 +6519,7 @@ Last-Update: 2015-04-19
+extension('.o','.obj')(add_those_o_files)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/compiler_c.py
++++ ardour/waflib/Tools/compiler_c.py
@@ -0,0 +1,39 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -6561,7 +6561,7 @@ Last-Update: 2015-04-19
+ for x in test_for_compiler.split():
+ opt.load('%s'%x)
--- /dev/null
-+++ b/waflib/Tools/compiler_cxx.py
++++ ardour/waflib/Tools/compiler_cxx.py
@@ -0,0 +1,39 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -6603,7 +6603,7 @@ Last-Update: 2015-04-19
+ for x in test_for_compiler.split():
+ opt.load('%s'%x)
--- /dev/null
-+++ b/waflib/Tools/compiler_d.py
++++ ardour/waflib/Tools/compiler_d.py
@@ -0,0 +1,30 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -6636,7 +6636,7 @@ Last-Update: 2015-04-19
+ for d_compiler in['gdc','dmd']:
+ opt.load('%s'%d_compiler)
--- /dev/null
-+++ b/waflib/Tools/compiler_fc.py
++++ ardour/waflib/Tools/compiler_fc.py
@@ -0,0 +1,43 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -6682,7 +6682,7 @@ Last-Update: 2015-04-19
+ for compiler in test_for_compiler.split():
+ opt.load('%s'%compiler)
--- /dev/null
-+++ b/waflib/Tools/c_osx.py
++++ ardour/waflib/Tools/c_osx.py
@@ -0,0 +1,121 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -6807,7 +6807,7 @@ Last-Update: 2015-04-19
+before_method('apply_link','propagate_uselib_vars')(apply_bundle)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/c_preproc.py
++++ ardour/waflib/Tools/c_preproc.py
@@ -0,0 +1,606 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -7417,7 +7417,7 @@ Last-Update: 2015-04-19
+Utils.run_once(define_name)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/c.py
++++ ardour/waflib/Tools/c.py
@@ -0,0 +1,27 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -7448,7 +7448,7 @@ Last-Update: 2015-04-19
+TaskGen.extension('.c')(c_hook)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/cs.py
++++ ardour/waflib/Tools/cs.py
@@ -0,0 +1,98 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -7550,7 +7550,7 @@ Last-Update: 2015-04-19
+conf(read_csshlib)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/c_tests.py
++++ ardour/waflib/Tools/c_tests.py
@@ -0,0 +1,146 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -7700,7 +7700,7 @@ Last-Update: 2015-04-19
+conf(check_endianness)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/cxx.py
++++ ardour/waflib/Tools/cxx.py
@@ -0,0 +1,27 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -7730,7 +7730,7 @@ Last-Update: 2015-04-19
+class cxxstlib(stlink_task):
+ pass
--- /dev/null
-+++ b/waflib/Tools/dbus.py
++++ ardour/waflib/Tools/dbus.py
@@ -0,0 +1,30 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -7764,7 +7764,7 @@ Last-Update: 2015-04-19
+before_method('apply_core')(process_dbus)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/d_config.py
++++ ardour/waflib/Tools/d_config.py
@@ -0,0 +1,47 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -7815,7 +7815,7 @@ Last-Update: 2015-04-19
+conf(check_dlibrary)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/dmd.py
++++ ardour/waflib/Tools/dmd.py
@@ -0,0 +1,47 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -7866,7 +7866,7 @@ Last-Update: 2015-04-19
+conf(common_flags_dmd)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/d.py
++++ ardour/waflib/Tools/d.py
@@ -0,0 +1,56 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -7926,7 +7926,7 @@ Last-Update: 2015-04-19
+feature('d')(process_header)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/d_scan.py
++++ ardour/waflib/Tools/d_scan.py
@@ -0,0 +1,133 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -8062,7 +8062,7 @@ Last-Update: 2015-04-19
+ Logs.debug('deps: deps for %s: %r; unresolved %r'%(str(node),nodes,names))
+ return(nodes,names)
--- /dev/null
-+++ b/waflib/Tools/errcheck.py
++++ ardour/waflib/Tools/errcheck.py
@@ -0,0 +1,161 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -8226,7 +8226,7 @@ Last-Update: 2015-04-19
+def configure(conf):
+ pass
--- /dev/null
-+++ b/waflib/Tools/fc_config.py
++++ ardour/waflib/Tools/fc_config.py
@@ -0,0 +1,283 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -8513,7 +8513,7 @@ Last-Update: 2015-04-19
+conf(detect_openmp)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/fc.py
++++ ardour/waflib/Tools/fc.py
@@ -0,0 +1,123 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -8640,7 +8640,7 @@ Last-Update: 2015-04-19
+conf(modfile)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/fc_scan.py
++++ ardour/waflib/Tools/fc_scan.py
@@ -0,0 +1,68 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -8711,7 +8711,7 @@ Last-Update: 2015-04-19
+ if not filename in self.names:
+ self.names.append(filename)
--- /dev/null
-+++ b/waflib/Tools/flex.py
++++ ardour/waflib/Tools/flex.py
@@ -0,0 +1,27 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -8741,7 +8741,7 @@ Last-Update: 2015-04-19
+ conf.find_program('flex',var='FLEX')
+ conf.env.FLEXFLAGS=['-t']
--- /dev/null
-+++ b/waflib/Tools/g95.py
++++ ardour/waflib/Tools/g95.py
@@ -0,0 +1,55 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -8800,7 +8800,7 @@ Last-Update: 2015-04-19
+conf(get_g95_version)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/gas.py
++++ ardour/waflib/Tools/gas.py
@@ -0,0 +1,11 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -8814,7 +8814,7 @@ Last-Update: 2015-04-19
+ conf.env.ASLNK_TGT_F=['-o']
+ conf.find_ar()
--- /dev/null
-+++ b/waflib/Tools/gcc.py
++++ ardour/waflib/Tools/gcc.py
@@ -0,0 +1,98 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -8916,7 +8916,7 @@ Last-Update: 2015-04-19
+conf(gcc_modifier_platform)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/gdc.py
++++ ardour/waflib/Tools/gdc.py
@@ -0,0 +1,34 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -8954,7 +8954,7 @@ Last-Update: 2015-04-19
+conf(common_flags_gdc)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/gfortran.py
++++ ardour/waflib/Tools/gfortran.py
@@ -0,0 +1,69 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -9027,7 +9027,7 @@ Last-Update: 2015-04-19
+conf(get_gfortran_version)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/glib2.py
++++ ardour/waflib/Tools/glib2.py
@@ -0,0 +1,174 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -9205,7 +9205,7 @@ Last-Update: 2015-04-19
+feature('glib2')(process_settings)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/gnu_dirs.py
++++ ardour/waflib/Tools/gnu_dirs.py
@@ -0,0 +1,65 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -9273,7 +9273,7 @@ Last-Update: 2015-04-19
+ str_help='%s [Default: %s]'%(help,str_default)
+ dirs_options.add_option(option_name,help=str_help,default='',dest=name.upper())
--- /dev/null
-+++ b/waflib/Tools/gxx.py
++++ ardour/waflib/Tools/gxx.py
@@ -0,0 +1,98 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -9375,7 +9375,7 @@ Last-Update: 2015-04-19
+conf(gxx_modifier_platform)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/icc.py
++++ ardour/waflib/Tools/icc.py
@@ -0,0 +1,31 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -9410,7 +9410,7 @@ Last-Update: 2015-04-19
+conf(find_icc)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/icpc.py
++++ ardour/waflib/Tools/icpc.py
@@ -0,0 +1,30 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -9444,7 +9444,7 @@ Last-Update: 2015-04-19
+conf(find_icpc)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/ifort.py
++++ ardour/waflib/Tools/ifort.py
@@ -0,0 +1,49 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -9497,14 +9497,14 @@ Last-Update: 2015-04-19
+conf(get_ifort_version)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/__init__.py
++++ ardour/waflib/Tools/__init__.py
@@ -0,0 +1,4 @@
+#! /usr/bin/env python
+# encoding: utf-8
+# WARNING! Do not edit! http://waf.googlecode.com/git/docs/wafbook/single.html#_obtaining_the_waf_file
+
--- /dev/null
-+++ b/waflib/Tools/intltool.py
++++ ardour/waflib/Tools/intltool.py
@@ -0,0 +1,78 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -9586,7 +9586,7 @@ Last-Update: 2015-04-19
+feature('intltool_po')(apply_intltool_po)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/irixcc.py
++++ ardour/waflib/Tools/irixcc.py
@@ -0,0 +1,49 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -9639,7 +9639,7 @@ Last-Update: 2015-04-19
+conf(irixcc_common_flags)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/javaw.py
++++ ardour/waflib/Tools/javaw.py
@@ -0,0 +1,275 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -9918,7 +9918,7 @@ Last-Update: 2015-04-19
+conf(check_jni_headers)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/kde4.py
++++ ardour/waflib/Tools/kde4.py
@@ -0,0 +1,49 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -9971,7 +9971,7 @@ Last-Update: 2015-04-19
+feature('msgfmt')(apply_msgfmt)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/lua.py
++++ ardour/waflib/Tools/lua.py
@@ -0,0 +1,19 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -9994,7 +9994,7 @@ Last-Update: 2015-04-19
+extension('.lua')(add_lua)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/msvc.py
++++ ardour/waflib/Tools/msvc.py
@@ -0,0 +1,654 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -10652,7 +10652,7 @@ Last-Update: 2015-04-19
+after_method('apply_link')(apply_manifest)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/nasm.py
++++ ardour/waflib/Tools/nasm.py
@@ -0,0 +1,14 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -10670,7 +10670,7 @@ Last-Update: 2015-04-19
+feature('asm')(apply_nasm_vars)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/perl.py
++++ ardour/waflib/Tools/perl.py
@@ -0,0 +1,81 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -10755,7 +10755,7 @@ Last-Update: 2015-04-19
+conf(check_perl_ext_devel)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/python.py
++++ ardour/waflib/Tools/python.py
@@ -0,0 +1,336 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -11095,7 +11095,7 @@ Last-Update: 2015-04-19
+conf(check_python_module)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/qt4.py
++++ ardour/waflib/Tools/qt4.py
@@ -0,0 +1,434 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -11533,7 +11533,7 @@ Last-Update: 2015-04-19
+conf(set_qt4_libs_to_check)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/ruby.py
++++ ardour/waflib/Tools/ruby.py
@@ -0,0 +1,104 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -11641,7 +11641,7 @@ Last-Update: 2015-04-19
+extension('.rb')(process)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/suncc.py
++++ ardour/waflib/Tools/suncc.py
@@ -0,0 +1,54 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -11699,7 +11699,7 @@ Last-Update: 2015-04-19
+conf(scc_common_flags)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/suncxx.py
++++ ardour/waflib/Tools/suncxx.py
@@ -0,0 +1,55 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -11758,7 +11758,7 @@ Last-Update: 2015-04-19
+conf(sxx_common_flags)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/tex.py
++++ ardour/waflib/Tools/tex.py
@@ -0,0 +1,242 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -12004,7 +12004,7 @@ Last-Update: 2015-04-19
+before_method('process_source')(apply_tex)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/vala.py
++++ ardour/waflib/Tools/vala.py
@@ -0,0 +1,216 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -12224,7 +12224,7 @@ Last-Update: 2015-04-19
+conf(check_vala_deps)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/waf_unit_test.py
++++ ardour/waflib/Tools/waf_unit_test.py
@@ -0,0 +1,79 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -12307,7 +12307,7 @@ Last-Update: 2015-04-19
+after_method('apply_link')(make_test)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/winres.py
++++ ardour/waflib/Tools/winres.py
@@ -0,0 +1,34 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -12345,7 +12345,7 @@ Last-Update: 2015-04-19
+extension('.rc')(rc_file)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/xlc.py
++++ ardour/waflib/Tools/xlc.py
@@ -0,0 +1,46 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -12395,7 +12395,7 @@ Last-Update: 2015-04-19
+conf(xlc_common_flags)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Tools/xlcxx.py
++++ ardour/waflib/Tools/xlcxx.py
@@ -0,0 +1,46 @@
+#! /usr/bin/env python
+# encoding: utf-8
@@ -12445,7 +12445,7 @@ Last-Update: 2015-04-19
+conf(xlcxx_common_flags)
\ No newline at end of file
--- /dev/null
-+++ b/waflib/Utils.py
++++ ardour/waflib/Utils.py
@@ -0,0 +1,336 @@
+#! /usr/bin/env python
+# encoding: utf-8
diff --git a/debian/patches/0030-wscript.patch b/debian/patches/0030-wscript.patch
index 43a1bfb..691a825 100644
--- a/debian/patches/0030-wscript.patch
+++ b/debian/patches/0030-wscript.patch
@@ -11,7 +11,7 @@ Description: Always rely on the version from debian changelog
JMZ: handle epochs in versions gracefully
--- ardour.orig/wscript
+++ ardour/wscript
-@@ -159,24 +159,19 @@
+@@ -161,24 +161,19 @@
remove_punctuation_map = dict((ord(char), None) for char in '";')
return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map)
diff --git a/debian/patches/0050-log-stdout.patch b/debian/patches/0050-log-stdout.patch
index cd47a57..94a35c1 100644
--- a/debian/patches/0050-log-stdout.patch
+++ b/debian/patches/0050-log-stdout.patch
@@ -7,7 +7,7 @@ Author: Felipe Sateler <fsateler at debian.org>
Forwarded: no
--- ardour.orig/wscript
+++ ardour/wscript
-@@ -1140,6 +1140,15 @@
+@@ -1198,6 +1198,15 @@
def build(bld):
create_stored_revision()
diff --git a/debian/patches/0100-fix-typos.patch b/debian/patches/0100-fix-typos.patch
index 370c97b..a67f247 100644
--- a/debian/patches/0100-fix-typos.patch
+++ b/debian/patches/0100-fix-typos.patch
@@ -7,7 +7,7 @@ Last-Update: 2016-01-15
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- ardour.orig/gtk2_ardour/editor_drag.cc
+++ ardour/gtk2_ardour/editor_drag.cc
-@@ -4038,9 +4038,9 @@
+@@ -4126,9 +4126,9 @@
}
void
@@ -19,7 +19,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return;
}
-@@ -4279,9 +4279,9 @@
+@@ -4382,9 +4382,9 @@
}
void
@@ -31,7 +31,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 ();
-@@ -5245,9 +5245,9 @@
+@@ -5357,9 +5357,9 @@
}
void
@@ -45,7 +45,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
}
--- ardour.orig/gtk2_ardour/editor_ops.cc
+++ ardour/gtk2_ardour/editor_ops.cc
-@@ -4570,7 +4570,7 @@
+@@ -4512,7 +4512,7 @@
list<boost::shared_ptr<Playlist> > foo;
@@ -56,7 +56,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if ((*i).pl) {
--- ardour.orig/gtk2_ardour/midi_region_view.cc
+++ ardour/gtk2_ardour/midi_region_view.cc
-@@ -539,7 +539,7 @@
+@@ -535,7 +535,7 @@
switch (editor.current_mouse_mode()) {
case MouseRange:
@@ -82,7 +82,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
}
--- ardour.orig/libs/ardour/playlist.cc
+++ ardour/libs/ardour/playlist.cc
-@@ -3110,7 +3110,7 @@
+@@ -3142,7 +3142,7 @@
}
/* check to see how the original region (in the
@@ -102,17 +102,6 @@ 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
---- ardour.orig/libs/ardour/po/de.po
-+++ ardour/libs/ardour/po/de.po
-@@ -658,7 +658,7 @@
- msgstr "Editor: kann \"%1\" als Export-Datei für CD-Marker nicht öffnen"
-
- #: export_handler.cc:508 export_handler.cc:511
--msgid "an error occured while writing a TOC/CUE file: %1"
-+msgid "an error occurred while writing a TOC/CUE file: %1"
- msgstr "beim Schreiben einer TOC/CUE Datei trat ein Fehler auf:%1"
-
- #: export_handler.cc:801 export_handler.cc:859
--- ardour.orig/libs/ardour/po/el.po
+++ ardour/libs/ardour/po/el.po
@@ -581,7 +581,7 @@
@@ -190,17 +179,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
msgstr ""
#: export_handler.cc:744 export_handler.cc:802
---- ardour.orig/libs/ardour/po/ru.po
-+++ ardour/libs/ardour/po/ru.po
-@@ -625,7 +625,7 @@
- "Редактор: не удалось открыть \"%1\", как файл экспорта для CD-маркера файла"
-
- #: export_handler.cc:492 export_handler.cc:495
--msgid "an error occured while writing a TOC/CUE file: %1"
-+msgid "an error occurred while writing a TOC/CUE file: %1"
- msgstr "Произошла ошибка при записи TOC/CUE файла: %1"
-
- #: export_handler.cc:744 export_handler.cc:802
--- ardour.orig/libs/ardour/po/sv.po
+++ ardour/libs/ardour/po/sv.po
@@ -564,7 +564,7 @@
@@ -212,17 +190,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
msgstr ""
#: export_handler.cc:744 export_handler.cc:802
---- ardour.orig/libs/ardour/po/zh.po
-+++ ardour/libs/ardour/po/zh.po
-@@ -569,7 +569,7 @@
- msgstr ""
-
- #: export_handler.cc:492 export_handler.cc:495
--msgid "an error occured while writing a TOC/CUE file: %1"
-+msgid "an error occurred while writing a TOC/CUE file: %1"
- msgstr ""
-
- #: export_handler.cc:744 export_handler.cc:802
--- ardour.orig/libs/audiographer/src/general/sr_converter.cc
+++ ardour/libs/audiographer/src/general/sr_converter.cc
@@ -87,7 +87,7 @@
@@ -245,7 +212,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- ardour.orig/libs/canvas/canvas.cc
+++ ardour/libs/canvas/canvas.cc
-@@ -1152,7 +1152,7 @@
+@@ -1161,7 +1161,7 @@
bool
GtkCanvas::really_start_tooltip_timeout ()
{
@@ -315,3 +282,36 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
}
}
+--- ardour.orig/libs/appleutility/CoreAudio/PublicUtility/CAAtomic.h
++++ ardour/libs/appleutility/CoreAudio/PublicUtility/CAAtomic.h
+@@ -80,7 +80,7 @@
+ #if TARGET_OS_WIN32
+ long lRetVal = InterlockedExchangeAdd((volatile long*)theValue, theAmt);
+ // InterlockedExchangeAdd returns the original value which differs from OSX version.
+- // At this point the addition would have occured and hence returning the new value
++ // At this point the addition would have occurred and hence returning the new value
+ // to keep it sync with OSX.
+ return lRetVal + theAmt;
+ #else
+--- ardour.orig/libs/ardour/po/de.po
++++ ardour/libs/ardour/po/de.po
+@@ -790,7 +790,7 @@
+ "Adresse oder Passwort falsch?"
+
+ #: export_handler.cc:503 export_handler.cc:506
+-msgid "an error occured while writing a TOC/CUE file: %1"
++msgid "an error occurred while writing a TOC/CUE file: %1"
+ msgstr "beim Schreiben einer TOC/CUE Datei trat ein Fehler auf:%1"
+
+ #: export_handler.cc:796 export_handler.cc:854
+--- ardour.orig/libs/ardour/po/ru.po
++++ ardour/libs/ardour/po/ru.po
+@@ -792,7 +792,7 @@
+ "пароль неверны.\n"
+
+ #: export_handler.cc:503 export_handler.cc:506
+-msgid "an error occured while writing a TOC/CUE file: %1"
++msgid "an error occurred while writing a TOC/CUE file: %1"
+ msgstr "Произошла ошибка при записи TOC/CUE файла: %1"
+
+ #: export_handler.cc:796 export_handler.cc:854
--
ardour Debian packaging
More information about the pkg-multimedia-commits
mailing list