[SCM] ardour3/master: Patch to gracefully handle epochs in Debian-version

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 86924d042915405423c07b4b6027980bb20ce12b
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Fri Sep 11 14:51:48 2015 +0200

    Patch to gracefully handle epochs in Debian-version

diff --git a/debian/patches/wscript.patch b/debian/patches/wscript.patch
index c3e0eab..73a2aa9 100644
--- a/debian/patches/wscript.patch
+++ b/debian/patches/wscript.patch
@@ -7,9 +7,11 @@ Description: Always rely on the version from debian changelog
  confusion with any existing .git directory on a packager's
  machine, disable the git version check and pretend it's a
  tarball.
-
---- a/wscript
-+++ b/wscript
+From: IOhannes m zmölnig <umlaeute at debian.org>
+Last-Update: 2015-09-11
+Description: Strip epoch from version
+--- ardour3.orig/wscript
++++ ardour3/wscript
 @@ -22,10 +22,7 @@
          remove_punctuation_map = dict((ord(char), None) for char in '";')
          return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map)
@@ -22,15 +24,17 @@ Description: Always rely on the version from debian changelog
  
  #
  # rev is now of the form MAJOR.MINOR-rev-commit
-@@ -33,9 +30,8 @@
+@@ -33,9 +30,10 @@
  
  parts = rev.split ('.')
  MAJOR = parts[0]
 -other = parts[1].split ('-')
 -MINOR = other[0]
 -MICRO = other[1]
++if ':' in MAJOR: MAJOR=MAJOR.split(':')[1]
 +MINOR = parts[1]
 +MICRO = parts[2]
++
  
  V = MAJOR + '.' + MINOR + '.' + MICRO
  #

-- 
ardour3 packaging