Fix mkinstalldirs quilt conversion

Fixe 3.0 package conversion

diff --git a/config/mkinstalldirs b/config/mkinstalldirs
deleted file mode 100644 (file)
index 4f58503..0000000
--- a/config/mkinstalldirs
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-         errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here

diff --git a/debian/control b/debian/control
index c3829cc..7e60a7d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: suphp
 Section: httpd
 Priority: optional
 Maintainer: Emmanuel Lacour <elacour@home-dn.net>
-Build-Depends: debhelper (>= 9), apache2-prefork-dev (>= 2.2.0), apache2-mpm-prefork (>= 2.2.0) | apache2-mpm-worker (>= 2.2.0), libapr1-dev, docbook-to-man, pkg-config, dpatch
+Build-Depends: debhelper (>= 9), apache2-prefork-dev (>= 2.2.0), apache2-mpm-prefork (>= 2.2.0) | apache2-mpm-worker (>= 2.2.0), libapr1-dev, docbook-to-man, pkg-config, dh-autoreconf
 Standards-Version: 3.8.2
 
 Package: suphp-common

diff --git a/debian/patches/series b/debian/patches/series
index d9ff04c..96e1900 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-03_mkinstalldirs.diff
 01_debian.diff
-02_libtool.diff
+03_mkinstalldirs.diff

diff --git a/debian/rules b/debian/rules
index da221d7..273ed03 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
 #export DH_VERBOSE=1
 
 %:
-       dh $@  --with quilt
+       dh $@  --with quilt,autotools-dev,autoreconf
 
 override_dh_auto_configure:
        CPPFLAGS="`pkg-config --cflags apr-1`" ./configure --prefix=/usr \
@@ -23,7 +23,7 @@ override_dh_auto_configure:
        --with-logfile=/var/log/suphp/suphp.log
 
 
-override_dh_install: build-apache2
+override_dh_install:
        dh_install
        docbook-to-man debian/suphp-common.manpage.sgml > debian/suphp-common/usr/share/man/man8/suphp.8
        install -m 644 debian/suphp-common.lintian-override debian/suphp-common/usr/share/lintian/overrides/suphp-common