r2093 - in zope2.12/branches/buildout-built/debian (3 files)

[pumazi-guest at users.alioth.debian.org]

    Date: Friday, September 17, 2010 @ 16:09:35
  Author: pumazi-guest
Revision: 2093

Fixed the paths to the libraries. The package installs and the libraries can be imported. The sandbox instance does notinstall. However, manually running the 'mkzopeinstance' and then starting the instance has been successful.

Modified:
  zope2.12/branches/buildout-built/debian/changelog
  zope2.12/branches/buildout-built/debian/rules
  zope2.12/branches/buildout-built/debian/zopeZVER-buildout.cfg.in

Modified: zope2.12/branches/buildout-built/debian/changelog
===================================================================
--- zope2.12/branches/buildout-built/debian/changelog	2010-09-16 12:40:42 UTC (rev 2092)
+++ zope2.12/branches/buildout-built/debian/changelog	2010-09-17 16:09:35 UTC (rev 2093)
@@ -1,10 +1,15 @@
 zope2.12 (2.12.10-1) unstable; urgency=low
 
-  * Added a buildout for gathering and building Zope2 and its
-    dependencies.
+  * Fixed the paths in zopeZVER.pth to point to the correct
+    final filesystem location rather than the build location.
+  * Fixed the interpreter path in scripts.
+  * Added a zc.buildout for gathering and building Zope2 and its
+    dependencies. The are used to populate a Python virtual environment
+    (virtualenv). The python executable in this environment can then be
+    used to run zope2.
   * Removed most of the rules that were tarball build specific.
 
- -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Wed, 15 Sep 2010 02:18:45 -0400
+ -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Thu, 16 Sep 2010 08:44:37 -0400
 
 zope2.12 (2.12.0-1) unstable; urgency=low
 

Modified: zope2.12/branches/buildout-built/debian/rules
===================================================================
--- zope2.12/branches/buildout-built/debian/rules	2010-09-16 12:40:42 UTC (rev 2092)
+++ zope2.12/branches/buildout-built/debian/rules	2010-09-17 16:09:35 UTC (rev 2093)
@@ -131,9 +131,24 @@
 
 	echo "Zope$(ZVER) logs placeholder" > $(DEBIAN)/var/log/$(ZOPE)/.placeholder
 
+	# Fix the zopeZVER.pth file paths
+	for i in `find $(DEBIAN)/usr/lib/zope$(ZVER)/lib/python2.6/site-packages/ -iname "*.pth" -type f`; do \
+	  if sed 's,$(DEBIAN)/,/,g' $$i > $$i~ ; then \
+	    if cmp --quiet $$i $$i~ ; then \
+	      rm -rf $$i~ ; \
+	    else \
+	      mv -f $$i~ $$i; \
+              chmod 744 $$i; \
+	      echo "fixed .pth library paths: $$i"; \
+	    fi; \
+	  else \
+	    rm -f $$i~ ; \
+	  fi; \
+	done
+
 	# Fix python interpreter where needed
 	for i in `find $(DEBIAN) -type f`; do \
-	  if sed '1s,#!.*python[^ ]*\(.*\),#!$(PYTHONBIN)\1,' \
+	  if sed '1s,#!.*python[^ ]*\(.*\),#!/usr/lib/zope$(ZVER)/bin/python\1,' \
 		$$i > $$i~ ; then \
 	  if cmp --quiet $$i $$i~ ; then \
 	    rm -f $$i~ ; \

Modified: zope2.12/branches/buildout-built/debian/zopeZVER-buildout.cfg.in
===================================================================
--- zope2.12/branches/buildout-built/debian/zopeZVER-buildout.cfg.in	2010-09-16 12:40:42 UTC (rev 2092)
+++ zope2.12/branches/buildout-built/debian/zopeZVER-buildout.cfg.in	2010-09-17 16:09:35 UTC (rev 2093)
@@ -15,7 +15,7 @@
 # Might not be a bad idea to make the python version configurable too
 pth-file-location = @DEBIAN@/usr/lib/zope at ZVER@/lib/python2.6/site-packages/zope at ZVER@.pth
 # Do we really need this if we are adjusting the path in rules build anyhow?
-#python = @DEBIAN@/usr/lib/zope at ZVER@/bin/python
+#python = /usr/lib/zope at ZVER@/bin/python
 exclude-own-pth = true