diff options
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/openssh-client.lintian-overrides (renamed from debian/openssh-client.lintian) | 0 | ||||
-rw-r--r-- | debian/openssh-server.lintian-overrides (renamed from debian/openssh-server.lintian) | 0 | ||||
-rwxr-xr-x | debian/rules | 6 | ||||
-rw-r--r-- | debian/ssh.lintian-overrides (renamed from debian/ssh.lintian) | 0 |
5 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index fbd79cc2d..c9af17d59 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -2,6 +2,7 @@ openssh (1:5.3p1-2) UNRELEASED; urgency=low | |||
2 | 2 | ||
3 | * Link with -Wl,--as-needed (closes: #560155). | 3 | * Link with -Wl,--as-needed (closes: #560155). |
4 | * Install upstream sshd_config as an example (closes: #415008). | 4 | * Install upstream sshd_config as an example (closes: #415008). |
5 | * Use dh_lintian. | ||
5 | 6 | ||
6 | -- Colin Watson <cjwatson@debian.org> Sun, 31 Jan 2010 00:11:43 +0000 | 7 | -- Colin Watson <cjwatson@debian.org> Sun, 31 Jan 2010 00:11:43 +0000 |
7 | 8 | ||
diff --git a/debian/openssh-client.lintian b/debian/openssh-client.lintian-overrides index 8c4bd1751..8c4bd1751 100644 --- a/debian/openssh-client.lintian +++ b/debian/openssh-client.lintian-overrides | |||
diff --git a/debian/openssh-server.lintian b/debian/openssh-server.lintian-overrides index 17d912cb0..17d912cb0 100644 --- a/debian/openssh-server.lintian +++ b/debian/openssh-server.lintian-overrides | |||
diff --git a/debian/rules b/debian/rules index fc0521ec1..5a4e4cc59 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -217,7 +217,7 @@ binary-openssh-client: build install | |||
217 | dh_installdebconf | 217 | dh_installdebconf |
218 | dh_installdocs | 218 | dh_installdocs |
219 | dh_installchangelogs | 219 | dh_installchangelogs |
220 | install -m644 debian/openssh-client.lintian debian/openssh-client/usr/share/lintian/overrides/openssh-client | 220 | dh_lintian |
221 | dh_strip | 221 | dh_strip |
222 | dh_compress | 222 | dh_compress |
223 | dh_fixperms | 223 | dh_fixperms |
@@ -243,8 +243,8 @@ binary-openssh-server: build install | |||
243 | mv debian/openssh-server/usr/share/doc/openssh-server debian/openssh-server/usr/share/doc/openssh-client | 243 | mv debian/openssh-server/usr/share/doc/openssh-server debian/openssh-server/usr/share/doc/openssh-client |
244 | rm -f debian/openssh-server/usr/share/doc/openssh-client/copyright | 244 | rm -f debian/openssh-server/usr/share/doc/openssh-client/copyright |
245 | dh_installexamples | 245 | dh_installexamples |
246 | install -m644 debian/openssh-server.lintian debian/openssh-server/usr/share/lintian/overrides/openssh-server | ||
247 | dh_installpam --name sshd | 246 | dh_installpam --name sshd |
247 | dh_lintian | ||
248 | dh_link | 248 | dh_link |
249 | dh_strip | 249 | dh_strip |
250 | dh_compress | 250 | dh_compress |
@@ -268,7 +268,7 @@ binary-ssh: build install | |||
268 | dh_installdocs | 268 | dh_installdocs |
269 | mv debian/ssh/usr/share/doc/ssh debian/ssh/usr/share/doc/openssh-client | 269 | mv debian/ssh/usr/share/doc/ssh debian/ssh/usr/share/doc/openssh-client |
270 | rm -f debian/ssh/usr/share/doc/openssh-client/copyright | 270 | rm -f debian/ssh/usr/share/doc/openssh-client/copyright |
271 | install -m644 debian/ssh.lintian debian/ssh/usr/share/lintian/overrides/ssh | 271 | dh_lintian |
272 | dh_link | 272 | dh_link |
273 | dh_compress | 273 | dh_compress |
274 | dh_fixperms | 274 | dh_fixperms |
diff --git a/debian/ssh.lintian b/debian/ssh.lintian-overrides index b9bf7ea08..b9bf7ea08 100644 --- a/debian/ssh.lintian +++ b/debian/ssh.lintian-overrides | |||