diff options
| author | Colin Watson <cjwatson@debian.org> | 2016-11-11 03:26:05 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2016-11-11 03:26:05 +0000 |
| commit | 4250a967ecc9159ce3b8958719b1c132e69ca8f6 (patch) | |
| tree | 276faad646db8c9e992f2864d85feb1ec3d7d84e | |
| parent | 1833ff4e094d4cb4597ea875f525f672c010b8c6 (diff) | |
Remove the non-upstream .gitignore file and add the relevant entries to debian/.gitignore, in order to make the source tree more dgit-compatible.
| -rw-r--r-- | .gitignore | 47 | ||||
| -rw-r--r-- | debian/.gitignore | 18 | ||||
| -rw-r--r-- | debian/changelog | 3 |
3 files changed, 21 insertions, 47 deletions
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 11c73eeb3..000000000 --- a/.gitignore +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 1 | /*.out | ||
| 2 | /Makefile | ||
| 3 | /autom4te.cache | ||
| 4 | /buildit.sh | ||
| 5 | /buildpkg.sh | ||
| 6 | /config.cache | ||
| 7 | /config.h | ||
| 8 | /config.log | ||
| 9 | /config.status | ||
| 10 | /openssh.xml | ||
| 11 | /opensshd.init | ||
| 12 | /scp | ||
| 13 | /sftp | ||
| 14 | /sftp-server | ||
| 15 | /ssh | ||
| 16 | /ssh-add | ||
| 17 | /ssh-agent | ||
| 18 | /ssh-keygen | ||
| 19 | /ssh-keyscan | ||
| 20 | /ssh-keysign | ||
| 21 | /ssh-rand-helper | ||
| 22 | /ssh_prng_cmds | ||
| 23 | /sshd | ||
| 24 | /stamp-h.in | ||
| 25 | /survey | ||
| 26 | /survey.sh | ||
| 27 | contrib/gnome-ssh-askpass1 | ||
| 28 | contrib/gnome-ssh-askpass2 | ||
| 29 | openbsd-compat/Makefile | ||
| 30 | debian/*.debhelper* | ||
| 31 | debian/*substvars | ||
| 32 | debian/build-deb | ||
| 33 | debian/build-deb-ssh1 | ||
| 34 | debian/build-udeb | ||
| 35 | debian/files | ||
| 36 | debian/keygen-test/key1 | ||
| 37 | debian/keygen-test/key1.pub | ||
| 38 | debian/keygen-test/key2 | ||
| 39 | debian/keygen-test/key2.pub | ||
| 40 | debian/openssh-client | ||
| 41 | debian/openssh-client-udeb | ||
| 42 | debian/openssh-server | ||
| 43 | debian/openssh-server-udeb | ||
| 44 | debian/ssh | ||
| 45 | debian/ssh-askpass-gnome | ||
| 46 | debian/ssh-krb5 | ||
| 47 | debian/tmp | ||
diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 000000000..3c767d5e5 --- /dev/null +++ b/debian/.gitignore | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | /*.debhelper* | ||
| 2 | /*substvars | ||
| 3 | /build-deb | ||
| 4 | /build-deb-ssh1 | ||
| 5 | /build-udeb | ||
| 6 | /files | ||
| 7 | /keygen-test/key1 | ||
| 8 | /keygen-test/key1.pub | ||
| 9 | /keygen-test/key2 | ||
| 10 | /keygen-test/key2.pub | ||
| 11 | /openssh-client | ||
| 12 | /openssh-client-udeb | ||
| 13 | /openssh-server | ||
| 14 | /openssh-server-udeb | ||
| 15 | /ssh | ||
| 16 | /ssh-askpass-gnome | ||
| 17 | /ssh-krb5 | ||
| 18 | /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 | |||
| 3 | * Adjust Build-Depends further to avoid considering libssl-dev >= 1.1.0~ | 3 | * Adjust Build-Depends further to avoid considering libssl-dev >= 1.1.0~ |
| 4 | as sufficient. | 4 | as sufficient. |
| 5 | * Move build directories under debian/. | 5 | * Move build directories under debian/. |
| 6 | * Remove the non-upstream .gitignore file and add the relevant entries to | ||
| 7 | debian/.gitignore, in order to make the source tree more | ||
| 8 | dgit-compatible. | ||
| 6 | 9 | ||
| 7 | -- Colin Watson <cjwatson@debian.org> Fri, 11 Nov 2016 02:50:39 +0000 | 10 | -- Colin Watson <cjwatson@debian.org> Fri, 11 Nov 2016 02:50:39 +0000 |
| 8 | 11 | ||