[Python-modules-commits] r30456 - in packages/mod-wsgi/trunk/debian (6 files)

Mon Sep 1 21:12:46 UTC 2014

Date: Monday, September 1, 2014 @ 21:12:45
  Author: fgeyer
Revision: 30456

Shorten the rules file using the dh(1) helper.

Added:
  packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.install
  packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.install
Modified:
  packages/mod-wsgi/trunk/debian/changelog
  packages/mod-wsgi/trunk/debian/compat
  packages/mod-wsgi/trunk/debian/control
  packages/mod-wsgi/trunk/debian/rules

Modified: packages/mod-wsgi/trunk/debian/changelog
===================================================================

--- packages/mod-wsgi/trunk/debian/changelog	2014-09-01 20:41:55 UTC (rev 30455)
+++ packages/mod-wsgi/trunk/debian/changelog	2014-09-01 21:12:45 UTC (rev 30456)
@@ -1,3 +1,9 @@
+mod-wsgi (4.2.7-2) UNRELEASED; urgency=medium
+
+  * Shorten the rules file using the dh(1) helper.
+
+ -- Felix Geyer <fgeyer at debian.org>  Mon, 01 Sep 2014 22:26:37 +0200
+
 mod-wsgi (4.2.7-1) unstable; urgency=medium
 
   * New upstream release. 

Modified: packages/mod-wsgi/trunk/debian/compat
===================================================================
--- packages/mod-wsgi/trunk/debian/compat	2014-09-01 20:41:55 UTC (rev 30455)
+++ packages/mod-wsgi/trunk/debian/compat	2014-09-01 21:12:45 UTC (rev 30456)
@@ -1 +1 @@
-5
+9

Modified: packages/mod-wsgi/trunk/debian/control
===================================================================
--- packages/mod-wsgi/trunk/debian/control	2014-09-01 20:41:55 UTC (rev 30455)
+++ packages/mod-wsgi/trunk/debian/control	2014-09-01 21:12:45 UTC (rev 30456)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bzed at debian.org>, Felix Geyer <fgeyer at debian.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.16.1~), python-all-dev, python3-all-dev, apache2-dev (>= 2.4), dh-autoreconf
+Build-Depends: debhelper (>= 9), python-all-dev, python3-all-dev, apache2-dev (>= 2.4), dh-autoreconf
 Homepage: http://www.modwsgi.org/
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/mod-wsgi/trunk/

Added: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.install
===================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.install	                        (rev 0)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi-py3.install	2014-09-01 21:12:45 UTC (rev 30456)
@@ -0,0 +1 @@
+debian/libapache2-mod-wsgi-py3.rtupdate usr/share/python3/runtime.d/

Added: packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.install
===================================================================
--- packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.install	                        (rev 0)
+++ packages/mod-wsgi/trunk/debian/libapache2-mod-wsgi.install	2014-09-01 21:12:45 UTC (rev 30456)
@@ -0,0 +1 @@
+debian/libapache2-mod-wsgi.rtupdate usr/share/python/runtime.d/

Modified: packages/mod-wsgi/trunk/debian/rules
===================================================================
--- packages/mod-wsgi/trunk/debian/rules	2014-09-01 20:41:55 UTC (rev 30455)
+++ packages/mod-wsgi/trunk/debian/rules	2014-09-01 21:12:45 UTC (rev 30456)
@@ -2,9 +2,6 @@
 
 PACKAGE=libapache2-mod-wsgi
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 APXS2=/usr/bin/apxs2
 PYVERS=$(shell pyversions -vs)
 PYDEFAULT=$(shell pyversions -dv)
@@ -16,81 +13,46 @@
 PY3MAX=$(shell echo $(PY3VERS) | LANG=C awk '{print $$NF+0.1}')
 pkgdir = $(CURDIR)/debian/$(PACKAGE)$(if $(patsubst 3.%,,$(1)),,-py3)
 
-DPKG_EXPORT_BUILDFLAGS=1
-include /usr/share/dpkg/buildflags.mk
+%:
+	dh $@ --parallel --with autoreconf,apache2
 
-autoreconf-stamp:
-	dh_autoreconf
-	touch $@
-
 build-%/config.status:
-	dh_testdir
 	mkdir -p build-$*
 	find . -mindepth 1 -maxdepth 1 -name 'debian' -o -name 'build-*' -o -exec cp -r {} build-$* \;
-	cd build-$* && ./configure --with-apxs=$(APXS2) \
-	            --with-python=/usr/bin/python$*
+	dh_auto_configure -Bbuild-$* -- --with-apxs=$(APXS2) --with-python=/usr/bin/python$* 
 
-build-%/build-stamp: build-%/config.status
-	dh_testdir
-	$(MAKE) -C build-$*
+build-%/build-stamp:
+	dh_auto_build -Bbuild-$*
 	touch $@
 
-build: build-arch
-build-arch: autoreconf-stamp $(PYVERS:%=build-%/build-stamp) $(PY3VERS:%=build-%/build-stamp)
-build-indep:
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf build-*
-	dh_autoreconf_clean
-	dh_clean
-	rm -f autoreconf-stamp
-
-install-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-install-%: build-%/build-stamp
-	$(MAKE) -C build-$* DESTDIR=$(call pkgdir,$*) install
+install-%:
+	dh_auto_install -Bbuild-$* -- DESTDIR=$(call pkgdir,$*)
 	mv $(call pkgdir,$*)/usr/lib/apache2/modules/mod_wsgi.so \
 		$(call pkgdir,$*)/usr/lib/apache2/modules/mod_wsgi.so-$*
 
-install: build install-clean $(PYVERS:%=install-%) $(PY3VERS:%=install-%)
+override_dh_auto_configure: $(PYVERS:%=build-%/config.status) $(PY3VERS:%=build-%/config.status)
 
-# Build architecture-independent files here.
-binary-indep: build install
+override_dh_auto_build: $(PYVERS:%=build-%/build-stamp) $(PY3VERS:%=build-%/build-stamp)
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
+override_dh_auto_install: $(PYVERS:%=install-%) $(PY3VERS:%=install-%)
+
+override_dh_auto_clean:
+	rm -rf build-*
+
+override_dh_install:
 	dh_install
-	dh_apache2
-	install -d -m 755 debian/$(PACKAGE)/usr/share/python/runtime.d
-	install -d -m 755 debian/$(PACKAGE)-py3/usr/share/python3/runtime.d
-	install -m 755 debian/$(PACKAGE).rtupdate debian/$(PACKAGE)/usr/share/python/runtime.d/
-	install -m 755 debian/$(PACKAGE)-py3.rtupdate debian/$(PACKAGE)-py3/usr/share/python3/runtime.d/
-	dh_installman
+	chmod 755 debian/$(PACKAGE)/usr/share/python/runtime.d/libapache2-mod-wsgi.rtupdate
+	chmod 755 debian/$(PACKAGE)-py3/usr/share/python3/runtime.d/libapache2-mod-wsgi-py3.rtupdate
+
+override_dh_link:
 	dh_link -p $(PACKAGE) /usr/lib/apache2/modules/mod_wsgi.so-$(PYDEFAULT) usr/lib/apache2/modules/mod_wsgi.so
 	dh_link -p $(PACKAGE)-py3 /usr/lib/apache2/modules/mod_wsgi.so-$(PY3DEFAULT) usr/lib/apache2/modules/mod_wsgi.so
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
+	dh_link --remaining-packages
+
+override_dh_gencontrol:
 	# Generate dependencies manually as there are no public modules
 	echo 'python:Depends=python (>= $(PYMIN)), python (<< $(PYMAX))' \
 	     >> $(CURDIR)/debian/$(PACKAGE).substvars
 	echo 'python3:Depends=python3 (>= $(PY3MIN)), python3 (<< $(PY3MAX))' \
 	     >> $(CURDIR)/debian/$(PACKAGE)-py3.substvars
 	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install


