diff -Nru --exclude '*.po' whois-5.0.5/debian/changelog whois-5.0.5ubuntu1/debian/changelog --- whois-5.0.5/debian/changelog 2010-05-23 03:20:55.000000000 +0200 +++ whois-5.0.5ubuntu1/debian/changelog 2010-06-05 16:34:51.000000000 +0200 @@ -1,3 +1,12 @@ +whois (5.0.5ubuntu1) maverick; urgency=low + + * Merge from debian unstable. (LP: #590111) Remaining changes: + - debian/control, debian/mkpasswd.install, debian/whois.install + debian/rules: Split out mkpasswd and whois. (LP: #284416) + * Not updating config.h anymore, as its not needed anymore (see 5.0.3 changelog) + + -- Jean-Louis Dupond Tue, 25 May 2010 08:24:07 +0100 + whois (5.0.5) unstable; urgency=medium * Added the .xn--p1ai (.рф, Russian Federation) TLD server. @@ -24,6 +33,16 @@ -- Marco d'Itri Thu, 06 May 2010 23:51:11 +0200 +whois (5.0.2ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: + - Update config.h + - Update tld for gl. (LP: #518077) + - debian/control, debian/mkpasswd.install, debian/whois.install + debian/rules: Split out mkpasswd and whois. (LP: #284416) + + -- Chuck Short Wed, 05 May 2010 03:33:10 +0100 + whois (5.0.2) unstable; urgency=medium * Added new IPv4 allocations. @@ -43,6 +62,28 @@ -- Marco d'Itri Thu, 28 Jan 2010 00:55:22 +0100 +whois (5.0.0ubuntu3) lucid; urgency=low + + * Fix FTBFS caused by version string mismatch. + + -- Steve Langasek Fri, 19 Mar 2010 23:16:11 +0000 + +whois (5.0.0ubuntu2) lucid; urgency=low + + * Update tld for gl. (LP: #518077) + + -- Chuck Short Tue, 16 Mar 2010 11:16:13 -0400 + +whois (5.0.0ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - Update config.h + - Update .biz ignore string (LP: #453599) + - debian/control, debian/mkpasswd.install, debian/whois.install + debian/rules: Split out mkpasswd and whois. (LP: #284416) + + -- Chuck Short Mon, 04 Jan 2010 15:00:58 +0000 + whois (5.0.0) unstable; urgency=low * Added optional support for automatically transcoding the output of @@ -68,6 +109,29 @@ -- Marco d'Itri Mon, 07 Dec 2009 22:47:26 +0100 +whois (4.7.36ubuntu3) lucid; urgency=low + + * Fix FTBFS. + + -- Chuck Short Mon, 09 Nov 2009 14:42:54 -0500 + +whois (4.7.36ubuntu2) lucid; urgency=low + + * debian/control, debian/mkpasswd.install, debian/whois.install, + debian/rules, config.h: Split out mkpasswd and mkwhois (LP: #284416) + * debian/control: Bump Standards-Version to 3.8.3. + + -- Chuck Short Mon, 09 Nov 2009 14:12:15 -0500 + +whois (4.7.36ubuntu1) lucid; urgency=low + + * Merge from debian unstable, remaining changes: + - Update config.h. + - Update .biz ignore string (LP: #453599) + - Update maintainer according to spec. + + -- Chuck Short Wed, 21 Oct 2009 22:24:00 +0100 + whois (4.7.36) unstable; urgency=medium * Fixed the whois server for 182.0.0.0/7 added in 4.7.35. @@ -88,6 +152,18 @@ -- Marco d'Itri Wed, 12 Aug 2009 15:31:20 +0200 +whois (4.7.34ubuntu2) karmic; urgency=low + + * Update config.h's VERSION macro to fix FTBFS + + -- Daniel T Chen Sat, 17 Oct 2009 10:53:04 -0400 + +whois (4.7.34ubuntu1) karmic; urgency=low + + * Update .biz ignore string (LP: #453599) + + -- Chuck Short Fri, 16 Oct 2009 21:38:52 -0400 + whois (4.7.34) unstable; urgency=medium * Added new IPv4 allocations. @@ -1071,3 +1147,4 @@ * cryptpw become mkpasswd and now has a man page (closes: #46855). -- Marco d'Itri Sun, 3 Oct 1999 19:43:35 +0200 + diff -Nru --exclude '*.po' whois-5.0.5/debian/control whois-5.0.5ubuntu1/debian/control --- whois-5.0.5/debian/control 2010-02-06 18:58:47.000000000 +0100 +++ whois-5.0.5ubuntu1/debian/control 2010-05-25 09:24:07.000000000 +0200 @@ -1,7 +1,8 @@ Source: whois Section: net Priority: standard -Maintainer: Marco d'Itri +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Marco d'Itri Standards-Version: 3.8.4 Build-Depends: debhelper (>= 5), gettext, libidn11-dev @@ -14,5 +15,9 @@ programs. It is intelligent and can automatically select the appropriate whois server for most queries. - . - The package also contains mkpasswd, a features-rich front end to crypt(3). + +Package: mkpasswd +Architecture: any +Depends: ${shlibs:Depends} +Description: an intelligent crypt(3) interface + This is an interface to the crypt(3) interface to generate random passwords. diff -Nru --exclude '*.po' whois-5.0.5/debian/mkpasswd.install whois-5.0.5ubuntu1/debian/mkpasswd.install --- whois-5.0.5/debian/mkpasswd.install 1970-01-01 01:00:00.000000000 +0100 +++ whois-5.0.5ubuntu1/debian/mkpasswd.install 2009-11-09 20:43:57.000000000 +0100 @@ -0,0 +1,2 @@ +/usr/bin/mkpasswd +/usr/share/man/man1/mkpasswd.1.gz diff -Nru --exclude '*.po' whois-5.0.5/debian/rules whois-5.0.5ubuntu1/debian/rules --- whois-5.0.5/debian/rules 2010-05-06 23:40:02.000000000 +0200 +++ whois-5.0.5ubuntu1/debian/rules 2010-06-05 16:04:04.000000000 +0200 @@ -4,6 +4,7 @@ #export DH_VERBOSE=1 D := $(shell pwd)/debian/whois +W := $(shell pwd)/debian/mkpasswd VERSION := $(shell dpkg-parsechangelog | sed -n 's/ubuntu[0-9]*$$//; s/\+.*$$//; /^Version/s/.* //p') @@ -19,6 +20,7 @@ $(MAKE) distclean dh_clean +binary-arch: DH_OPTIONS= binary-arch: checkroot build dh_testdir dh_clean @@ -26,20 +28,23 @@ # sanity check egrep -q '^#define VERSION "$(VERSION)"$$' config.h - dh_installdirs usr/bin - install whois mkpasswd $D/usr/bin/ - cd po && $(MAKE) install BASEDIR=$D - dh_installman whois.1 mkpasswd.1 + mkdir -p $W/usr/bin + mkdir -p $D/usr/bin + + install whois $D/usr/bin/ + install mkpasswd $W/usr/bin + cd po && $(MAKE) install BASEDIR=$D && $(MAKE) install BASEDIR=$W + dh_installman -i -a dh_installdocs README - dh_installchangelogs - dh_strip - dh_compress - dh_fixperms - dh_shlibdeps - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb + dh_installchangelogs -i -a + dh_strip -i -a + dh_compress -i -a + dh_fixperms -i -a + dh_shlibdeps -i -a + dh_installdeb -i -a + dh_gencontrol -i -a + dh_md5sums -i -a + dh_builddeb -i -a binary: binary-arch diff -Nru --exclude '*.po' whois-5.0.5/debian/whois.install whois-5.0.5ubuntu1/debian/whois.install --- whois-5.0.5/debian/whois.install 1970-01-01 01:00:00.000000000 +0100 +++ whois-5.0.5ubuntu1/debian/whois.install 2009-11-09 20:43:57.000000000 +0100 @@ -0,0 +1,2 @@ +/usr/bin/whois +/usr/share/man/man1/whois.1.gz