Bug#684526: whois: Remove version check from debian/rules.

2012-09-17 Thread Chris J Arges
Package: whois
Version: 5.0.18
Followup-For: Bug #684526
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Here is an updated version of the patch which allows for Ubuntu patches,
and backports.
I've tested this with those types of packages and it works perfectly.
Thanks for considering the patch.

-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-23-lowlatency (SMP w/8 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru whois-5.0.18/debian/changelog whois-5.0.18ubuntu1/debian/changelog
diff -Nru whois-5.0.18/debian/rules whois-5.0.18ubuntu1/debian/rules
--- whois-5.0.18/debian/rules	2012-06-24 20:15:43.0 -0500
+++ whois-5.0.18ubuntu1/debian/rules	2012-09-17 10:23:01.0 -0500
@@ -6,7 +6,7 @@
 
 D := $(CURDIR)/debian/whois
 
-VERSION := $(shell dpkg-parsechangelog | sed -n 's/ubuntu[0-9]*.*$$//; s/\+.*$$//; /^Version/s/.* //p')
+VERSION := $(shell dpkg-parsechangelog | sed -n 's/~*ubuntu[0-9]*.*$$//; s/\+.*$$//; /^Version/s/.* //p')
 
 build:
 	dh_testdir



Bug#684526: whois: Remove version check from debian/rules.

2012-09-09 Thread Marco d'Itri
On Aug 10, Chris J Arges chris.j.ar...@canonical.com wrote:

 This would make it easier to handle backports and different strings,
 without having to change packaging each time. Otherwise I would be happy
 to write another patch to handle the new regex.
Please send a new regex.

-- 
ciao,
Marco


signature.asc
Description: Digital signature


Bug#684526: whois: Remove version check from debian/rules.

2012-08-10 Thread Chris J Arges
Package: whois
Version: 5.0.17
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Dear Marco,
There has been another change in how version strings for backports are
formatted in Ubuntu.
The last change did not account for this. Is it possible to remove this
check completely?
This would make it easier to handle backports and different strings,
without having to change packaging each time. Otherwise I would be happy
to write another patch to handle the new regex.

Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-27-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru whois-5.0.17/debian/changelog whois-5.0.17ubuntu1/debian/changelog
diff -Nru whois-5.0.17/debian/rules whois-5.0.17ubuntu1/debian/rules
--- whois-5.0.17/debian/rules	2012-06-24 20:15:43.0 -0500
+++ whois-5.0.17ubuntu1/debian/rules	2012-08-10 13:02:05.0 -0500
@@ -6,8 +6,6 @@
 
 D := $(CURDIR)/debian/whois
 
-VERSION := $(shell dpkg-parsechangelog | sed -n 's/ubuntu[0-9]*.*$$//; s/\+.*$$//; /^Version/s/.* //p')
-
 build:
 	dh_testdir
 	$(MAKE) CONFIG_FILE=/etc/whois.conf HAVE_LIBIDN=1 HAVE_ICONV=1
@@ -23,9 +21,6 @@
 	dh_testdir
 	dh_clean
 
-	# sanity check
-	egrep -q '^#define VERSION $(VERSION)$$' config.h
-
 	dh_installdirs usr/bin
 	$(MAKE) install BASEDIR=$D
 	dh_installman whois.1 mkpasswd.1