From bb0b78a0074c8f1e22f04bd828b6285f64f827fa Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 14:05:13 +0200
Subject: Adding contrib/graph-helpers/*.

---
 contrib/graph-helpers.py               | 74 ----------------------------------
 contrib/graph-helpers/graph-helpers.py | 74 ++++++++++++++++++++++++++++++++++
 debian/copyright                       | 23 ++++++++++-
 3 files changed, 95 insertions(+), 76 deletions(-)
 delete mode 100644 contrib/graph-helpers.py
 create mode 100755 contrib/graph-helpers/graph-helpers.py

diff --git a/contrib/graph-helpers.py b/contrib/graph-helpers.py
deleted file mode 100644
index a0eceb8..0000000
--- a/contrib/graph-helpers.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env python
-
-"""
-    live-helper simulated execution graph generator.
-    Copyright (C) 2007  Chris Lamb <chris@chris-lamb.co.uk>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
-
-import sys, re
-import pygraphviz
-
-groups = {
-    'lh_bootstrap' : 'orange',
-    'lh_chroot' : 'red',
-    'lh_source' : 'blue',
-    'lh_binary' : 'green',
-    'lh_build' : 'brown'
-}
-pattern = re.compile(r'^(lh_.+?) ')
-
-def main(start):
-    global prev
-    G = pygraphviz.AGraph(directed=True)
-    G.graph_attr['label'] = 'Simulated execution trace for live-helper.'
-
-    def helper(filename):
-        global prev
-        for line in gen_matches(filename):
-            G.add_edge(prev, line)
-            style(G.get_node(prev), prev)
-            prev = line
-            helper(line)
-
-    prev = start
-    helper(start)
-    G.layout(prog='dot')
-    print G.draw(format='svg')
-
-def style(node, name):
-    if name in groups.keys():
-        node.attr['shape'] = 'box'
-        node.attr['style'] = 'bold'
-    else:
-        node.attr['fontsize'] = '11'
-    for group_name, color in groups.iteritems():
-        if name.startswith(group_name):
-            node.attr['color'] = color
-    return node
-
-def gen_matches(filename):
-    f = open('/usr/bin/%s' % filename, 'r')
-    for line in f.xreadlines():
-        match = pattern.match(line)
-        if match:
-            yield match.group(1)
-    f.close()
-
-if __name__ == "__main__":
-    if len(sys.argv) == 2:
-        main(sys.argv[1])
-    else:
-        main('lh_build')
diff --git a/contrib/graph-helpers/graph-helpers.py b/contrib/graph-helpers/graph-helpers.py
new file mode 100755
index 0000000..a0eceb8
--- /dev/null
+++ b/contrib/graph-helpers/graph-helpers.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+
+"""
+    live-helper simulated execution graph generator.
+    Copyright (C) 2007  Chris Lamb <chris@chris-lamb.co.uk>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+import sys, re
+import pygraphviz
+
+groups = {
+    'lh_bootstrap' : 'orange',
+    'lh_chroot' : 'red',
+    'lh_source' : 'blue',
+    'lh_binary' : 'green',
+    'lh_build' : 'brown'
+}
+pattern = re.compile(r'^(lh_.+?) ')
+
+def main(start):
+    global prev
+    G = pygraphviz.AGraph(directed=True)
+    G.graph_attr['label'] = 'Simulated execution trace for live-helper.'
+
+    def helper(filename):
+        global prev
+        for line in gen_matches(filename):
+            G.add_edge(prev, line)
+            style(G.get_node(prev), prev)
+            prev = line
+            helper(line)
+
+    prev = start
+    helper(start)
+    G.layout(prog='dot')
+    print G.draw(format='svg')
+
+def style(node, name):
+    if name in groups.keys():
+        node.attr['shape'] = 'box'
+        node.attr['style'] = 'bold'
+    else:
+        node.attr['fontsize'] = '11'
+    for group_name, color in groups.iteritems():
+        if name.startswith(group_name):
+            node.attr['color'] = color
+    return node
+
+def gen_matches(filename):
+    f = open('/usr/bin/%s' % filename, 'r')
+    for line in f.xreadlines():
+        match = pattern.match(line)
+        if match:
+            yield match.group(1)
+    f.close()
+
+if __name__ == "__main__":
+    if len(sys.argv) == 2:
+        main(sys.argv[1])
+    else:
+        main('lh_build')
diff --git a/debian/copyright b/debian/copyright
index 47f1f34..87b06f7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,8 +30,27 @@ License:
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL-2 file.
 
-License (contrib/grub-splash/*, contrib/syslinux-splash/*,
-templates/syslinux/splash.rle, templates/grub/splash.xpm.gz):
+License (contrib/graph-helpers/*):
+
+	Copyright (C) 2007 Chris Lamb <chris@chris-lamb.co.uk>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/GPL-3 file.
+
+License (contrib/grub-splash/*, contrib/syslinux-splash/*):
 
 	The splash for Debian Live was done by Daniel Baumann
 	<daniel@debian.org> based on the original work of Mark Riedesel.
-- 
cgit v1.0