From e12216c644973f022b959ea003a9520ad91cca4d Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 15 Nov 2014 12:53:30 +0100
Subject: [PATCH] patchutils.py: Fix a bug in parsing version numbers, make
 parser less strict in some cases.

---
 debian/tools/patchutils.py |  8 ++++----
 patches/Makefile           | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/tools/patchutils.py b/debian/tools/patchutils.py
index 11bde27c..d817ad6d 100644
--- a/debian/tools/patchutils.py
+++ b/debian/tools/patchutils.py
@@ -298,16 +298,16 @@ def read_patch(filename):
     def _parse_subject(subject):
         subject = subject.strip()
         if subject.endswith("."): subject = subject[:-1]
-        r = re.match("\\[PATCH([^]]*)\\](.*)", subject, re.IGNORECASE)
+        r = re.match("^\\[PATCH([^]]*)\\](.*)$", subject, re.IGNORECASE)
         if r is not None:
             subject = r.group(2).strip()
             r = re.search("v([0-9]+)", r.group(1), re.IGNORECASE)
             if r is not None: return subject, int(r.group(1))
-        r = re.match("(.*)\\((v|try|rev|take) *([0-9]+)\\)", subject, re.IGNORECASE)
+        r = re.match("^(.*)\\((v|try|rev|take) *([0-9]+)\\)$", subject, re.IGNORECASE)
         if r is not None: return r.group(1).strip(), int(r.group(3))
-        r = re.match("(.*)[.,] *(v|try|rev|take) *([0-9]+)", subject, re.IGNORECASE)
+        r = re.match("^(.*)[., ] *(v|try|rev|take) *([0-9]+)$", subject, re.IGNORECASE)
         if r is not None: return r.group(1).strip(), int(r.group(3))
-        r = re.match("([^:]+) v([0-9])+: (.*)", subject, re.IGNORECASE)
+        r = re.match("^([^:]+) v([0-9]+): (.*)$", subject, re.IGNORECASE)
         if r is not None: return "%s: %s" % (r.group(1), r.group(3)), int(r.group(2))
         return subject, 1
 
diff --git a/patches/Makefile b/patches/Makefile
index 6ff16d84..5a887678 100644
--- a/patches/Makefile
+++ b/patches/Makefile
@@ -1738,21 +1738,21 @@ winepulse-PulseAudio_Support.ok:
 		echo '+    { "Maarten Lankhorst", "winepulse: Add audiostreamvolume.", 1 },'; \
 		echo '+    { "Maarten Lankhorst", "winepulse: Add session support.", 1 },'; \
 		echo '+    { "Maarten Lankhorst", "fix fdels trailing whitespaces.", 1 },'; \
-		echo '+    { "Maarten Lankhorst", "winepulse v12.", 1 },'; \
-		echo '+    { "Maarten Lankhorst", "winepulse: Add support for missing formats, and silence an error for missing format tags.", 5 },'; \
-		echo '+    { "Maarten Lankhorst", "winepulse: Add official warning wine doesn'\''t want to support winepulse.", 6 },'; \
-		echo '+    { "Maarten Lankhorst", "winepulse: Fix winmm tests.", 7 },'; \
-		echo '+    { "Maarten Lankhorst", "winepulse: Latency and compilation improvements.", 8 },'; \
-		echo '+    { "Juergen Tretthahn", "winepulse: API Compatibility with 1.5.2 onward.", 2 },'; \
+		echo '+    { "Maarten Lankhorst", "winepulse.", 12 },'; \
+		echo '+    { "Maarten Lankhorst", "winepulse: Add support for missing formats, and silence an error for missing format tags.", 15 },'; \
+		echo '+    { "Maarten Lankhorst", "winepulse: Add official warning wine doesn'\''t want to support winepulse.", 16 },'; \
+		echo '+    { "Maarten Lankhorst", "winepulse: Fix winmm tests.", 17 },'; \
+		echo '+    { "Maarten Lankhorst", "winepulse: Latency and compilation improvements.", 18 },'; \
+		echo '+    { "Juergen Tretthahn", "winepulse: API Compatibility with 1.5.2 onward,.", 2 },'; \
 		echo '+    { "Maarten Lankhorst", "winepulse: Fix low latency support.", 1 },'; \
 		echo '+    { "Maarten Lankhorst", "winepulse: drop realtime priority before thread destruction.", 1 },'; \
 		echo '+    { "Maarten Lankhorst", "winepulse: remove bogus SetEvent from pulse_started_callback.", 1 },'; \
 		echo '+    { "Maarten Lankhorst", "winepulse: disable the setevent part of the latency hack.", 1 },'; \
-		echo '+    { "Maarten Lankhorst", "winepulse: fix the checks in IsFormatSupported.", 0 },'; \
+		echo '+    { "Maarten Lankhorst", "winepulse: fix the checks in IsFormatSupported.", 20 },'; \
 		echo '+    { "Maarten Lankhorst", "winepulse: fixup IsFormatSupported calls.", 1 },'; \
-		echo '+    { "Maarten Lankhorst", "winepulse: return early if padding didn'\''t update.", 1 },'; \
+		echo '+    { "Maarten Lankhorst", "winepulse: return early if padding didn'\''t update.", 21 },'; \
 		echo '+    { "Maarten Lankhorst", "winepulse: fix unneeded free in write.", 1 },'; \
-		echo '+    { "Maarten Lankhorst", "winepulse: fixup a invalid free in mmdevapi.", 3 },'; \
+		echo '+    { "Maarten Lankhorst", "winepulse: fixup a invalid free in mmdevapi.", 23 },'; \
 		echo '+    { "Maarten Lankhorst", "winepulse: use a pi-mutex for serialization.", 1 },'; \
 		echo '+    { "Maarten Lankhorst", "winepulse: add support for IMarshal.", 1 },'; \
 		echo '+    { "Mark Harmstone", "winepulse: handle stream create failing correctly.", 1 },'; \