diff options
author | ulim <a.sporto+bee@gmail.com> | 2008-04-14 15:10:53 +0200 |
---|---|---|
committer | ulim <a.sporto+bee@gmail.com> | 2008-04-14 15:10:53 +0200 |
commit | b79308b943149d729b1daea8c56cff9fc02711a0 (patch) | |
tree | a5f80445ed63d864703941474dc6cf8998df3136 /debian/rules | |
parent | 6cac643f6933e431b90fcb937dec505f989e6a53 (diff) | |
parent | aa311173a85020bcbbbf61135a5451e171d422f5 (diff) |
merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules index 8d6bd4fa..252fb742 100755 --- a/debian/rules +++ b/debian/rules @@ -2,15 +2,18 @@ DEBUG ?= 0 +ifdef BITLBEE_VERSION +BITLBEE_FORCE_VERSION=1 +else # Want to use the full package version number instead of just the release. BITLBEE_VERSION ?= "$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}')" export BITLBEE_VERSION - +endif build-arch: build-arch-stamp build-arch-stamp: if [ ! -d debian ]; then exit 1; fi - ./configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee $(DEB_BUILD_OPTIONS) + ./configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent $(MAKE) # $(MAKE) -C doc/ all touch build-arch-stamp @@ -65,7 +68,7 @@ binary-arch: build-arch install-arch cd debian/bitlbee; \ find usr -type f -exec md5sum {} \; > DEBIAN/md5sums dpkg-shlibdeps -Tdebian/bitlbee.substvars -dDepends debian/bitlbee/usr/sbin/bitlbee -ifdef BITLBEE_VERSION +ifdef BITLBEE_FORCE_VERSION dpkg-gencontrol -ldebian/changelog -isp -pbitlbee -Tdebian/bitlbee.substvars -Pdebian/bitlbee -v1:$(BITLBEE_VERSION)-0 -V'debconf-depends=debconf (>= 1.2.0) | debconf-2.0' else dpkg-gencontrol -ldebian/changelog -isp -pbitlbee -Tdebian/bitlbee.substvars -Pdebian/bitlbee -V'debconf-depends=debconf (>= 1.2.0) | debconf-2.0' |