xxxs

diff --git a/talk.txt b/talk.txt
index 1cf7cee5beff259b687967a992d3d9248406693f..abe3a534dbcbcce007a6f81a6be5fe2273fa90a0 100644 (file)
--- a/talk.txt
+++ b/talk.txt
@@ -121,6 +121,9 @@ patches can also result in people having to read interdiffs, which are
 notoriously confusing.
 
 
+xxx plug plug
+
+
 ==== NMU linear history on top of basic dgit history
 
 Sadly, unless the maintainer uses dgit, the history you see in dgit
@@ -217,10 +220,13 @@ directly from dgit's objectives.
 The most important requirement is that your git tree is identical to
 the unpacked source package.  (Technically, in the case of a `3.0
 (quilt)' package, it is what is sometimes called a `patches-applied
-packaging branch without .pc directory'.  Patches-applied means that the upstream
-source files in the main package tree correspond to the actual source
-code that will be used when the package is built, rather than to the
-upstream versions.)
+packaging branch without .pc directory'.  Patches-applied means that
+the upstream source files in the main package tree correspond to the
+actual source code that will be used when the package is built, rather
+than to the upstream versions.)
+
+xxx slide, longer explanation
+
 
 For all native packages, and for users of git-dpm and raw git, this is
 already the interchange format.  These maintainers can start using
@@ -231,7 +237,7 @@ 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, but I know this is far from universal.  I'm
 talking to the git-buildpackage maintainers about gbp integration, so
-watch this space.
+watch this space.  xxx
 
 The other requirement of dgit is simply that the dgit branches are
 fast-forwarding.  So if your tools have made a rebasing branch, you
@@ -257,6 +263,9 @@ right now, have a record of DMs' ssh keys.
 The second thing that's less than ideal is that the dgit git history
 does not generally include the package upload history.
 git-import-dscs can produce a git branch representing the upload
+
+xxx patches-applied
+
 history, but dgit doesn't run that itself.  It would be difficult for
 dgit to do so because deciding which set of versions to include is
 nontrivial and of course it would involve an awful lot of downloading.
@@ -432,6 +441,11 @@ I hear rumours that Ubuntu might grow a dgit git server and support
 dgit push.  Patches very welcome!
 
 
+==== Thanks and more info slide
+
+xxx thank dsa ftpmaster
+
+
 So that's most of what I have prepared.  There's, of course, a lot
 more detailed information in the manpages.