Merge branch 'wheezy' into wheezy-backports

Conflicts:
	debian/changelog
	debian/rules
This commit is contained in:
Marco d'Itri 2014-08-02 03:47:34 +02:00
commit 4b6a932601
2 changed files with 8 additions and 0 deletions

6
debian/changelog vendored
View File

@ -36,6 +36,12 @@ whois (5.1.2) unstable; urgency=medium
-- Marco d'Itri <md@linux.it> Fri, 02 May 2014 04:15:08 +0200
whois (5.1.1~deb7u1) proposed-updates; urgency=low
* Rebuilt for wheezy.
-- Marco d'Itri <md@linux.it> Sat, 11 Jan 2014 03:16:43 +0100
whois (5.1.1) unstable; urgency=medium
* Added the servers for 29 "new" gTLDs.

2
debian/rules vendored
View File

@ -13,6 +13,8 @@ DPKG_EXPORT_BUILDFLAGS = 1
D := $(CURDIR)/debian/whois
VERSION := $(shell dpkg-parsechangelog | sed -rn 's/(~deb|~?ubuntu)[0-9]*.*$$//; s/\+.*$$//; /^Version/s/.* //p')
build:
dh_testdir
$(MAKE) CONFIG_FILE="/etc/whois.conf" HAVE_LIBIDN=1 HAVE_ICONV=1