[SCM] zynjacku/master: Drop 1005-xref_fix.patch, needs more work upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5c337e87dd3852e80070387053bb8e33c4409ecb
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jun 23 13:57:50 2011 +0200

    Drop 1005-xref_fix.patch, needs more work upstream.

diff --git a/debian/patches/1005-xref_fix.patch b/debian/patches/1005-xref_fix.patch
deleted file mode 100644
index 7da8505..0000000
--- a/debian/patches/1005-xref_fix.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: http://sf.net/projects/naspro/files/naspro/0.2.91/zynjacku-6-xref-fix.patch
-Description: Try to fix cross-referencing among bundles w.r.t. dynamic
- manifests in zynjacku
-Forwarded: yes, by Stefano D'Angelo <zanga.mail at gmail.com>
----
- zynworld/lv2.py |   41 ++++++++++++++++++-----------------------
- 1 file changed, 18 insertions(+), 23 deletions(-)
-
---- zynjacku.orig/zynworld/lv2.py
-+++ zynjacku/zynworld/lv2.py
-@@ -475,29 +475,27 @@ class LV2DB:
-         return self.plugins
- 
-     def get_plugin_full_model(self, uri):
--        sources = []
--        model = None
--
-         if uri in self.plugin_info:
-             model = self.plugin_info[uri]
--            return model, sources
-+            return model, []
-+
-+        graph = SimpleRDFModel()
- 
-         if self.manifests.bySubject.has_key(uri):
-             if self.sources: # cache/subset preloaded
-                 self.plugin_info[uri] = self.manifests
--                model = self.manifests
--                return model, self.sources
-+                return self.manifests, self.sources
-+
-+            if uri in self.manifests.object_sources:
-+                for source in self.manifests.object_sources[uri]:
-+                    graph.sources.add(source)
-+
-+            for source in self.manifests.bySubject[uri][rdfs_see_also]:
-+                graph.sources.add(source)
- 
--            graph = SimpleRDFModel()
--            docs = []
--            for source in self.manifests.object_sources[uri]:
--                docs.append(source)
--            docs = docs + self.manifests.bySubject[uri][rdfs_see_also]
-             try:
--                for doc in docs:
--                    #print "Loading " + doc + " for plugin " + uri
--                    parseTTL(doc, file(doc).read(), graph, self.debug)
--                    graph.sources.add(doc)
-+                for source in graph.sources:
-+                    parseTTL(source, file(source).read(), graph, self.debug)
-                 self.plugin_info[uri] = graph
-             except SyntaxError, e:
-                 print "SYNTAX ERROR at %s:%d - %s (%s)" % (e.filename, e.lineno, e.msg, e.text)
-@@ -505,16 +503,13 @@ class LV2DB:
-             except Exception, e:
-                 print "ERROR %s: %s" % (uri, str(e))
-                 return None, None
--            return graph, graph.sources
- 
--        for graph in self.dynmanifests:
--            #print graph
--            if graph.plugin_uri == uri:
-+        for g in self.dynmanifests:
-+            if g.plugin_uri == uri:
-                 try:
--                    parseTTL(graph.filename, graph.ttl_data, graph, self.debug)
--                    graph.ttl_data = None
-+                    parseTTL(g.filename, g.ttl_data, graph, self.debug)
-                     self.plugin_info[uri] = graph
--                    return graph, graph.sources
-+                    graph.sources.add(g.filename)
-                 except SyntaxError, e:
-                     print "SYNTAX ERROR at %s:%d - %s (%s)" % (e.filename, e.lineno, e.msg, e.text)
-                     return None, None
-@@ -523,7 +518,7 @@ class LV2DB:
-                     return None, None
- 
-         #print 'no subject "%s"' % uri
--        return None, None
-+        return graph, graph.sources
- 
-     def getPluginInfo(self, uri):
-         #print "getting info for plugin " + uri
diff --git a/debian/patches/series b/debian/patches/series
index b4b1f2b..19d8402 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 1002-buildsystem.patch
 1003-libglade_to_gtkbuilder.patch
 1004-lashd_not_found.patch
-1005-xref_fix.patch

-- 
zynjacku packaging