summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-28 16:02:23 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-28 16:02:23 +0100
commita0e481f58a8d70a2a87d59e3e3eda0c32f4c99d2 (patch)
tree02b698a623ac6c033b19ffaaf59b5b314cf2c88d
parentea47496f7dd4feac94f2a3a7f51fe1e07e012ee4 (diff)
parenta76782b4f0c9009a37e62d664b7d9692bd910783 (diff)
Merge remote-tracking branch 'dgit/dgit/sid' into experimentaldebian/5.5+exp2archive/debian/5.5+exp2
-rw-r--r--debian/changelog9
-rw-r--r--debian/control2
-rw-r--r--dgit.12
3 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index fc26e97..0f36987 100644
--- 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 42f68f6..3fca347 100644
--- 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 cbf0cde..ae08416 100644
--- 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]