From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 31 Dec 2005 15:01:56 +0000 (+0000)
Subject: Fix build procedure; include full dependencies and run tests.
X-Git-Tag: 2.10-1~3
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=cb4add4d010dbef8ae5d4cef4d93913decfcb6bc;p=maypole.git

Fix build procedure; include full dependencies and run tests.
---

diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
index d180b31..11220ef 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Ben Hutchings <ben@decadentplace.org.uk>
 Section: perl
 Priority: extra
 Build-Depends-Indep: debhelper (>= 4), perl (>= 5.6.0-16),
- libclass-dbi-sqlite-perl
+ libapache-request-perl,
  libcgi-simple-perl,
  libcgi-untaint-perl,
  libclass-accessor-perl,
@@ -16,9 +16,13 @@ Build-Depends-Indep: debhelper (>= 4), perl (>= 5.6.0-16),
  libclass-dbi-pager-perl,
  libclass-dbi-perl,
  libclass-dbi-plugin-retrieveall-perl,
+ libclass-dbi-sqlite-perl,
  libdigest-perl,
  libtemplate-perl,
  libtemplate-plugin-class-perl,
+ libtest-mockmodule-perl,
+ libtest-pod-perl,
+ libtest-pod-coverage-perl,
  libuniversal-moniker-perl,
  libuniversal-require-perl,
  liburi-perl,
@@ -27,7 +31,28 @@ Standards-Version: 3.6.2
 
 Package: libmaypole-perl
 Architecture: all
-Depends: libapache-mod-perl | libapache2-mod-perl2, ${perl:Depends}
+Depends: ${perl:Depends},
+ libcgi-simple-perl,
+ libcgi-untaint-perl,
+ libclass-accessor-perl,
+ libclass-data-inheritable-perl,
+ libclass-dbi-abstractsearch-perl,
+ libclass-dbi-asform-perl,
+ libclass-dbi-fromcgi-perl,
+ libclass-dbi-loader-perl,
+ libclass-dbi-loader-relationship-perl,
+ libclass-dbi-pager-perl,
+ libclass-dbi-perl,
+ libclass-dbi-plugin-retrieveall-perl,
+ libclass-dbi-sqlite-perl,
+ libdigest-perl,
+ libtemplate-perl,
+ libtemplate-plugin-class-perl,
+ libuniversal-moniker-perl,
+ libuniversal-require-perl,
+ liburi-perl,
+ libwww-perl
+Recommends: libapache-mod-perl | libapache2-mod-perl2
 Description: Perl framework for MVC-oriented web applications
  Maypole is a Perl framework for MVC-oriented web applications, similar
  to Jakarta's Struts. Maypole is designed to minimize coding requirements
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index 864a189..2fd9adf
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,20 @@
 #!/usr/bin/make -f
 
-build :
+build : build-stamp
+
+build-stamp : Makefile.PL
 	perl Makefile.PL INSTALLDIRS=vendor
-	$(MAKE)
+	$(MAKE) test
+	touch build-stamp
 
 binary : binary-arch binary-indep
 
 binary-arch :
 
-binary-indep : build
+binary-indep : build-stamp
 	dh_testroot
-	mkdir -p -m755 debian/libmaypole-perl/usr/share/perl5
 	$(MAKE) PREFIX=$(CURDIR)/debian/libmaypole-perl/usr install
 	dh_perl
-	mkdir -p -m755 debian/libmaypole-perl/usr/share/doc/libmaypole-perl
 	dh_installchangelogs
 	dh_installdocs
 	dh_compress
@@ -23,6 +24,6 @@ binary-indep : build
 
 clean : 
 	if [ -f Makefile ]; then $(MAKE) clean; fi
-	dh_clean Makefile
+	dh_clean Makefile Makefile.old build-stamp
 
 .PHONY : build binary binary-arch binary-dep clean