summaryrefslogtreecommitdiff
path: root/blends/talk
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-10-25 12:26:44 +0530
committerJonas Smedegaard <dr@jones.dk>2011-10-25 12:26:44 +0530
commitbf30a4f2e7a6594eb69b44f09b372a6db708d4d5 (patch)
tree498a9a7644b4ed74fca8e6f2f2c3b43a5d458698 /blends/talk
parentcfb6c938f24612285ff8c639b52cfd5a3d52e57a (diff)
Regenerate CDAC talk.
Diffstat (limited to 'blends/talk')
-rw-r--r--blends/talk/cdac/index.html37
1 files changed, 36 insertions, 1 deletions
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>