r448 - zodb/trunk/debian

[Fabio Tranchitella]

Author: kobold
Date: 2006-11-09 10:41:35 +0100 (Thu, 09 Nov 2006)
New Revision: 448

Modified:
   zodb/trunk/debian/changelog
   zodb/trunk/debian/rules
Log:
Changes for zodb 3.6.0-5.


Modified: zodb/trunk/debian/changelog
===================================================================
--- zodb/trunk/debian/changelog	2006-11-05 07:46:03 UTC (rev 447)
+++ zodb/trunk/debian/changelog	2006-11-09 09:41:35 UTC (rev 448)
@@ -1,3 +1,9 @@
+zodb (3.6.0-5) unstable; urgency=low
+
+  * Drop dependencies on versioned interpreters.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 27 Oct 2006 01:46:32 +0200
+
 zodb (3.6.0-4) unstable; urgency=low
 
   * Python policy transition. (Closes: #375357)

Modified: zodb/trunk/debian/rules
===================================================================
--- zodb/trunk/debian/rules	2006-11-05 07:46:03 UTC (rev 447)
+++ zodb/trunk/debian/rules	2006-11-09 09:41:35 UTC (rev 448)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 PYVERS=$(shell pyversions -r debian/control)
+PY_INTERPRETER=/usr/bin/python
 
 clean: unpatch
 	dh_testdir
@@ -36,18 +37,21 @@
 		mv debian/python-zodb/usr/bin/* debian/python-zodb/usr/lib/$$python/site-packages/ZODB/utilities ; \
 		rmdir debian/python-zodb/usr/bin ; \
 	done
-	# Fix python interpreter where needed
-	#for i in `find debian/python2.3-zodb -type f`; do \
-    #  if sed '1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python2.3\1,' \
-    #    $$i > $$i~ ; then \
-    #  if cmp --quiet $$i $$i~ ; then \
-    #    rm -f $$i~ ; \
-    #  else \
-    #    mv -f $$i~ $$i; \
-    #    chmod 755 $$i; \
-    #    echo "fixed interpreter: $$i"; \
-    #  fi; else  rm -f $$i~ ; fi ; \
-    #done
+
+	: # Replace all '#!' calls to python with $(PY_INTERPRETER)
+	: # and make them executable
+	for i in `find debian/python-zodb -type f`; do \
+	  sed '1s,#!.*python[^ ]*\(.*\),#! $(PY_INTERPRETER)\1,' \
+		$$i > $$i.temp; \
+	  if cmp --quiet $$i $$i.temp; then \
+	    rm -f $$i.temp; \
+	  else \
+	    mv -f $$i.temp $$i; \
+	    chmod 755 $$i; \
+	    echo "fixed interpreter: $$i"; \
+	  fi; \
+	done
+
 	# Remove zope.interface package
 	rm -fr debian/python*/usr/lib/python*/site-packages/zope/interface/ \
 	       debian/python*/usr/lib/python*/site-packages/zope/__init__.py*
@@ -69,7 +73,6 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_python
 	dh_pycentral
 	dh_shlibdeps
 	dh_installdeb