Copy up to date config.{sub,guess} files to the source directory.

Added autotools-dev build dependency.

diff --git a/debian/control b/debian/control
index e16a4c5ed463db53447ef4aa5f49925cb7b9cec8..41bbd4563956515bc2006d80de2185b6e1ef2d03 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cadaver
 Section: web
 Priority: optional
 Maintainer: Sebastian Harl <sh@tokkee.org>
-Build-Depends: debhelper (>= 5), libncurses5-dev, libxml2-dev | libxml-dev, libreadline5-dev, zlib1g-dev (>= 1:1.1.3), libneon26-gnutls-dev, dpatch
+Build-Depends: debhelper (>= 5), autotools-dev, libncurses5-dev, libxml2-dev | libxml-dev, libreadline5-dev, zlib1g-dev (>= 1:1.1.3), libneon26-gnutls-dev, dpatch
 Standards-Version: 3.7.2
 
 Package: cadaver

diff --git a/debian/rules b/debian/rules
index bf9b99e50f5261160ccfa5bfd20b64064e98e562..9dac3b7f1c13d365b657a0f6f2f4127e466f6624 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,12 @@ include /usr/share/dpatch/dpatch.make
 
 $(BUILDDIR)/config.status: configure
        dh_testdir
+       
+       for file in config.guess config.sub; do \
+               mv $$file $$file.upstream; \
+               ln -s /usr/share/misc/$$file .; \
+       done
+       
        [ -e $(BUILDDIR) ] || mkdir $(BUILDDIR)
        cd $(BUILDDIR) && CFLAGS="$(CFLAGS)" ../../configure \
                        --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -49,6 +55,13 @@ clean: unpatch
        
        rm -rf $(BUILDDIR)
        
+       for file in config.guess config.sub; do \
+               if [ -e $$file.upstream ]; then \
+                       rm -f $$file; \
+                       mv $$file.upstream $$file; \
+               fi \
+       done
+       
        dh_clean
 
 install: build