[Python-modules-commits] r2908 - in /packages/mod-wsgi/trunk/debian: control copyright patches/00list patches/makefile-destdir.dpatch patches/umask-fix.dpatch rules

bzed-guest at users.alioth.debian.org bzed-guest at users.alioth.debian.org
Mon Jul 30 16:48:38 UTC 2007 

Author: bzed-guest
Date: Mon Jul 30 16:48:38 2007
New Revision: 2908

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2908
Log:
taking care of python versions,
bugfix patch from svn
and much more...

Added:
    packages/mod-wsgi/trunk/debian/patches/umask-fix.dpatch   (with props)
Modified:
    packages/mod-wsgi/trunk/debian/control
    packages/mod-wsgi/trunk/debian/copyright
    packages/mod-wsgi/trunk/debian/patches/00list
    packages/mod-wsgi/trunk/debian/patches/makefile-destdir.dpatch
    packages/mod-wsgi/trunk/debian/rules

Modified: packages/mod-wsgi/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/control?rev=2908&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/control (original)
+++ packages/mod-wsgi/trunk/debian/control Mon Jul 30 16:48:38 2007
@@ -3,11 +3,11 @@
 Priority: extra
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bernd at bzed.de>
-Build-Depends: debhelper (>= 5), autotools-dev
+Build-Depends: debhelper (>= 5), autotools-dev, python-dev, apache2-prefork-dev
 Standards-Version: 3.7.2
 
 Package: libapache2-mod-wsgi
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 Description: <insert up to 60 chars description>
  <insert long description, indented with spaces>

Modified: packages/mod-wsgi/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/copyright?rev=2908&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/copyright (original)
+++ packages/mod-wsgi/trunk/debian/copyright Mon Jul 30 16:48:38 2007
@@ -1,7 +1,7 @@
 This package was debianized by Bernd Zeimetz <bernd at bzed.de> on
 Mon, 30 Jul 2007 16:22:40 +0200.
 
-It was downloaded from http://code.google.com/p/modwsgi/
+It was downloaded from http://code.google.com/p/modwsgi/downloads/list
 
 Upstream Author(s): 
 

Modified: packages/mod-wsgi/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/patches/00list?rev=2908&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/patches/00list (original)
+++ packages/mod-wsgi/trunk/debian/patches/00list Mon Jul 30 16:48:38 2007
@@ -1,1 +1,2 @@
 makefile-destdir
+umask-fix

Modified: packages/mod-wsgi/trunk/debian/patches/makefile-destdir.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/patches/makefile-destdir.dpatch?rev=2908&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/patches/makefile-destdir.dpatch (original)
+++ packages/mod-wsgi/trunk/debian/patches/makefile-destdir.dpatch Mon Jul 30 16:48:38 2007
@@ -6,7 +6,7 @@
 @DPATCH@
 diff -urNad mod-wsgi~/Makefile-2.X.in mod-wsgi/Makefile-2.X.in
 --- mod-wsgi~/Makefile-2.X.in	2007-06-23 06:05:48.000000000 +0200
-+++ mod-wsgi/Makefile-2.X.in	2007-07-30 17:33:40.000000000 +0200
++++ mod-wsgi/Makefile-2.X.in	2007-07-30 18:34:58.000000000 +0200
 @@ -13,6 +13,8 @@
  #  limitations under the License.
  
@@ -16,11 +16,12 @@
  PYTHON=@PYTHON@
  
  CPPFLAGS = @CPPFLAGS@
-@@ -26,7 +28,7 @@
+@@ -26,7 +28,8 @@
  	$(APXS) -c $(CPPFLAGS) $(CFLAGS) mod_wsgi.c $(LDFLAGS) $(LDLIBS)
  
  install : all
 -	$(APXS) -i -n 'mod_wsgi' mod_wsgi.la
++	[ -d $(DESTDIR)$(APXS_LIBEXECDIR) ] || mkdir -p $(DESTDIR)$(APXS_LIBEXECDIR)
 +	$(APXS) -i -S LIBEXECDIR=$(DESTDIR)$(APXS_LIBEXECDIR) -n 'mod_wsgi' mod_wsgi.la
  
  clean :

Added: packages/mod-wsgi/trunk/debian/patches/umask-fix.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/patches/umask-fix.dpatch?rev=2908&op=file
==============================================================================
--- packages/mod-wsgi/trunk/debian/patches/umask-fix.dpatch (added)
+++ packages/mod-wsgi/trunk/debian/patches/umask-fix.dpatch Mon Jul 30 16:48:38 2007
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## umask-fix.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: bugfix from svn r391, see
+## DP: http://code.google.com/p/modwsgi/issues/detail?id=18
+## DP: for details
+
+ at DPATCH@
+diff -urNad mod-wsgi~/mod_wsgi.c mod-wsgi/mod_wsgi.c
+--- mod-wsgi~/mod_wsgi.c	2007-07-25 06:14:43.000000000 +0200
++++ mod-wsgi/mod_wsgi.c	2007-07-30 18:46:00.000000000 +0200
+@@ -5000,7 +5000,7 @@
+                 return "Invalid umask for WSGI daemon process.";
+ 
+             errno = 0;
+-            umask = strtol(value, (char **)&value, 7);
++            umask = strtol(value, (char **)&value, 8);
+ 
+             if (*value || errno == ERANGE || umask < 0)
+                 return "Invalid umask for WSGI daemon process.";

Propchange: packages/mod-wsgi/trunk/debian/patches/umask-fix.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/mod-wsgi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/rules?rev=2908&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/rules (original)
+++ packages/mod-wsgi/trunk/debian/rules Mon Jul 30 16:48:38 2007
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
+
+PACKAGE=libapache2-mod-wsgi
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -13,6 +15,8 @@
 include /usr/share/dpatch/dpatch.make
 
 APXS2=/usr/bin/apxs2
+PY_VERSION=$(shell dpkg -s python | grep ^Version | sed 's,Version: \([0-9]\.[0-9]\).*,\1,')
+PY_NEXT_VERSION=$(shell echo $(PY_VERSION) | awk '{ print (($1*10)+1)/10 }')
 
 CFLAGS = -Wall -g
 
@@ -28,6 +32,7 @@
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 	            --build=$(DEB_BUILD_GNU_TYPE) \
 	            --with-apxs=$(APXS2) \
+	            --with-python=/usr/bin/python$(PY_VERSION) \
 	            CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 
@@ -56,9 +61,8 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-
 	
-	$(MAKE) DESTDIR=$(CURDIR)/debian/libapache2-mod-wsgi install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/$(PACKAGE) install
 
 
 # Build architecture-independent files here.
@@ -73,7 +77,6 @@
 #	dh_install
 #	dh_installmenu
 	dh_installdebconf	
-#	dh_python
 	dh_installman
 	dh_link
 	dh_strip
@@ -81,6 +84,12 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
+	#We wan't to make sure that mod-wsgi depends on the default
+	#python version as most people won't take care of it.
+	#This way should ensure that the package is binNMU-able when
+	#Debian switches to a new default Py version.
+	echo 'python:Depends=python (>= $(PY_VERSION)), python (<< $(PY_NEXT_VERSION))' \
+	     > $(CURDIR)/debian/$(PACKAGE).substvars
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

More information about the Python-modules-commits mailing list