From d711e04227b7a9c5d9ef486512bfa45d68778925 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 1 Nov 2014 00:19:22 +0000
Subject: Fix merging of version histories in specification documentation.

---
 lv2/lv2plug.in/ns/meta/meta.ttl | 2 ++
 lv2specgen/lv2specgen.py        | 5 +++--
 wscript                         | 3 +--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lv2/lv2plug.in/ns/meta/meta.ttl b/lv2/lv2plug.in/ns/meta/meta.ttl
index e79f23d..a192412 100644
--- a/lv2/lv2plug.in/ns/meta/meta.ttl
+++ b/lv2/lv2plug.in/ns/meta/meta.ttl
@@ -54,6 +54,8 @@ THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH R
 		dcs:changeset [
 			dcs:item [
 				rdfs:label "eg-sampler: Support patch:Get, and request initial state from UI."
+			] , [
+				rdfs:label "Fix merging of version histories in specification documentation."
 			]
 		]
 	] , [
diff --git a/lv2specgen/lv2specgen.py b/lv2specgen/lv2specgen.py
index f62de8d..b356bd7 100755
--- a/lv2specgen/lv2specgen.py
+++ b/lv2specgen/lv2specgen.py
@@ -937,7 +937,7 @@ def releaseChangeset(m, release, prefix=''):
     return entry
 
 
-def specHistoryEntries(m, subject, entries={}):
+def specHistoryEntries(m, subject, entries):
     for r in findStatements(m, subject, doap.release, None):
         release = getObject(r)
         revNode = findOne(m, release, doap.revision, None)
@@ -981,7 +981,7 @@ def specHistoryMarkup(entries):
 
 
 def specHistory(m, subject):
-    return specHistoryMarkup(specHistoryEntries(m, subject))
+    return specHistoryMarkup(specHistoryEntries(m, subject, {}))
 
 
 def specVersion(m, subject):
@@ -1099,6 +1099,7 @@ def specgen(specloc, indir, style_uri, docdir, tags, opts, instances=False):
     template = None
     f = open(temploc, "r")
     template = f.read()
+    f.close()
 
     # Load code documentation link map from tags file
     linkmap = load_tags(tags, docdir)
diff --git a/wscript b/wscript
index 343b488..b56f9ff 100644
--- a/wscript
+++ b/wscript
@@ -270,7 +270,7 @@ def build_index(task):
             print('warning: %s has no file release\n' % proj)
 
     # Get history for this LV2 release
-    entries = lv2specgen.specHistoryEntries(model, proj)
+    entries = lv2specgen.specHistoryEntries(model, proj, {})
 
     # Add entries for every spec that has the same distribution
     ctx     = task.generator.bld
@@ -288,7 +288,6 @@ def build_index(task):
     # Generate history for all post-unification LV2 distributions
     history = lv2specgen.specHistoryMarkup(entries)
 
-    global index_lines
     rows = []
     for f in task.inputs:
         if not f.abspath().endswith('index.html.in'):
-- 
cgit v1.2.1