[Python-modules-commits] r24557 - in packages/libapache2-mod-python/trunk/debian (7 files)

Sun May 26 14:46:07 UTC 2013

Date: Sunday, May 26, 2013 @ 14:46:04
  Author: adejong
Revision: 24557

  * Switch to dh-style debian/rules.
  * Switch to debhelper compatibility level 9.
  * Update 02_makefile.patch to add --install-layout=deb to the setup.py
    call.

Added:
  packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.install
Modified:
  packages/libapache2-mod-python/trunk/debian/changelog
  packages/libapache2-mod-python/trunk/debian/compat
  packages/libapache2-mod-python/trunk/debian/control
  packages/libapache2-mod-python/trunk/debian/patches/02_makefile.patch
  packages/libapache2-mod-python/trunk/debian/rules
Deleted:
  packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.dirs

Modified: packages/libapache2-mod-python/trunk/debian/changelog
===================================================================

--- packages/libapache2-mod-python/trunk/debian/changelog	2013-05-26 14:24:32 UTC (rev 24556)
+++ packages/libapache2-mod-python/trunk/debian/changelog	2013-05-26 14:46:04 UTC (rev 24557)
@@ -12,11 +12,15 @@
   * Switch from dpatch to source format 3.0 (quilt).
   * Dropped obsolete patch 03_includes.patch: long since been fixed in
     mod_python.
+  * Switch to dh-style debian/rules.
+  * Switch to debhelper compatibility level 9.
+  * Update 02_makefile.patch to add --install-layout=deb to the setup.py
+    call.
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Arthur de Jong <adejong at debian.org>  Sun, 26 May 2013 16:20:40 +0200
+ -- Arthur de Jong <adejong at debian.org>  Sun, 26 May 2013 16:45:28 +0200
 
 libapache2-mod-python (3.3.1-9) unstable; urgency=low
 

Modified: packages/libapache2-mod-python/trunk/debian/compat
===================================================================
--- packages/libapache2-mod-python/trunk/debian/compat	2013-05-26 14:24:32 UTC (rev 24556)
+++ packages/libapache2-mod-python/trunk/debian/compat	2013-05-26 14:46:04 UTC (rev 24557)
@@ -1 +1 @@
-5
+9

Modified: packages/libapache2-mod-python/trunk/debian/control
===================================================================
--- packages/libapache2-mod-python/trunk/debian/control	2013-05-26 14:24:32 UTC (rev 24556)
+++ packages/libapache2-mod-python/trunk/debian/control	2013-05-26 14:46:04 UTC (rev 24557)
@@ -5,6 +5,7 @@
 Uploaders: Robert S. Edmonds <edmonds at debian.org>
 Build-Depends: debhelper (>= 9), dh-autoreconf, python-dev (>= 2.6.6-3~),
  apache2-threaded-dev
+X-Python-Version: 2.7
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/libapache2-mod-python/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/libapache2-mod-python/trunk/
 Homepage: http://www.modpython.org/

Deleted: packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.dirs
===================================================================
--- packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.dirs	2013-05-26 14:24:32 UTC (rev 24556)
+++ packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.dirs	2013-05-26 14:46:04 UTC (rev 24557)
@@ -1,2 +0,0 @@
-/usr/lib/apache2/modules
-/etc/apache2/mods-available

Added: packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.install
===================================================================
--- packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.install	                        (rev 0)
+++ packages/libapache2-mod-python/trunk/debian/libapache2-mod-python.install	2013-05-26 14:46:04 UTC (rev 24557)
@@ -0,0 +1,3 @@
+debian/python.load etc/apache2/mods-available/
+usr/lib/apache2/modules/mod_python.so
+usr/lib/python2*

Modified: packages/libapache2-mod-python/trunk/debian/patches/02_makefile.patch
===================================================================
--- packages/libapache2-mod-python/trunk/debian/patches/02_makefile.patch	2013-05-26 14:24:32 UTC (rev 24556)
+++ packages/libapache2-mod-python/trunk/debian/patches/02_makefile.patch	2013-05-26 14:46:04 UTC (rev 24557)
@@ -8,7 +8,7 @@
  		$(PYTHON_BIN) setup.py install --optimize 2 --force ; \
  	else \
 -		$(PYTHON_BIN) setup.py install --optimize 2 --force --root $(DESTDIR) ; \
-+		$(PYTHON_BIN) setup.py install --force --root $(DESTDIR) --no-compile ; \
++		$(PYTHON_BIN) setup.py install --install-layout=deb --force --root $(DESTDIR) --no-compile ; \
  	fi
  
  mod_python.so:

Modified: packages/libapache2-mod-python/trunk/debian/rules
===================================================================
--- packages/libapache2-mod-python/trunk/debian/rules	2013-05-26 14:24:32 UTC (rev 24556)
+++ packages/libapache2-mod-python/trunk/debian/rules	2013-05-26 14:46:04 UTC (rev 24557)
@@ -1,105 +1,12 @@
 #!/usr/bin/make -f
-# debian/rules for Apache mod_python 3
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Copyright (c) 2003 Peter Hawkins
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PYVER=$(shell pyversions -d)
+PYTHON=$(shell pyversions -d)
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
+%:
+	dh $@ --with autoreconf,python2
 
-	# Don't configure here (see install)
-#	-./configure --enable-EAPI --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-	touch $@
 
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-
-	# Add here commands to compile the package.
-	# Don't build it here, see install
-	#$(MAKE)
-	#/usr/bin/docbook-to-man debian/libapache-mod-python.sgml > libapache-mod-python.1
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.log configure src/include/mod_python.h
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/libapache-mod-python.
-	#$(MAKE) install DESTDIR=$(CURDIR)/debian/libapache-mod-python
-
-	autoconf
-
-	rm -f config.cache config.status
-	export PYTHON_BIN=/usr/bin/python
-	-env PYTHON_BIN=/usr/bin/python \
-	./configure --with-apxs=/usr/bin/apxs2 --prefix=/usr \
-		--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-		--with-python=$(PYVER)
-	$(MAKE) clean && DEB_DEFINES="-DLONG_LONG=PY_LONG_LONG" $(MAKE)
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/libapache2-mod-python
-	cp debian/python.load debian/libapache2-mod-python/etc/apache2/mods-available/
-
-
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installmenu -i
-	dh_installcron -i
-	dh_installinfo -i
-	dh_installchangelogs -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_shlibdeps -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_python2 -plibapache2-mod-python --no-guessing-versions
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installmenu -a
-	dh_installcron -a
-	dh_installinfo -a
-	dh_installchangelogs -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	# You may want to make some executables suid here.
-#	dh_suidregister
-#	dh_makeshlibs
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_configure:
+	dh_auto_configure -- --with-apxs=/usr/bin/apxs2 --with-python=$(PYTHON)


