questions, demo instructions

diff --git a/Makefile b/Makefile
index e0d530e5c1a883eae1872c7f5dbfc339cf9d81ce..aba120954b8ad2cb85a1d447616fe5d02b902bc9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 
 SLIDES= title archive-vcs manpage demo-placeholder data libavg
-SLIDES+= autopatch access-table
+SLIDES+= autopatch access-table questions
 
 SLIDEFILES=$(addsuffix .ps, $(SLIDES))
 

diff --git a/demo-instructions.txt b/demo-instructions.txt
new file mode 100644 (file)
index 0000000..2d77a8b
--- /dev/null
+++ b/demo-instructions.txt
@@ -0,0 +1,8 @@
+dgit clone dgit experimental
+cd dgit
+emacs -nw debian/changelog
+debcommit -a
+dgit sbuild -c build
+[ pgp thing ]
+dgit push
+[ pgp thing ]

diff --git a/demo-placeholder.fig b/demo-placeholder.fig
index 4b54f2a9da2bf02f08f7a9a4719d8d4d61ddbb97..0f49e286e4ba0a8f4d206be97631679e54cce8fa 100644 (file)
--- a/demo-placeholder.fig
+++ b/demo-placeholder.fig
@@ -7,4 +7,7 @@ A4
 Single
 -2
 1200 2
-4 0 0 50 -1 0 24 0.0000 4 345 1185 2745 4500 (demo)\001
+2 5 0 1 0 -1 50 -1 -1 0.000 0 0 -1 0 0 5
+       0 demo-instructions.txt.eps
+        1215 2430 7057 2430 7057 5160 1215 5160 1215 2430
+4 0 0 50 -1 0 24 0.0000 4 270 1005 1170 1440 Demo\001

diff --git a/questions.fig b/questions.fig
new file mode 100644 (file)
index 0000000..5af5507
--- /dev/null
+++ b/questions.fig
@@ -0,0 +1,13 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+4 0 0 50 -1 0 24 0.0000 4 270 1950 2925 4500 Ian Jackson\001
+4 0 0 50 -1 12 16 0.0000 4 240 5115 2970 4950 ijackson@chiark.greenend.org.uk\001
+4 0 0 50 -1 0 24 0.0000 4 360 4680 2925 2340 dgit 0.22 in unstable/testing\001
+4 0 0 50 -1 12 22 0.0000 4 315 8100 2925 2880 http://manpages.debian.org/man1/dgit\001

diff --git a/talk.txt b/talk.txt
index e460f7eb86a8f8ea4706ff6ba66f0549281ae250..3b840c5064a1f2223d8ca9db6fabde6694b8e999 100644 (file)
--- a/talk.txt
+++ b/talk.txt
@@ -38,7 +38,7 @@ whether the maintainer uses dgit, other git tools, quilt, CVS or SCCS.
 With dgit you do all direct source code management in git.  As a dgit
 user you do not interact with the archive directly.
 
-[demo]
+[start demo]
 
 dgit is particularly useful for NMUers: you can prepare an RC bugfix,
 with full support from git, without needing to know anything about the
@@ -140,3 +140,4 @@ authentication model is not a very good fit for alioth's
 infrastructure.  We intend to move this to a VM of its own - I've
 spoken to DSA (in the person of Tollef) about this.
 
+[questions etc.]