[SCM] ardour/master: Fix build-script to properly deal with epochs in the version

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 614324c7dc738e110cfacc2af94311873bd2267b
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu Sep 10 23:14:33 2015 +0200

    Fix build-script to properly deal with epochs in the version

diff --git a/debian/patches/wscript.patch b/debian/patches/wscript.patch
index 7f94f79..43a1bfb 100644
--- a/debian/patches/wscript.patch
+++ b/debian/patches/wscript.patch
@@ -1,16 +1,17 @@
 From: Adrian Knoth <adi at drcomp.erfurt.thur.de>
+From: IOhannes m zmölnig <umlaeute at debian.org>
 Forwarded: Not-Needed
-Last-Update: 2015-04-19
+Last-Update: 2015-09-10
 Description: Always rely on the version from debian changelog
  We generate libs/ardour/revision.cc from debian/rules.
  Adapt the wscript to parse our custom format. To avoid
  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
-@@ -159,24 +159,17 @@
+ JMZ: handle epochs in versions gracefully
+--- ardour.orig/wscript
++++ ardour/wscript
+@@ -159,24 +159,19 @@
          remove_punctuation_map = dict((ord(char), None) for char in '";')
          return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map)
  
@@ -34,6 +35,8 @@ Description: Always rely on the version from debian changelog
 -    MICRO = other[1].rsplit('-',1)[0].replace('-','.')
 -else:
 -    MICRO = '0'
++## drop any epoch ('EPOCH:MAJOR.MINOR...')
++if ':' in MAJOR: MAJOR=MAJOR.split(':')[1]
 +MINOR = parts[1].split('~', 1)[0]
 +MICRO = '0'
  

-- 
ardour Debian packaging