more slides

diff --git a/.gitignore b/.gitignore
index 315b9eca370f6074259efc80ebb5316ebb07200c..54a8b77cb862a58b97cea050a05b8bd41cb5025f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *~
 *.bak
+title.ps
 data-flow.ps
 dflow-equal.ps
 nmu-linear.ps
@@ -9,4 +10,5 @@ slides.pdf
 my-history-inc.ps
 my-history-inc.eps
 nmu-compare.ps
+future.ps
 *.1

diff --git a/Makefile b/Makefile
index 22c8d16a62abc2c0fe18a0a248b8c9a884ea4fca..ebcae19a8a5c323289cd14b453cc5a1e3b9eae36 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
 
-SLIDES+= data-flow
-SLIDES+= dflow-equal
+SLIDES+= title
 SLIDES+= data-flow
 SLIDES+= nmu-linear
 SLIDES+= nmu-basic
 SLIDES+= nmu-compare
+SLIDES+= data-flow
+SLIDES+= dflow-equal
+SLIDES+= data-flow
+SLIDES+= future
 
 SLIDEFILES=$(addsuffix .ps, $(SLIDES))
 

diff --git a/future.fig b/future.fig
new file mode 100644 (file)
index 0000000..2f6f856
--- /dev/null
+++ b/future.fig
@@ -0,0 +1,39 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+0 32 #ffddaa
+2 1 0 2 0 7 50 -1 -1 4.500 0 0 -1 0 0 2
+        900 450 7020 450
+2 1 0 2 20 7 50 -1 -1 4.500 0 0 -1 0 0 2
+        8010 450 12510 450
+2 1 0 2 0 7 50 -1 -1 4.500 0 0 -1 0 0 2
+        900 6480 2610 6480
+4 0 20 50 -1 16 20 0.0000 4 315 3855 8010 1530 for integration with existing\001
+4 0 20 50 -1 16 20 0.0000 4 315 3510 8010 1890 git packaging tools (esp.\001
+4 0 20 50 -1 16 20 0.0000 4 315 4050 8010 2250 re NMU integration and new\001
+4 0 20 50 -1 16 20 0.0000 4 315 2760 8010 2610 upstream versions)\001
+4 0 20 50 -1 16 20 0.0000 4 315 3105 8010 3330 better integration with\001
+4 0 20 50 -1 16 20 0.0000 4 315 2370 8010 3690 git-buildpackage\001
+4 0 20 50 -1 16 20 0.0000 4 315 3360 8010 4500 dgit-based sponsorship\001
+4 0 20 50 -1 16 20 0.0000 4 315 2835 8010 4860 request mechanism\001
+4 0 0 50 -1 16 24 0.0000 4 375 2235 8010 180 help needed\001
+4 0 0 50 -1 16 24 0.0000 4 390 3180 900 180 plans for my CFT\001
+4 0 20 50 -1 16 20 0.0000 4 240 4410 8010 1170 better workflow documentation\001
+4 0 0 50 -1 16 20 0.0000 4 315 3330 900 990 dgit push to DELAYED\001
+4 0 0 50 -1 16 20 0.0000 4 315 6150 900 1620 automatically sending NMU diff to the BTS\001
+4 0 0 50 -1 16 20 0.0000 4 315 4890 900 2160 one-step source-only push/upload\001
+4 0 0 50 -1 16 20 0.0000 4 315 4665 900 2790 use of the dgit git repo server for\001
+4 0 0 50 -1 16 20 0.0000 4 315 5595 900 3150 general purpose work (eg, maintainer's\001
+4 0 0 50 -1 16 20 0.0000 4 315 3075 900 3510 pre-upload branches)\001
+4 0 0 50 -1 16 20 0.0000 4 315 2055 900 4410 raw git-rebase\001
+4 0 0 50 -1 16 20 0.0000 4 315 5070 900 4950 automatic mirroring, into the dgit git\001
+4 0 0 50 -1 16 20 0.0000 4 315 4365 900 5310 branches, of non-dgit uploads \001
+4 0 0 50 -1 16 24 0.0000 4 300 1710 900 6300 More info\001
+4 0 0 50 -1 16 20 0.0000 4 315 5265 900 4050 better tooling assistance for use with\001
+4 0 0 50 -1 16 20 0.0000 4 315 10455 900 6930 start with dgit(1), dgit(7) from manpages.debian.net, or dgit.deb in testing\001

diff --git a/talk.txt b/talk.txt
index 2c2df66ad592dd4748c91db69eb5cb60f212abd5..8e1a0b24d2af9187f60247e818bbb92de8b88d50 100644 (file)
--- a/talk.txt
+++ b/talk.txt
@@ -1,13 +1,5 @@
 
 ==== overview slide
-> 
->      dgit - treat the archive as a git remote
-> 
->      COLOUR 1   using dgit on other contributors' packages
-> 
->      COLOUR 2   dgit for the Debian package maintainer
-> 
->      Miscellany
 
 
 Hi.  I'm here to plug dgit, which is a system for treating the Debian
@@ -44,18 +36,20 @@ with any other project.  In particular, you can:
  * git rebase -i to polish a more complex set of changes into
    a patch queue
 
-If you want so share your work-in-progress with others, you can git
-push your branch anywhere suitable, so they can fetch it.
-
 If you have the right authority you can also dgit push, to upload
 (after doing a build).
 
+If you want so share your work-in-progress with others, you can git
+push your branch anywhere suitable, so they can fetch it.  So, for
+example, you could share your branch with your sponsor, who could
+then approve it by running dgit push.
+
 ==== NMU linear history slide
 
 The dgit history structure is up to the maintainer.  If you are doing
 a straightforward NMU you should produce a well-structured linear
 sequence of commits, as you would for any git upstream.  If the source
-package is `3.0 (quilt)', you should not touch debian/patches; dgit
+package is `3.0 (quilt)', you shouldn't touch debian/patches; dgit
 will take care of that for you.
 
 ==== NMU linear history on top of basic dgit history
@@ -96,7 +90,7 @@ save you some dsc-based checks.
 And, as I say, non-maintainer dgit users will thank you.
 
 
-==== data flow slide with EQUAL and FF
+==== data flow slide
 
 dgit is not a replacement for existing git packaging tools; it's
 intended to complement them.  So (unlike git-dpm) dgit does not define
@@ -104,6 +98,8 @@ a git history structure; nor does it define a branch structure or
 require a particular source format.
 
 
+==== data flow slide with EQUAL and FF
+
 dgit push imposes only two requirements on your git trees, which stem
 directly from dgit's goals.
 
@@ -119,8 +115,8 @@ dgit right away.  Please do!
 For those using git-buildpackage with `3.0 (quilt)', things are a bit
 more complicated.  I'm told that gbp pq can be used to generate a
 patches-applied branch, and that some users prefer to use that as the
-interchange git branch.  I'm talking to the git-buildpackage
-maintainers about gbp integration.
+interchange git branch, but I know this is far from universal.  I'm
+talking to the git-buildpackage maintainers about gbp integration.
 
 
 The other requirement of dgit is simply that the dgit branches are
@@ -177,29 +173,6 @@ Alternatively, you can commit the autotools output to git.
 
 
 ==== Future plans slide
-> DELAYED uploads
-> 
-> automatic sending of the NMU diff email
-> 
-> one step source-only push/upload
-> 
-> use of the dgit git repo server (other branches and tags) for general
-> purpose work
-> 
-> better tooling assistance for use with raw git-rebase
-> 
-> automatic mirroring into the dgit git branches of non-dgit uploads
-> 
-> 
-> help needed
-> 
-> better workflow documentation for integration with existing git
-> tools (esp. re NMU integration and new upstream version handling).
-> 
-> better gbp integration
-> 
-> sponsor queue
-
 
 I have a number of plans for the future, some of which I need help
 with.  But I don't have time, I'm afraid, to go through them.

diff --git a/title.fig b/title.fig
new file mode 100644 (file)
index 0000000..279a85a
--- /dev/null
+++ b/title.fig
@@ -0,0 +1,22 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+0 32 #ffddaa
+1 4 0 2 0 0 50 -1 20 0.000 1 0.0000 2115 4725 142 142 1973 4725 2257 4725
+1 4 0 2 0 0 50 -1 20 0.000 1 0.0000 2115 5580 142 142 1973 5580 2257 5580
+1 4 0 2 0 0 50 -1 20 0.000 1 0.0000 2115 6390 142 142 1973 6390 2257 6390
+4 0 0 50 -1 14 36 0.0000 4 495 1440 5400 900 dgit\001
+4 0 0 50 -1 18 24 0.0000 4 390 7575 2700 1800 Use the Debian archive as a git remote\001
+4 0 0 50 -1 16 20 0.0000 4 315 3420 4393 2296 Debconf 15, Heidelberg\001
+4 0 0 50 -1 16 24 0.0000 4 390 1920 2728 6541 miscellany\001
+4 0 0 50 -1 16 20 0.0000 4 240 1740 1980 2700 Ian Jackson\001
+4 0 0 50 -1 12 20 0.0000 4 255 6045 4050 2700 ijackson@chiark.greenend.org.uk\001
+4 0 0 50 -1 12 20 0.0000 4 255 4875 4050 3060 ian.jackson@eu.citrix.com\001
+4 0 0 50 -1 16 24 0.0000 4 390 7050 2698 5686 dgit for the Debian package maintainer\001
+4 0 0 50 -1 16 24 0.0000 4 390 7740 2683 4861 dgit for NMUers, downstreams, users, etc.\001