diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-06 20:01:14 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-06 20:01:14 +0100 |
| commit | 560d0a0c4cc61e8ed68a80a04491af024254684c (patch) | |
| tree | d6422c96cfbf67163170cfcbd21bf760667fafb5 | |
| parent | bc49ec26b131054d8de5941e49cfce7e026a3941 (diff) | |
Some more fixes to make this work with older distros (Hardy's stuck with
debhelper 6) and on de code.b.o build bot (a substvars file I wasn't using
anymore caused troubles).
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/debian/compat b/debian/compat index 7f8f011e..1e8b3149 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +6 diff --git a/debian/control b/debian/control index 689f83f2..436bef6d 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Wilmer van der Gaast <wilmer@gaast.net> Uploaders: Jelmer Vernooij <jelmer@samba.org> Standards-Version: 3.8.4 -Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, debhelper (>= 7) +Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, debhelper (>= 6) Homepage: http://www.bitlbee.org/ Vcs-Bzr: http://code.bitlbee.org/bitlbee/ DM-Upload-Allowed: yes diff --git a/debian/rules b/debian/rules index a00fdedf..9736e078 100755 --- a/debian/rules +++ b/debian/rules @@ -44,7 +44,7 @@ clean: install: build dh_testdir dh_testroot - dh_prep + dh_clean -k dh_installdirs $(MAKE) -C debian/build-native install install-etc DESTDIR=`pwd`/debian/bitlbee @@ -62,9 +62,12 @@ binary-common: dh_testdir dh_testroot - dh_installdocs --link-doc=bitlbee-common dh_installchangelogs doc/CHANGES dh_installexamples + dh_installdocs #--link-doc=bitlbee-common + # TODO: Restore --link-doc up here and remove the hack below once + # Hardy and Lenny are deprecated. + for p in bitlbee bitlbee-libpurple bitlbee-dev; do rm -rf debian/$$p/usr/share/doc/$$p; ln -s bitlbee-common debian/$$p/usr/share/doc/$$p; done dh_installdebconf dh_installinit ifeq ($(DH_OPTIONS),-a) @@ -81,7 +84,6 @@ ifeq ($(DH_OPTIONS),-a) endif dh_shlibdeps ifdef BITLBEE_VERSION - echo source:Version=1:$(BITLBEE_VERSION)-0 > debian/substvars dh_gencontrol -- -v1:$(BITLBEE_VERSION)-0 -Vbee:Version=1:$(BITLBEE_VERSION)-0 else dh_gencontrol -- -Vbee:Version=$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}' | sed -e 's/+[^+]*$$//') |