diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-08 00:50:42 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-08 00:50:42 +0100 |
| commit | f1cea66ac5fcd860b2702e6b8ab01fcb79179bd4 (patch) | |
| tree | 6534bd6195bb00a26518ff268bacaf8d40ce98aa | |
| parent | 6ef906557277b71fc278e3f612542bd4d7d75ab5 (diff) | |
| parent | 560d0a0c4cc61e8ed68a80a04491af024254684c (diff) | |
Merging Debian fixes that I missed in the previous merge.
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 12 |
3 files changed, 10 insertions, 6 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 f2ede2cf..9736e078 100755 --- a/debian/rules +++ b/debian/rules @@ -27,6 +27,8 @@ build-stamp: ROOT=$$PWD; cd debian/build-libpurple; $(BITLBEE_CONFIGURE_VERSION) $$ROOT/configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --purple=1 $(BITLBEE_CONFIGURE_FLAGS) $(MAKE) -C debian/build-libpurple + $(MAKE) -C doc + touch build-stamp clean: @@ -42,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 @@ -60,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) @@ -75,11 +80,10 @@ endif dh_fixperms dh_installdeb ifeq ($(DH_OPTIONS),-a) - cp -a debian/bitlbee/DEBIAN/{post,pre}* debian/bitlbee-libpurple/DEBIAN + cp -a debian/bitlbee/DEBIAN/post* debian/bitlbee/DEBIAN/pre* debian/bitlbee-libpurple/DEBIAN 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/+[^+]*$$//') |