[SCM] ardour3/master: Refresh waf.patch

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Thu Nov 7 13:38:12 UTC 2013


The following commit has been merged in the master branch:
commit 79d6c5e27927a219a5fd11aa5bbc7c69f15421b8
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Wed Nov 6 14:32:17 2013 +0100

    Refresh waf.patch
    
    Upstream has updated autowaf.py in its waf binary, so we need to refresh
    the patch.

diff --git a/debian/patches/waf.patch b/debian/patches/waf.patch
index 4297359..724c4b3 100644
--- a/debian/patches/waf.patch
+++ b/debian/patches/waf.patch
@@ -12,7 +12,7 @@ Description: Reapply waflib as unpacked source, and add waf-light
     ln -s waf-light waf && chmod +x waf-light
 Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
 Bug-Debian: http://bugs.debian.org/654477
-Last-Update: 2012-12-21
+Last-Update: 2013-11-06
 
 --- /dev/null
 +++ b/waf-light
@@ -2288,10 +2288,10 @@ Last-Update: 2012-12-21
 +		sys.exit(-1)
 +	text="#ifndef __"+domain+"_version_h__\n"
 +	text+="#define __"+domain+"_version_h__\n"
-+	text+="extern const char* "+domain+"_revision;\n"
-+	text+="extern int "+domain+"_major_version;\n"
-+	text+="extern int "+domain+"_minor_version;\n"
-+	text+="extern int "+domain+"_micro_version;\n"
++	text+=" extern const char* "+domain+"_revision;\n"
++	text+=" extern int "+domain+"_major_version;\n"
++	text+=" extern int "+domain+"_minor_version;\n"
++	text+=" extern int "+domain+"_micro_version;\n"
 +	text+="#endif /* __"+domain+"_version_h__ */\n"
 +	try:
 +		o=open(header_path,'w')
@@ -2316,7 +2316,7 @@ Last-Update: 2012-12-21
 +	pot_file='%s.pot'%name
 +	po_files=glob.glob('po/*.po')
 +	for po_file in po_files:
-+		cmd=['msgmerge','--update',po_file,pot_file]
++		cmd=['msgmerge','--update','--no-fuzzy-matching',po_file,pot_file]
 +		Logs.info('Updating '+po_file)
 +		subprocess.call(cmd)
 +	os.chdir(pwd)

-- 
ardour3 packaging



More information about the pkg-multimedia-commits mailing list