From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 7 Nov 2013 00:10:47 +0000 (+0000)
Subject: Merge branch 'wip.remote' of git+ssh://git.debian.org/git/dgit-repos/repos/dgit into... 
X-Git-Tag: debian/0.18_experimental2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0879dfb04f2f2053cda815b773c55f212810c5a0;p=dgit.git

Merge branch 'wip.remote' of git+ssh://git.debian.org/git/dgit-repos/repos/dgit into wip.remote

Conflicts:
	debian/changelog
---

0879dfb04f2f2053cda815b773c55f212810c5a0
diff --cc debian/changelog
index 7ba0e870,4891735b..4ea1aea8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,21 @@@
 +dgit (0.18~experimental1) experimental; urgency=low
 +
 +  * No update to code.
 +    dgit 0.17 is going to go into unstable soon, and we need to
 +     (a) test it (so this is an upload for testing); and
 +     (b) bump the version number in experimental to keep it here
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 06 Nov 2013 21:54:15 +0000
 +
+ dgit (0.17~experimental7) experimental; urgency=low
+ 
+   * manpage: Remove comment in BUGS about lack of policy docs
+     for Dgit field, which is specified now.  Closes:#720201.
+   * manpage: Make discussion of --existing-package less scary.  The
+     default archive access method no longer needs it.  Closes:#720171.
+ 
+  --
+ 
  dgit (0.17~experimental6) experimental; urgency=low
  
    * No update to code.  Upload to remove "DO NOT USE" indication.