r2331 - in zope2.12 (7 files)

mejo at users.alioth.debian.org mejo at users.alioth.debian.org
Sun Jun 26 13:56:31 UTC 2011


    Date: Sunday, June 26, 2011 @ 13:56:29
  Author: mejo
Revision: 2331

new python wrapper, include transaction module, add versions to dependencies

Added:
  zope2.12/trunk/debian/python_interpreter_template.in.old
    (from rev 2329, zope2.12/trunk/debian/python_interpreter_template.in)
Modified:
  zope2.12/tarballs/zope2.12_2.12.18.orig.tar.gz
  zope2.12/trunk/debian/changelog
  zope2.12/trunk/debian/control
  zope2.12/trunk/debian/copyright
  zope2.12/trunk/debian/python_interpreter_template.in
  zope2.12/trunk/debian/rules

Modified: zope2.12/tarballs/zope2.12_2.12.18.orig.tar.gz
===================================================================
(Binary files differ)

Modified: zope2.12/trunk/debian/changelog
===================================================================
--- zope2.12/trunk/debian/changelog	2011-06-25 16:05:07 UTC (rev 2330)
+++ zope2.12/trunk/debian/changelog	2011-06-26 13:56:29 UTC (rev 2331)
@@ -6,11 +6,13 @@
   * Allowing to install eggs in lib/python of instances.
 
   [ Jonas Meurer ]
-  * Remove Zope eggs from Dependencies in debian/control, and from
+  * Remove Zope eggs from dependencies in debian/control, and from
     DEB_SATISFIED in debian/rules. All Zope dependencies are shipped
     with the local tarball. See README.source for further information.
   * Add python distribute modules to list of DEB_SATISFIED modules.
-  * Add python2.6 package to list of Dependencies.
+  * Remove python-transaction from depends and from DEB_SATISFIED. It's
+    a zope module and should be included in the zope2.12 binary package.
+  * Add python2.6 package to list of dependencies.
   * Major update and reformating of debian/copyright.
   * Bump standards-version to 3.9.2, no changes required.
   * Remove Suggests on zope-zopebook and zope-devguide. Neither of them are
@@ -25,8 +27,12 @@
   * Install the upstream changelogs to /usr/share/doc/zope2.12/changelogs.
   * Remove upstream LICENSE.txt in eggs from zope2.12 binary package.
   * Remove scripts from EGG-INFO subfolders in zope2.12 binary package.
+  * Add versions to dependencies on python modules for zope2.12 package.
+  * Rewrite python_interpreter_template as small shell script: sets
+    PYTHONPATH instead using site.addsitepath(), doesn't introduce recursive
+    shebang, which breaks lenny kernels.
 
- -- Jonas Meurer <mejo at debian.org>  Sat, 25 Jun 2011 18:01:00 +0200
+ -- Jonas Meurer <mejo at debian.org>  Sun, 26 Jun 2011 15:54:01 +0200
 
 zope2.12 (2.12.11-1) unstable; urgency=low
 

Modified: zope2.12/trunk/debian/control
===================================================================
--- zope2.12/trunk/debian/control	2011-06-25 16:05:07 UTC (rev 2330)
+++ zope2.12/trunk/debian/control	2011-06-26 13:56:29 UTC (rev 2331)
@@ -16,8 +16,9 @@
 Architecture: any
 Pre-Depends: zope-common (>= 0.5.51)
 Depends: lsb-base, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
-         debconf | debconf-2.0, python2.6, python-clientform, python-docutils,
-         python-mechanize, python-pkg-resources, python-transaction, python-tz
+         debconf | debconf-2.0, python2.6, python-clientform (>= 0.2.10),
+         python-docutils (>= 0.7), python-mechanize (>= 0.1.11),
+         python-pkg-resources (>= 0.6.15), python-tz
 Provides: zope
 Suggests: python-unit, python-profiler
 Description: Open Source Web Application Server

Modified: zope2.12/trunk/debian/copyright
===================================================================
--- zope2.12/trunk/debian/copyright	2011-06-25 16:05:07 UTC (rev 2330)
+++ zope2.12/trunk/debian/copyright	2011-06-26 13:56:29 UTC (rev 2331)
@@ -67,25 +67,25 @@
 License: Zope-2.1
 
 Files: source/MultiMapping/*, source/Record/*, source/ThreadLock/*,
-       source/ZopeUndo/*, source/initgroups/*, source/zLOG/*, source/zdaemon/*,
-       source/zope.annotation/*, source/zope.app.appsetup/*,
-       source/zope.app.basicskin/*, source/zope.app.component/*,
-       source/zope.app.container/*, source/zope.app.debug/*,
-       source/zope.app.dependable/*, source/zope.app.form/*,
-       source/zope.app.pagetemplate/*, source/zope.app.publication/*,
-       source/zope.app.publisher/*, source/zope.app.schema/*,
-       source/zope.app.testing/*, source/zope.authentication/*,
-       source/zope.broken/*, source/zope.browser/*,
-       source/zope.cachedescriptors/*, source/zope.component/*,
-       source/zope.componentvocabulary/*, source/zope.configuration/*,
-       source/zope.container/*, source/zope.contentprovider/*,
-       source/zope.contenttype/*, source/zope.copypastemove/*,
-       source/zope.datetime/*, source/zope.deprecation/*,
-       source/zope.dottedname/*, source/zope.dublincore/*, source/zope.error/*,
-       source/zope.event/*, source/zope.exceptions/*,
-       source/zope.filerepresentation/*, source/zope.formlib/*,
-       source/zope.hookable/*, source/zope.interface/*, source/zope.location/*,
-       source/zope.minmax/*, source/zope.password/*,
+       source/ZopeUndo/*, source/initgroups/*, source/transaction/*,
+       source/zLOG/*, source/zdaemon/*, source/zope.annotation/*,
+       source/zope.app.appsetup/*, source/zope.app.basicskin/*,
+       source/zope.app.component/*, source/zope.app.container/*,
+       source/zope.app.debug/*, source/zope.app.dependable/*,
+       source/zope.app.form/*, source/zope.app.pagetemplate/*,
+       source/zope.app.publication/*, source/zope.app.publisher/*,
+       source/zope.app.schema/*, source/zope.app.testing/*,
+       source/zope.authentication/*, source/zope.broken/*,
+       source/zope.browser/*, source/zope.cachedescriptors/*,
+       source/zope.component/*, source/zope.componentvocabulary/*,
+       source/zope.configuration/*, source/zope.container/*,
+       source/zope.contentprovider/*, source/zope.contenttype/*,
+       source/zope.copypastemove/*, source/zope.datetime/*,
+       source/zope.deprecation/*, source/zope.dottedname/*,
+       source/zope.dublincore/*, source/zope.error/*, source/zope.event/*,
+       source/zope.exceptions/*, source/zope.filerepresentation/*,
+       source/zope.formlib/*, source/zope.hookable/*, source/zope.interface/*,
+       source/zope.location/*, source/zope.minmax/*, source/zope.password/*,
        source/zope.processlifetime/*, source/zope.publisher/*,
        source/zope.schema/*, source/zope.security/*, source/zope.sequencesort/*,
        source/zope.site/*, source/zope.size/*, source/zope.structuredtext/*,

Modified: zope2.12/trunk/debian/python_interpreter_template.in
===================================================================
--- zope2.12/trunk/debian/python_interpreter_template.in	2011-06-25 16:05:07 UTC (rev 2330)
+++ zope2.12/trunk/debian/python_interpreter_template.in	2011-06-26 13:56:29 UTC (rev 2331)
@@ -1,35 +1,15 @@
-#!/usr/bin/python2.6
-import os
-import sys
-import site
+#!/bin/sh
 
-instance = os.getenv('INSTANCE_HOME')
-if instance:
-    site.addsitedir(instance + '/lib/python')
-site.addsitedir('/usr/lib/zope at ZVER@/lib/python')
-sys.executable = os.path.abspath(__file__)
+ZPYPATH="/usr/lib/zope at ZVER@/lib/python"
 
-_interactive = True
-if len(sys.argv) > 1:
-    _options, _args = __import__("getopt").getopt(sys.argv[1:], 'ic:m:')
-    _interactive = False
-    for (_opt, _val) in _options:
-        if _opt == '-i':
-            _interactive = True
-        elif _opt == '-c':
-            exec _val
-        elif _opt == '-m':
-            sys.argv[1:] = _args
-            _args = []
-            __import__("runpy").run_module(
-                 _val, {}, "__main__", alter_sys=True)
+if [ -n "$PYTHONPATH" ]; then
+	export PYTHONPATH="$PYTHONPATH:$ZPYPATH"
+else
+	export PYTHONPATH="$ZPYPATH"
+fi
 
-    if _args:
-        sys.argv[:] = _args
-        __file__ = _args[0]
-        del _options, _args
-        execfile(__file__)
+if [ -n "$INSTANCE_HOME" ]; then
+	export PYTHONPATH="$PYTHONPATH:${INSTANCE_HOME}/lib/python"
+fi
 
-if _interactive:
-    del _interactive
-    __import__("code").interact(banner="", local=globals())
+/usr/bin/python2.6 $*

Copied: zope2.12/trunk/debian/python_interpreter_template.in.old (from rev 2329, zope2.12/trunk/debian/python_interpreter_template.in)
===================================================================
--- zope2.12/trunk/debian/python_interpreter_template.in.old	                        (rev 0)
+++ zope2.12/trunk/debian/python_interpreter_template.in.old	2011-06-26 13:56:29 UTC (rev 2331)
@@ -0,0 +1,35 @@
+#!/usr/bin/python2.6
+import os
+import sys
+import site
+
+instance = os.getenv('INSTANCE_HOME')
+if instance:
+    site.addsitedir(instance + '/lib/python')
+site.addsitedir('/usr/lib/zope at ZVER@/lib/python')
+sys.executable = os.path.abspath(__file__)
+
+_interactive = True
+if len(sys.argv) > 1:
+    _options, _args = __import__("getopt").getopt(sys.argv[1:], 'ic:m:')
+    _interactive = False
+    for (_opt, _val) in _options:
+        if _opt == '-i':
+            _interactive = True
+        elif _opt == '-c':
+            exec _val
+        elif _opt == '-m':
+            sys.argv[1:] = _args
+            _args = []
+            __import__("runpy").run_module(
+                 _val, {}, "__main__", alter_sys=True)
+
+    if _args:
+        sys.argv[:] = _args
+        __file__ = _args[0]
+        del _options, _args
+        execfile(__file__)
+
+if _interactive:
+    del _interactive
+    __import__("code").interact(banner="", local=globals())

Modified: zope2.12/trunk/debian/rules
===================================================================
--- zope2.12/trunk/debian/rules	2011-06-25 16:05:07 UTC (rev 2330)
+++ zope2.12/trunk/debian/rules	2011-06-26 13:56:29 UTC (rev 2331)
@@ -11,7 +11,7 @@
 ZVER:=2.12
 ZOPE:=zope$(ZVER)
 DEBIAN:=$(CURDIR)/debian
-DEB_SATISFIED:=ClientForm:Docutils:distribute:mechanize:pip:pytz:transaction
+DEB_SATISFIED:=ClientForm:Docutils:distribute:mechanize:pip:pytz
 distribution:=$(shell lsb_release -is)
 
 # get-orig-source variables




More information about the pkg-zope-developers mailing list