From 379c08a27e637dbcbbe3f39a8723daa765ad0e48 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Fri, 21 Mar 2008 00:27:24 +0000 Subject: Updated/Fixed Debian package. --- debian/rules | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 8d6bd4fa..0c757899 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 $(DEB_BUILD_OPTIONS) $(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' -- cgit v1.2.3 From 483f8dd1042e89e02a0eb736f65885e9f74a344d Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Mon, 24 Mar 2008 21:13:23 +0000 Subject: Removed DEB_BUILD_OPTIONS because it turns out this isn't just some string I can pass through to configure, there's an official policy on what can be in there exactly. (Or at least I found a suggested policy on the debian- policy mailing list.) 1.2-3, because I just uploaded -2 already. :-( --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 0c757899..252fb742 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ endif build-arch: build-arch-stamp build-arch-stamp: if [ ! -d debian ]; then exit 1; fi - ./configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent $(DEB_BUILD_OPTIONS) + ./configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent $(MAKE) # $(MAKE) -C doc/ all touch build-arch-stamp -- cgit v1.2.3