diff options
author | Colin Watson <cjwatson@debian.org> | 2006-03-31 08:19:19 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2006-03-31 08:19:19 +0000 |
commit | e4550711d01b9f23ec32c789ee747ebaa0b829df (patch) | |
tree | 808b3b043ad1e0606f851325aa2bd7ea78939c92 /debian/rules | |
parent | 3f78d18ab53e1a3883c7042892ee52893ea7a82d (diff) |
* Use udeb support introduced in debhelper 4.2.0 (available in sarge)
rather than constructing udebs by steam.
* Require debhelper 5.0.22, which generates correct shared library
dependencies for udebs. This build-dependency can be ignored if building
on sarge.
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/debian/rules b/debian/rules index 4707023bf..55de7927b 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -15,8 +15,6 @@ else | |||
15 | OPTFLAGS := -O0 | 15 | OPTFLAGS := -O0 |
16 | endif | 16 | endif |
17 | 17 | ||
18 | VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | sed 's/.*://') | ||
19 | DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) | ||
20 | DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) | 18 | DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) |
21 | 19 | ||
22 | # Take account of old dpkg-architecture output. | 20 | # Take account of old dpkg-architecture output. |
@@ -27,9 +25,6 @@ ifeq ($(DEB_HOST_ARCH_OS),) | |||
27 | endif | 25 | endif |
28 | endif | 26 | endif |
29 | 27 | ||
30 | CLIENT_UDEB := openssh-client-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb | ||
31 | SERVER_UDEB := openssh-server-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb | ||
32 | |||
33 | ifeq (,$(wildcard /usr/bin/po2debconf)) | 28 | ifeq (,$(wildcard /usr/bin/po2debconf)) |
34 | PO2DEBCONF := no | 29 | PO2DEBCONF := no |
35 | MINDEBCONFVER := 0.5 | 30 | MINDEBCONFVER := 0.5 |
@@ -278,9 +273,9 @@ binary-openssh-client-udeb: build install | |||
278 | dh_installdeb | 273 | dh_installdeb |
279 | install -p -o root -g root -m 755 debian/openssh-client-udeb.isinstallable debian/openssh-client-udeb/DEBIAN/isinstallable | 274 | install -p -o root -g root -m 755 debian/openssh-client-udeb.isinstallable debian/openssh-client-udeb/DEBIAN/isinstallable |
280 | dh_shlibdeps | 275 | dh_shlibdeps |
281 | dh_gencontrol -- -fdebian/files~ | 276 | dh_gencontrol |
282 | dpkg-distaddfile $(CLIENT_UDEB) debian-installer optional | 277 | dh_md5sums |
283 | dh_builddeb --filename=$(CLIENT_UDEB) | 278 | dh_builddeb |
284 | 279 | ||
285 | binary-openssh-server-udeb: DH_OPTIONS=-popenssh-server-udeb | 280 | binary-openssh-server-udeb: DH_OPTIONS=-popenssh-server-udeb |
286 | binary-openssh-server-udeb: build install | 281 | binary-openssh-server-udeb: build install |
@@ -291,9 +286,9 @@ binary-openssh-server-udeb: build install | |||
291 | dh_fixperms | 286 | dh_fixperms |
292 | dh_installdeb | 287 | dh_installdeb |
293 | dh_shlibdeps | 288 | dh_shlibdeps |
294 | dh_gencontrol -- -fdebian/files~ | 289 | dh_gencontrol |
295 | dpkg-distaddfile $(SERVER_UDEB) debian-installer optional | 290 | dh_md5sums |
296 | dh_builddeb --filename=$(SERVER_UDEB) | 291 | dh_builddeb |
297 | 292 | ||
298 | binary: binary-indep binary-arch | 293 | binary: binary-indep binary-arch |
299 | 294 | ||