r71458 - in /trunk/libapache2-mod-perl2/debian: changelog clean control rules

Tue Mar 15 15:35:54 UTC 2011

Author: periapt-guest
Date: Tue Mar 15 15:35:42 2011
New Revision: 71458

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=71458
Log:
TODO:
- not yet getting a clean build
- Upgrade standards version
- Clean lintian
- Upgrade version
- Check copright
* Refreshed debian/rules (in progress)

Added:
    trunk/libapache2-mod-perl2/debian/clean
Modified:
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/control
    trunk/libapache2-mod-perl2/debian/rules

Modified: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/changelog?rev=71458&op=diff
==============================================================================

--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Tue Mar 15 15:35:42 2011
@@ -1,7 +1,15 @@
 libapache2-mod-perl2 (2.0.4-8) UNRELEASED; urgency=low
+
+  TODO:
+  - not yet getting a clean build
+  - Upgrade standards version
+  - Clean lintian
+  - Upgrade version
+  - Check copright
 
   * Added myself to Uploaders
   * Upped debian compatibility level to 7 and removed quilt cruft
+  * Refreshed debian/rules (in progress)
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Tue, 15 Mar 2011 11:00:11 +0000
 

Added: trunk/libapache2-mod-perl2/debian/clean
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/clean?rev=71458&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/clean (added)
+++ trunk/libapache2-mod-perl2/debian/clean Tue Mar 15 15:35:42 2011
@@ -1,0 +1,8 @@
+.mypacklist
+Apache-Test/Makefile.old
+Apache-Test/t/REPORT
+Apache-Test/t/cgi-bin/cookies.pl
+Apache-Test/t/cgi-bin/next_available_port.pl
+ModPerl-Registry/Makefile.old t/conf/perlsection.conf
+t/htdocs/perlio/test
+Makefile

Modified: trunk/libapache2-mod-perl2/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/control?rev=71458&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/control (original)
+++ trunk/libapache2-mod-perl2/debian/control Tue Mar 15 15:35:42 2011
@@ -11,8 +11,8 @@
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libapache2-mod-perl2/
 Build-Depends: perl (>= 5.8.7-3), libperl-dev (>= 5.8.7-3),
  apache2-threaded-dev (>= 2.2.3) | apache2-prefork-dev (>= 2.2.3),
- debhelper (>= 7), libwww-perl, libdevel-symdump-perl, libhtml-parser-perl,
- libgdbm-dev, libgtop2-dev, apache2, libcompress-zlib-perl,
+ debhelper (>= 7.0.50~), libwww-perl, libdevel-symdump-perl,
+ libhtml-parser-perl, libgdbm-dev, libgtop2-dev, apache2, libcompress-zlib-perl,
  libbsd-resource-perl, locales-all, netbase,
  perl (>= 5.10.0-14) | libcgi-pm-perl (>= 3.33)
 Build-Conflicts: libapache2-mod-perl2 (<= 1.999.22-1)

Modified: trunk/libapache2-mod-perl2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/rules?rev=71458&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/rules (original)
+++ trunk/libapache2-mod-perl2/debian/rules Tue Mar 15 15:35:42 2011
@@ -1,20 +1,8 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/quilt/quilt.make
-
-# If set to a true value then MakeMaker's prompt function will
-# always return the default without waiting for user input.
-export PERL_MM_USE_DEFAULT=1
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP     =$(CURDIR)/debian/tmp
-LA2MP2  =$(CURDIR)/debian/libapache2-mod-perl2
+PKG  := $(shell dh_listpackages)
+TMP  := $(CURDIR)/debian/$(PKG)
+BUILDHOME := $(CURDIR)/debian/build
 
 # Allow disabling build optimation by setting noopt in
 # $DEB_BUILD_OPTIONS
@@ -25,12 +13,23 @@
         CFLAGS += -O2
 endif
 
-.PHONY: build
-build: build-stamp
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
 
-build-stamp: $(QUILT_STAMPFN)
+ifndef PERL
+PERL = /usr/bin/perl
+endif
+
+ifndef MAKE
+PERL = /usr/bin/make
+endif
+
+%:
+	dh $@
+
+override_dh_auto_configure:
 	dh_testdir
-
 	# Add commands to compile the package here
 	$(PERL) Makefile.PL \
 		INSTALLDIRS=vendor \
@@ -44,89 +43,18 @@
 		MP_INCLUDE_DIR=/usr/include/apr-1.0
 	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+#	ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+#	endif
+override_dh_auto_test:
 	APACHE_TEST_EXTRA_ARGS="-httpd_conf /etc/apache2/apache2.conf" LANG=C $(MAKE) test
-endif
 
-	touch $@
+override_dh_clean:
+	dh_clean
+	rm -rf t/htdocs/hooks lib/Apache WrapXS
 
-.PHONY: clean
-clean: unpatch
-	dh_testdir
-	dh_testroot
+override_dh_install:
+	dh_install
+	mv $(TMP)/usr/bin/mp2bug $(TMP)/usr/share/libapache2-mod-perl2/
+	rm -rf $(TMP)/usr/bin/
+	install -m755 debian/libapache2-mod-perl2.bug $(TMP)/usr/share/bug/libapache2-mod-perl2
 
-	dh_clean build-stamp install-stamp
-
-	# Add commands to clean up after the build process here
-
-	# unpatch modifies Makefile.PL, rendering Makefile out of date
-	if [ -f Makefile ] ; then touch Makefile && $(MAKE) realclean ; fi
-
-	dh_clean .mypacklist Apache-Test/Makefile.old Apache-Test/t/REPORT \
-		 Apache-Test/t/cgi-bin/cookies.pl \
-		 Apache-Test/t/cgi-bin/next_available_port.pl\
-		 ModPerl-Registry/Makefile.old t/conf/perlsection.conf \
-		 t/htdocs/perlio/test
-	[ ! -d t/htdocs/hooks ] || rm -r t/htdocs/hooks
-	[ ! -d lib/Apache ] || rm -r lib/Apache
-	[ ! -d WrapXS ] || rm -r WrapXS
-
-.PHONY: install
-install: install-stamp
-
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-
-	# As this is a architecture dependent package, we are not
-	# supposed to install stuff to /usr/share. MakeMaker creates
-	# the dirs, we delete them from the deb:
-	[ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5
-
-	touch $@
-
-.PHONY: binary-indep
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installexamples -i
-	dh_installdocs -i
-	dh_installchangelogs -i Changes
-	dh_install -i
-	dh_perl -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-.PHONY: binary-arch
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdirs -a
-	dh_installexamples -a
-	dh_installdocs -a
-	dh_installchangelogs -a Changes
-	dh_install -a
-	mv $(LA2MP2)/usr/bin/mp2bug $(LA2MP2)/usr/share/libapache2-mod-perl2/
-	rmdir --ignore-fail-on-non-empty --parents $(LA2MP2)/usr/bin/
-	install -m755 debian/libapache2-mod-perl2.bug $(LA2MP2)/usr/share/bug/libapache2-mod-perl2
-	dh_shlibdeps -a
-	dh_strip -a
-	dh_perl -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-.PHONY: binary
-binary: binary-indep binary-arch


