Merge remote-tracking branch 'dgit/dgit/sid' into experimental

diff --git a/debian/changelog b/debian/changelog
index fc26e977693961cdf82936d3195c5892330249c5..0f36987bda9b081fa6694d8875c945dc394ebc79 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-dgit (5.4+exp2) experimental; urgency=medium
+dgit (5.5+exp2) experimental; urgency=medium
 
   * test suite: Explicit agent starting/stopping
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 00:42:00 +0100
 
+dgit (5.5) unstable; urgency=medium
+
+  * Add missing comma in debian/control.  Closes:#902578.
+  * dgit(1): Fix a wrong reference to \fp, which should be \fP.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 28 Jun 2018 13:25:21 +0100
+
 dgit (5.4+exp1) experimental; urgency=medium
 
   * No-change upload, for testing.

diff --git a/debian/control b/debian/control
index 42f68f66ae99de2b0d3ea6306868bade9b5d0c2c..3fca3479fd1e0658508f31d0e2ed8f67739ff6b1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Description: git interoperability with the Debian archive
  dgit clone and dgit fetch construct git commits from uploads.
 
 Package: git-debrebase
-Depends: perl, git-core, libdpkg-perl, libfile-fnmatch-perl
+Depends: perl, git-core, libdpkg-perl, libfile-fnmatch-perl,
          ${misc:Depends}
 Recommends: dgit, git-buildpackage
 Architecture: all

diff --git a/dgit.1 b/dgit.1
index cbf0cde5ec042476b6c20f1341abb38cadd241cf..ae084163d4ea687a8b3780cec94cbfb5dd6ca08b 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -14,7 +14,7 @@ dgit \- git integration with the Debian archive
 .br
 .B dgit
 [\fIdgit\-opts\fP] \fBbuild\fP|\fBsbuild\fP|\fBbuild-source\fP
-[\fIbuild\-opts\fp]
+[\fIbuild\-opts\fP]
 .br
 .B dgit
 [\fIdgit\-opts\fP] \fBpush\fP|\fBpush-source\fP [\fIdgit\-opts\fP]