From 512550e2b2c848364f22e57d79155ad8b4d0f366 Mon Sep 17 00:00:00 2001 From: Emmanuel Lacour Date: Wed, 18 Apr 2012 12:26:46 +0200 Subject: [PATCH] Concert package to 3.0 format (quilt) --- debian/compat | 2 +- debian/control | 2 +- debian/patches/00list | 2 - .../patches/{01_debian.dpatch => 01_debian.diff} | 8 +- .../patches/{02_libtool.dpatch => 02_libtool.diff} | 8 +- debian/patches/series | 2 + debian/rules | 90 ++++------------------ debian/source/format | 1 + 8 files changed, 23 insertions(+), 92 deletions(-) delete mode 100644 debian/patches/00list rename debian/patches/{01_debian.dpatch => 01_debian.diff} (73%) rename debian/patches/{02_libtool.dpatch => 02_libtool.diff} (99%) create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index b2a9bdc..c3829cc 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: suphp Section: httpd Priority: optional Maintainer: Emmanuel Lacour -Build-Depends: debhelper (>= 7), 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, dpatch Standards-Version: 3.8.2 Package: suphp-common diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 93625a9..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,2 +0,0 @@ -01_debian.dpatch -02_libtool.dpatch diff --git a/debian/patches/01_debian.dpatch b/debian/patches/01_debian.diff similarity index 73% rename from debian/patches/01_debian.dpatch rename to debian/patches/01_debian.diff index 40d6a4f..efd82e7 100755 --- a/debian/patches/01_debian.dpatch +++ b/debian/patches/01_debian.diff @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_debian.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Adapt to debian paths +From: +Subject: Adapt to debian paths -@DPATCH@ --- ./doc/suphp.conf-example +++ ./doc/suphp.conf-example @@ -1,12 +1,12 @@ diff --git a/debian/patches/02_libtool.dpatch b/debian/patches/02_libtool.diff similarity index 99% rename from debian/patches/02_libtool.dpatch rename to debian/patches/02_libtool.diff index db7843b..6dbfe3f 100755 --- a/debian/patches/02_libtool.dpatch +++ b/debian/patches/02_libtool.diff @@ -1,10 +1,6 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_libtool.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Libtool update +From: +Subject: Libtool update -@DPATCH@ --- ./aclocal.m4 +++ ./aclocal.m4 @@ -1,7 +1,7 @@ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..4d9d220 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +01_debian.diff +02_libtool.diff diff --git a/debian/rules b/debian/rules index 13f726b..da221d7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,28 +1,18 @@ #!/usr/bin/make -f +# -*- makefile -*- # Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +%: + dh $@ --with quilt - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -patch: - dpatch apply-all - -configure-apache2: patch - dh_testdir +override_dh_auto_configure: CPPFLAGS="`pkg-config --cflags apr-1`" ./configure --prefix=/usr \ --sysconfdir=/etc/suphp \ --with-apxs=/usr/bin/apxs2 \ @@ -33,33 +23,7 @@ configure-apache2: patch --with-logfile=/var/log/suphp/suphp.log -build-apache2: configure-apache2 - dh_testdir - $(MAKE) - -build: - -clean: - dh_testdir - dh_testroot - [ ! -f Makefile ] || $(MAKE) clean - rm -f config.log config.status src/config.h - rm -f libtool src/stamp-h - find . -name .libs | xargs rm -rf - find . -name .deps | xargs rm -rf - rm -f src/apache/mod_suphp.o src/apache/mod_suphp.lo src/apache/mod_suphp.la src/stamp-h1 - find . -name Makefile | xargs rm -f - dh_clean - dpatch deapply-all - rm -rf debian/patched - -install: build-apache2 - dh_testdir - dh_testroot - dh_prep - find -name ".svn" -type d | xargs rm -rf - find -name ".git" -type d | xargs rm -rf - dh_installdirs +override_dh_install: build-apache2 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 @@ -67,40 +31,14 @@ install: build-apache2 mv debian/libapache2-mod-suphp/usr/lib/apache2/modules/mod_suphp.so.0.0.0 debian/libapache2-mod-suphp/usr/lib/apache2/modules/mod_suphp.so -# Build architecture-independent files here. -binary-indep: -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: install - dh_testdir - dh_testroot -# dh_installdebconf +override_dh_installdocs: dh_installdocs mv debian/libapache2-mod-suphp/usr/share/doc/libapache2-mod-suphp/INSTALL debian/libapache2-mod-suphp/usr/share/doc/libapache2-mod-suphp/README -# dh_installexamples -# dh_installmenu - dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installman -# dh_installinfo + +override_dh_installchangelogs: dh_installchangelogs ChangeLog - dh_link - dh_strip - dh_compress + +override_dh_fixperms: dh_fixperms chmod u+s debian/suphp-common/usr/lib/suphp/suphp -# dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -binary: binary-indep binary-arch -.PHONY: configure build build-apache2 clean binary-indep binary-arch binary install patch diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 2.11.0