2 files changed, 21 insertions, 0 deletions

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 000000000..3c767d5e5
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,18 @@
+/*.debhelper*
+/*substvars
+/build-deb
+/build-deb-ssh1
+/build-udeb
+/files
+/keygen-test/key1
+/keygen-test/key1.pub
+/keygen-test/key2
+/keygen-test/key2.pub
+/openssh-client
+/openssh-client-udeb
+/openssh-server
+/openssh-server-udeb
+/ssh
+/ssh-askpass-gnome
+/ssh-krb5
+/tmp
diff --git a/debian/changelog b/debian/changelog
index ed6013816..9d72b37a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ openssh (1:7.3p1-4) UNRELEASED; urgency=medium
   * Adjust Build-Depends further to avoid considering libssl-dev >= 1.1.0~
     as sufficient.
   * Move build directories under debian/.
+  * Remove the non-upstream .gitignore file and add the relevant entries to
+    debian/.gitignore, in order to make the source tree more
+    dgit-compatible.
 
  -- Colin Watson <cjwatson@debian.org>  Fri, 11 Nov 2016 02:50:39 +0000