From bf30a4f2e7a6594eb69b44f09b372a6db708d4d5 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 25 Oct 2011 12:26:44 +0530
Subject: Regenerate CDAC talk.

---
 blends/talk/cdac/index.html | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

(limited to 'blends/talk/cdac')

diff --git a/blends/talk/cdac/index.html b/blends/talk/cdac/index.html
index edb79fe..62eaa82 100644
--- a/blends/talk/cdac/index.html
+++ b/blends/talk/cdac/index.html
@@ -26,6 +26,7 @@ Jonas Smedegaard
 <li>Free Software</li>
 <li>FLOSS</li>
 <li>Debian - distro &amp; community</li>
+<li>The bigger picture</li>
 </ul>
 </div>
 <div class="slide">
@@ -112,6 +113,39 @@ Jonas Smedegaard
 </ul>
 </div>
 <div class="slide">
+<h1 id="debian---derivatives">Debian - derivatives</h1>
+<ul>
+<li>Knoppix</li>
+<li>Ubuntu</li>
+<li>BOSS</li>
+<li>...</li>
+</ul>
+</div>
+<div class="slide">
+<h1 id="debian---blends">Debian - blends</h1>
+<ul>
+<li>Debian Jr</li>
+<li>Debian Med</li>
+<li>Debian Edu</li>
+<li>Debian Science</li>
+<li>Debian EzGo</li>
+<li>BrDesktop</li>
+<li>Debian Accessibility</li>
+<li>Debian Lex</li>
+<li>DebiChem</li>
+<li>Debian GIS</li>
+<li>Debian Multimedia</li>
+</ul>
+</div>
+<div class="slide">
+<h1 id="debian---future-blends">Debian - future blends</h1>
+<ul>
+<li>FreedomBox</li>
+<li>Debian LAN</li>
+<li>BOSS?</li>
+</ul>
+</div>
+<div class="slide">
 <h1 id="debian-in-a-larger-perspective">Debian in a larger perspective</h1>
 <div class="figure">
 <img src="../developmentstream.svg" alt="Software Development Stream" /><p class="caption">Software Development Stream</p>
@@ -133,7 +167,8 @@ document.write('<a h'+'ref'+'="ma'+'ilto'+':'+e+'">'+'<code>'+e+'</code>'+'<\/'+
 // -->
 </script><noscript>&#100;&#114;&#32;&#x61;&#116;&#32;&#106;&#x6f;&#110;&#x65;&#x73;&#32;&#100;&#x6f;&#116;&#32;&#100;&#x6b;</noscript></li>
 <li>Debian: <a href="http://www.debian.org"><code class="url">http://www.debian.org</code></a></li>
-<li>This talk: <a href="http://dr.jones.dk/blends/talk/hcu"><code class="url">http://dr.jones.dk/blends/talk/hcu</code></a></li>
+<li>This talk: <a href="http://dr.jones.dk/blends/talk/cdac"><code class="url">http://dr.jones.dk/blends/talk/cdac</code></a></li>
+<li>Graphics: <a href="http://sirireiter.dk/blog/entry/110310/"><code class="url">http://sirireiter.dk/blog/entry/110310/</code></a></li>
 </ul>
 </div>
 </body>
-- 
cgit v1.2.3

/tags/19?h=master'>19</a>/<a href='/notmuch/commit/tags/19/7f?h=master'>7f</a>/<a href='/notmuch/commit/tags/19/7f/E1kUSx3-000Dah-9K@fasolo.debian.org?h=master'>E1kUSx3-000Dah-9K@fasolo.debian.org</a>/<a href='/notmuch/commit/tags/19/7f/E1kUSx3-000Dah-9K@fasolo.debian.org/killed?h=master'>killed</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='master'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Jonas Smedegaard &lt;dr@jones.dk&gt;</td><td class='right'>2023-06-27 09:35:08 +0200</td></tr>
<tr><th>committer</th><td>Jonas Smedegaard &lt;dr@jones.dk&gt;</td><td class='right'>2023-06-27 09:35:08 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/notmuch/commit/tags/19/7f/E1kUSx3-000Dah-9K@fasolo.debian.org/killed?h=master&amp;id=fd54908da2b05c526dd3bee9b6dcd093214a220d'>fd54908da2b05c526dd3bee9b6dcd093214a220d</a> (<a href='/notmuch/patch/tags/19/7f/E1kUSx3-000Dah-9K@fasolo.debian.org/killed?id=fd54908da2b05c526dd3bee9b6dcd093214a220d'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/notmuch/tree/?h=master'>c69c845069c99d1d01044f6fafda7c08433329c6</a> /<a href='/notmuch/tree/tags/19/7f/E1kUSx3-000Dah-9K@fasolo.debian.org/killed?h=master'>tags/19/7f/E1kUSx3-000Dah-9K@fasolo.debian.org/killed</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/notmuch/commit/tags/19/7f/E1kUSx3-000Dah-9K@fasolo.debian.org/killed?h=master&amp;id=ba46132213560cf3335d53560d519c0ec0190da2'>ba46132213560cf3335d53560d519c0ec0190da2</a> (<a href='/notmuch/diff/tags/19/7f/E1kUSx3-000Dah-9K@fasolo.debian.org/killed?h=master&amp;id2=ba46132213560cf3335d53560d519c0ec0190da2'>diff</a>)</td></tr></table>
<div class='commit-subject'><span class='decoration'><a class='branch-deco' href='/notmuch/log/tags/19/7f/E1kUSx3-000Dah-9K@fasolo.debian.org/killed?h=master'>master</a></span></div><div class='commit-msg'></div><div class='diffstat-header'><a href='/notmuch/diff/?h=master'>Diffstat</a> (limited to 'tags/19/7f/E1kUSx3-000Dah-9K@fasolo.debian.org/killed')</div><table summary='diffstat' class='diffstat'>