Merge lp:~scarneiro/ubuntu/oneiric/geoip/fix-for-824673 into lp:ubuntu/oneiric/geoip

[Sebastian Carneiro]

added libtool and dh-autoreconf to build depends, and autoreconf rules to debian/rules, to fix FTBFS

[Colin Watson (cjwatson)]

Pretty near to what I was about to do myself before I noticed this merge request. Thanks! Could you also forward this as a Debian bug report?

review: Approve

[Colin Watson (cjwatson)]

(Oh, and I'll correct "natty" in the changelog to "oneiric".)

[Sebastian Carneiro (scarneiro)]

Thanks Colin! I will forward it to Debian.

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-25 14:00:58 +0000
+++ debian/changelog	2011-08-13 14:55:23 +0000
@@ -1,3 +1,13 @@
+geoip (1.4.8+dfsg-1ubuntu1) natty; urgency=low
+
+  * Fix FTBFS because of misconfigured libtool library (LP: #824673)
+    - debian/control: added libtool and dh-autoreconf to build
+      dependencies.
+    - debian/rules: include autoreconf rules to reconfigure
+      sources properly.
+
+ -- Sebastian Carneiro <[e-mail]>  Sat, 13 Aug 2011 10:52:40 -0300
+
 geoip (1.4.8+dfsg-1) unstable; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2011-04-30 16:12:59 +0000
+++ debian/control	2011-08-13 14:55:23 +0000
@@ -2,12 +2,15 @@
 Section: net
 Priority: optional
 Homepage: http://www.maxmind.com/
-Maintainer: Patrick Matthäi <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Patrick Matthäi <[e-mail]>
 Build-Depends: debhelper (>= 7),
  cdbs,
  chrpath,
  zlib1g-dev,
  autotools-dev,
+ libtool,
+ dh-autoreconf,
  hardening-wrapper
 Standards-Version: 3.9.2
 
 
=== modified file 'debian/rules'
--- debian/rules	2011-04-30 16:12:59 +0000
+++ debian/rules	2011-08-13 14:55:23 +0000
@@ -2,8 +2,9 @@
 
 export DEB_BUILD_HARDENING=1
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
+include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
 
 # Add here any variable or target overrides you need.
 DEB_CONFIGURE_SYSCONFDIR := /etc