summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules25
2 files changed, 20 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 2589a2278..3038df6ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openssh (1:6.9p1-3) UNRELEASED; urgency=medium
4 (closes: #799271). 4 (closes: #799271).
5 * Fix dh_install and dh_fixperms overrides to work properly with an 5 * Fix dh_install and dh_fixperms overrides to work properly with an
6 architecture-independent-only build (closes: #806090). 6 architecture-independent-only build (closes: #806090).
7 * Do much less work in architecture-independent-only builds.
7 8
8 -- Colin Watson <cjwatson@debian.org> Thu, 17 Sep 2015 13:52:53 +0100 9 -- Colin Watson <cjwatson@debian.org> Thu, 17 Sep 2015 13:52:53 +0100
9 10
diff --git a/debian/rules b/debian/rules
index d6b1b101a..148eed209 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,14 +127,18 @@ autoreconf:
127 autoreconf -f -i 127 autoreconf -f -i
128 cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./ 128 cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./
129 129
130override_dh_autoreconf: 130override_dh_autoreconf-arch:
131 dh_autoreconf debian/rules -- autoreconf 131 dh_autoreconf debian/rules -- autoreconf
132 132
133override_dh_auto_configure: 133override_dh_autoreconf-indep:
134
135override_dh_auto_configure-arch:
134 dh_auto_configure -Bbuild-deb -- $(confflags) 136 dh_auto_configure -Bbuild-deb -- $(confflags)
135 dh_auto_configure -Bbuild-udeb -- $(confflags_udeb) 137 dh_auto_configure -Bbuild-udeb -- $(confflags_udeb)
136 138
137override_dh_auto_build: 139override_dh_auto_configure-indep:
140
141override_dh_auto_build-arch:
138 # Avoid libnsl linkage. Ugh. 142 # Avoid libnsl linkage. Ugh.
139 perl -pi -e 's/ +-lnsl//' build-udeb/config.status 143 perl -pi -e 's/ +-lnsl//' build-udeb/config.status
140 cd build-udeb && ./config.status 144 cd build-udeb && ./config.status
@@ -144,7 +148,9 @@ override_dh_auto_build:
144 148
145 $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG) 149 $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)
146 150
147override_dh_auto_test: 151override_dh_auto_build-indep:
152
153override_dh_auto_test-arch:
148ifeq ($(RUN_TESTS),yes) 154ifeq ($(RUN_TESTS),yes)
149 $(MAKE) -C build-deb regress-prep 155 $(MAKE) -C build-deb regress-prep
150 $(MAKE) -C build-deb $(PARALLEL) \ 156 $(MAKE) -C build-deb $(PARALLEL) \
@@ -161,6 +167,8 @@ ifeq ($(RUN_TESTS),yes)
161 $(MAKE) -C debian/keygen-test 167 $(MAKE) -C debian/keygen-test
162endif 168endif
163 169
170override_dh_auto_test-indep:
171
164override_dh_auto_clean: 172override_dh_auto_clean:
165 rm -rf build-deb build-udeb 173 rm -rf build-deb build-udeb
166ifeq ($(RUN_TESTS),yes) 174ifeq ($(RUN_TESTS),yes)
@@ -170,9 +178,11 @@ endif
170 (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \ 178 (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
171 > debian/copyright 179 > debian/copyright
172 180
173override_dh_auto_install: 181override_dh_auto_install-arch:
174 $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys 182 $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
175 183
184override_dh_auto_install-indep:
185
176override_dh_install-arch: 186override_dh_install-arch:
177 rm -f debian/tmp/etc/ssh/sshd_config 187 rm -f debian/tmp/etc/ssh/sshd_config
178 188
@@ -186,9 +196,12 @@ override_dh_install-arch:
186 debian/openssh-client/etc/ssh/moduli \ 196 debian/openssh-client/etc/ssh/moduli \
187 debian/openssh-client/etc/ssh/ssh_config 197 debian/openssh-client/etc/ssh/ssh_config
188 198
199# We'd like to use dh_install --fail-missing here, but that doesn't work
200# well in combination with dh-exec: it complains that files generated by
201# dh-exec for architecture-dependent packages aren't installed.
189override_dh_install-indep: 202override_dh_install-indep:
190 rm -f debian/tmp/etc/ssh/sshd_config 203 rm -f debian/tmp/etc/ssh/sshd_config
191 dh_install --fail-missing 204 dh_install
192 205
193override_dh_installdocs: 206override_dh_installdocs:
194 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server 207 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server