r2705 - in zope2.13/trunk/debian (15 files)

arnau at users.alioth.debian.org arnau at users.alioth.debian.org
Thu May 16 11:40:25 UTC 2013


    Date: Thursday, May 16, 2013 @ 11:40:24
  Author: arnau
Revision: 2705

* Merge recent changes from zope2.12 packages.
* Python 2.6 is going to be removed, so update asserts on Python version.
* New major upstream release (2.13).
  + debian/control: update Vcs-* fields URL.
  + debian/patches/use-python-initgroups.patch:
    - Use os.initgroups (>= 2.7) rather than relying on a third-party
      module, keep it in DEB_SATISFIED as it is included in versions.cfg.

Modified:
  zope2.13/trunk/debian/README.source
  zope2.13/trunk/debian/build-scripts/_pip_dependency.py
  zope2.13/trunk/debian/build-scripts/build.py
  zope2.13/trunk/debian/build-scripts/fetch.py
  zope2.13/trunk/debian/build-scripts/gen_script.py
  zope2.13/trunk/debian/build-scripts/gen_versions_cfg.py
  zope2.13/trunk/debian/changelog
  zope2.13/trunk/debian/control
  zope2.13/trunk/debian/copyright
  zope2.13/trunk/debian/patches/Zope2-deb_zopeconf.patch
  zope2.13/trunk/debian/patches/Zope2-webdav_urljoin.patch
  zope2.13/trunk/debian/patches/build_resources.patch
  zope2.13/trunk/debian/patches/series
  zope2.13/trunk/debian/rules
  zope2.13/trunk/debian/watch

Modified: zope2.13/trunk/debian/README.source
===================================================================
--- zope2.13/trunk/debian/README.source	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/README.source	2013-05-16 11:40:24 UTC (rev 2705)
@@ -32,7 +32,7 @@
 build script.
 
  We (the Debian Zope2 Maintainers) are aware that this situation has issues.
-The biggest problem is code duplication: The sourcecode of already packaged
+The biggest problem is code duplication: The source code of already packaged
 Zope eggs is duplicated in the Zope2 source packages.
 
  If the situation ever improves (e.g. Zope eggs upstream start to care about

Modified: zope2.13/trunk/debian/build-scripts/_pip_dependency.py
===================================================================
--- zope2.13/trunk/debian/build-scripts/_pip_dependency.py	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/build-scripts/_pip_dependency.py	2013-05-16 11:40:24 UTC (rev 2705)
@@ -14,7 +14,7 @@
 import sys
 from optparse import OptionParser
 from tempfile import mkdtemp
-assert sys.version_info >= (2, 6), "Python >= 2.6 is required"
+assert sys.version_info >= (2, 7), "Python >= 2.7 is required"
 from subprocess import Popen, PIPE
 
 try:

Modified: zope2.13/trunk/debian/build-scripts/build.py
===================================================================
--- zope2.13/trunk/debian/build-scripts/build.py	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/build-scripts/build.py	2013-05-16 11:40:24 UTC (rev 2705)
@@ -15,7 +15,7 @@
 from subprocess import Popen, PIPE
 from tempfile import mkdtemp
 
-assert sys.version_info >= (2, 6), "Python >= 2.6 is required"
+assert sys.version_info >= (2, 7), "Python >= 2.7 is required"
 
 __version__ = '0.1.0'
 HERE = os.path.abspath(os.path.dirname(__file__))

Modified: zope2.13/trunk/debian/build-scripts/fetch.py
===================================================================
--- zope2.13/trunk/debian/build-scripts/fetch.py	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/build-scripts/fetch.py	2013-05-16 11:40:24 UTC (rev 2705)
@@ -16,7 +16,7 @@
 import ConfigParser
 import shutil
 from optparse import OptionParser
-assert sys.version_info >= (2, 6), "Python >= 2.6 is required"
+assert sys.version_info >= (2, 7), "Python >= 2.7 is required"
 from subprocess import Popen, PIPE
 
 try:

Modified: zope2.13/trunk/debian/build-scripts/gen_script.py
===================================================================
--- zope2.13/trunk/debian/build-scripts/gen_script.py	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/build-scripts/gen_script.py	2013-05-16 11:40:24 UTC (rev 2705)
@@ -13,7 +13,7 @@
 import stat
 from optparse import OptionParser
 
-assert sys.version_info >= (2, 6), "Python >= 2.6 is required"
+assert sys.version_info >= (2, 7), "Python >= 2.7 is required"
 
 __version__ = '0.1.0'
 script_template = """\

Modified: zope2.13/trunk/debian/build-scripts/gen_versions_cfg.py
===================================================================
--- zope2.13/trunk/debian/build-scripts/gen_versions_cfg.py	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/build-scripts/gen_versions_cfg.py	2013-05-16 11:40:24 UTC (rev 2705)
@@ -14,7 +14,7 @@
 import ConfigParser
 from urlparse import urlparse
 
-assert sys.version_info >= (2, 6), "Python >= 2.6 is required"
+assert sys.version_info >= (2, 7), "Python >= 2.7 is required"
 
 __version__ = '0.1.0'
 

Modified: zope2.13/trunk/debian/changelog
===================================================================
--- zope2.13/trunk/debian/changelog	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/changelog	2013-05-16 11:40:24 UTC (rev 2705)
@@ -1,17 +1,81 @@
-zope2.13 (2.13.12-1) unstable; urgency=low
+zope2.13 (2.13.20-1) UNRELEASED; urgency=low
 
+  [ Jonas Meurer ]
   * New major upstream release (2.13).
     - Update build scripts for Zope2.13.
     - Bump python version from 2.6 to 2.7.
     - Remove obsolete patch Zope2-remove_documenttemplate_release_script.patch
     - Update remaining patches.
   * Update Homepage field to point to correct page http://zope2.zope.org/.
+
+  [ Arnaud Fontaine ]
+  * Python 2.6 is going to be removed, so update asserts on Python version.
+  * New major upstream release (2.13).
+    + debian/control: update Vcs-* fields URL.
+    + debian/patches/use-python-initgroups.patch:
+      - Use os.initgroups (>= 2.7) rather than relying on a third-party
+        module, keep it in DEB_SATISFIED as it is included in versions.cfg.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Thu, 16 May 2013 20:27:46 +0900
+
+zope2.12 (2.12.26-1) unstable; urgency=high
+
+  * New upstream release. Closes: #692899.
+    + Fix Reflexive HTTP header injection (CVE-2012-5486).
+    + Fix Timing attack in password validation (CVE-2012-5507).
+    + Fix PRNG which wasn't reseeded (CVE-2012-5508).
+  * debian/patches/CVE-2012-5505.patch:
+    + Fix Attempting to access a view with no name returns an internal
+      data structure (CVE-2012-5505). Thanks to Tres Seaver. Closes: #692899.
+  * debian/control:
+    + Bump zope.common required version as the debconf template
+      has been updated. Closes: #656552.
+  * debian/rules:
+    + As dh_python (>= 2.7.3-1) rewrites shebangs by default, overriding
+      dh_auto_install to fix shebangs does not work anymore as dh_python2 is
+      called afterwards, instead use dh_python2 to rewrite them.
+      - debian/control: bump python Build-Depends.
+      - Drop now useless ZODB3-fix_shebang.patch.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Wed, 06 Mar 2013 18:46:14 +0900
+
+zope2.12 (2.12.23-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: bump Standards-Version to 3.9.3.
+    + debian/copyright: update Format URL.
+  * debian/watch: fix missing version delimiters in filename pattern.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Thu, 14 Jun 2012 09:44:20 +0900
+
+zope2.12 (2.12.22-1) unstable; urgency=low
+
+  * New upstream release (2.12.22)
+    - Fixes cross-site-scripting attack (CVE-2010-1104).
+    - Remove patch Zope2-fix_serious_authentication_vulnerability.patch,
+      now incorporated upstream.
+
+ -- Jonas Meurer <mejo at debian.org>  Thu, 19 Jan 2012 01:28:13 +0100
+
+zope2.12 (2.12.20-3) unstable; urgency=low
+
+  * Remove ClientForm from DEB_SATISFIED as it's going to be dropped soonish.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Fri, 16 Dec 2011 14:20:35 +0900
+
+zope2.12 (2.12.20-2) unstable; urgency=high
+
+  * Update Homepage field to point to correct page http://zope2.zope.org/.
   * Change Depends on zope-common from (>= 0.5.51) to (>= 0.5.51~), to ease
     backports to squeeze.
-  * Remove ClientForm from DEB_SATISFIED as it's going to be dropped soonish.
-  * Remove inigroups from DEB_SATISFIED as Debian package doesn't work.
+  * Add debian/patches/Zope2-fix_serious_authentication_vulnerability.patch,
+    fixing a serious authentication vulnerability in stock configuration.
+    No CVE number assigned yet.
+    See https://mail.zope.org/pipermail/zope-dev/2011-October/043592.html
+    for further information.
+  * Set urgency=high in order to push the security fix to testing.
 
- -- Jonas Meurer <mejo at debian.org>  Thu, 26 Jan 2012 18:13:12 +0100
+ -- Jonas Meurer <mejo at debian.org>  Fri, 28 Oct 2011 13:51:41 +0200
 
 zope2.12 (2.12.20-1) unstable; urgency=low
 

Modified: zope2.13/trunk/debian/control
===================================================================
--- zope2.13/trunk/debian/control	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/control	2013-05-16 11:40:24 UTC (rev 2705)
@@ -4,10 +4,11 @@
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Jonas Meurer <mejo at debian.org>,
            Arnaud Fontaine <arnau at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), lsb-release, python (>= 2.7.2-9~),
-               python2.7-dev, python-setuptools, python-pkg-resources,
-               python-pip (>= 0.8), zope-debhelper (>= 0.3.12)
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7.0.50~), lsb-release, python (>= 2.7.3-1~),
+               python2.7-dev, python-setuptools,
+               python-pkg-resources, python-pip (>= 0.8),
+               zope-debhelper (>= 0.3.12)
+Standards-Version: 3.9.3
 X-Python-Version: 2.7
 Homepage: http://zope2.zope.org/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-zope/zope2.13/trunk
@@ -15,10 +16,11 @@
 
 Package: zope2.13
 Architecture: any
-Pre-Depends: zope-common (>= 0.5.51~)
+Pre-Depends: zope-common (>= 0.5.52~)
 Depends: lsb-base, ${shlibs:Depends}, debconf | debconf-2.0, ${misc:Depends},
-         ${python:Depends}, python-docutils (>= 0.7),
-         python-mechanize (>= 0.1.11), python-pkg-resources (>= 0.6.16-1.1) | 
+         ${python:Depends},
+         python-docutils (>= 0.7), python-mechanize (>= 0.1.11),
+         python-pkg-resources (>= 0.6.16-1.1) | 
          python-pkg-resources (<< 0.6.15), python-tz
 Provides: zope
 Suggests: python-unit, python-profiler

Modified: zope2.13/trunk/debian/copyright
===================================================================
--- zope2.13/trunk/debian/copyright	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/copyright	2013-05-16 11:40:24 UTC (rev 2705)
@@ -1,4 +1,4 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: source/Acquisition/* source/DateTime/* source/ExtensionClass/*
        source/Missing/* source/Persistence/* source/Products.ZSQLMethods/*

Modified: zope2.13/trunk/debian/patches/Zope2-deb_zopeconf.patch
===================================================================
--- zope2.13/trunk/debian/patches/Zope2-deb_zopeconf.patch	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/patches/Zope2-deb_zopeconf.patch	2013-05-16 11:40:24 UTC (rev 2705)
@@ -1,7 +1,8 @@
-Description: Debian specific configuration.
-
---- a/source/Zope2/src/Zope2/utilities/copyzopeskel.py
-+++ b/source/Zope2/src/Zope2/utilities/copyzopeskel.py
+Debian specific configuration
+Index: zope2.13-2.13.20/source/Zope2/src/Zope2/utilities/copyzopeskel.py
+===================================================================
+--- zope2.13-2.13.20.orig/source/Zope2/src/Zope2/utilities/copyzopeskel.py	2013-05-16 19:31:48.397487133 +0900
++++ zope2.13-2.13.20/source/Zope2/src/Zope2/utilities/copyzopeskel.py	2013-05-16 19:31:48.393487089 +0900
 @@ -1,3 +1,5 @@
 +#!/usr/bin/env python
 +
@@ -82,8 +83,10 @@
  def usage(stream, msg=None):
      if msg:
          print >>stream, msg
---- a/source/Zope2/src/Zope2/utilities/mkzopeinstance.py
-+++ b/source/Zope2/src/Zope2/utilities/mkzopeinstance.py
+Index: zope2.13-2.13.20/source/Zope2/src/Zope2/utilities/mkzopeinstance.py
+===================================================================
+--- zope2.13-2.13.20.orig/source/Zope2/src/Zope2/utilities/mkzopeinstance.py	2013-05-16 19:31:48.397487133 +0900
++++ zope2.13-2.13.20/source/Zope2/src/Zope2/utilities/mkzopeinstance.py	2013-05-16 19:31:48.393487089 +0900
 @@ -1,3 +1,5 @@
 +#!/usr/bin/env python
 +
@@ -196,8 +199,10 @@
  def usage(stream, msg=None):
      if msg:
          print >>stream, msg
---- a/source/Zope2/src/Zope2/utilities/skel/etc/zope.conf.in
-+++ b/source/Zope2/src/Zope2/utilities/skel/etc/zope.conf.in
+Index: zope2.13-2.13.20/source/Zope2/src/Zope2/utilities/skel/etc/zope.conf.in
+===================================================================
+--- zope2.13-2.13.20.orig/source/Zope2/src/Zope2/utilities/skel/etc/zope.conf.in	2013-05-16 19:31:48.397487133 +0900
++++ zope2.13-2.13.20/source/Zope2/src/Zope2/utilities/skel/etc/zope.conf.in	2013-05-16 19:31:48.393487089 +0900
 @@ -23,6 +23,9 @@
  # ZConfig "defines" used for later textual substitution
  

Modified: zope2.13/trunk/debian/patches/Zope2-webdav_urljoin.patch
===================================================================
--- zope2.13/trunk/debian/patches/Zope2-webdav_urljoin.patch	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/patches/Zope2-webdav_urljoin.patch	2013-05-16 11:40:24 UTC (rev 2705)
@@ -1,5 +1,4 @@
-Description: Fix webdav quoting for resources with names containing spaces.
-
+Fix webdav quoting for resources with names containing spaces.
 --- a/source/Zope2/src/webdav/davcmds.py
 +++ b/source/Zope2/src/webdav/davcmds.py
 @@ -173,7 +173,7 @@

Modified: zope2.13/trunk/debian/patches/build_resources.patch
===================================================================
--- zope2.13/trunk/debian/patches/build_resources.patch	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/patches/build_resources.patch	2013-05-16 11:40:24 UTC (rev 2705)
@@ -1,8 +1,57 @@
-Description: Build resouces that aid in the compilation of Zope2.
-Author: Michael Mulich
-
---- a/configure	1970-01-01
-+++ b/configure	2011-10-27
+Build resouces that aid in the compilation of Zope2.
+--- /dev/null
++++ b/Makefile.in
+@@ -0,0 +1,48 @@
++#!/usr/bin/make -f
++# -*- makefile -*-
++export PYTHON:=%(python_exec)s
++DIST_NAME:=%(name)s
++DIST_VER:=%(major_minor_version)s
++DIST_FULLVER:=$(DIST_VER).%(point_version)s
++PIPVER:=%(pip_version)s
++DIST_INDEX:=%(index)s
++
++export DIST_DEST:=%(lib_dest)s
++export SCRIPT_DEST:=%(script_dest)s
++export PTH_DEST:=%(pth_dest)s
++
++export PYTHONPATH:=
++DESTDIR:=
++# Exclusions are a colon separated list of distribution names.
++DIST_SINGLE_EXCLUSIONS:=
++DIST_EXCLUSIONS:=
++
++# Change the following value to 1 to enable debug logging.
++export DEBUG:=0
++
++all: clean build
++	@echo "Now run 'make install'"
++
++clean:
++	@echo "Cleaning..."
++	-rm -rf ./build
++	-find ./source/ -maxdepth 2 -type d -name "build" -exec rm -rf {} \;
++
++distclean:
++	@rm Makefile
++
++build:
++	@echo "Building ${DIST_NAME} ${DIST_VER}..."
++	@$(PYTHON) ./debian/build-scripts/build.py \
++		--exclude ${DIST_EXCLUSIONS} \
++		--final-dir ${DIST_DEST} \
++		--name ${DIST_NAME}
++	@echo "Now run 'make install'"
++
++install:
++	@$(PYTHON) ./debian/build-scripts/install.py \
++		--dists-dest ${DESTDIR}${DIST_DEST} \
++		--scripts-dest ${DESTDIR}${SCRIPT_DEST} \
++		--pth-dest ${DESTDIR}${PTH_DEST}
++
++.PHONY: all build install clean distclean
+--- /dev/null
++++ b/configure
 @@ -0,0 +1,153 @@
 +#!/usr/bin/env python
 +# -*- coding: utf-8 -*-
@@ -17,9 +66,9 @@
 +import os
 +import sys
 +
-+assert sys.version_info >= (2, 6), "Python >= 2.6 is required"
++assert sys.version_info >= (2, 7), "Python >= 2.7 is required"
 +
-+# XXX Would much rather use argparse here, but it's not available in Python 2.6
++# XXX Would much rather use argparse here, but it's not available in Python 2.7
 +from optparse import OptionParser
 +from distutils.sysconfig import get_python_lib
 +from subprocess import Popen, PIPE
@@ -31,7 +80,7 @@
 +# TODO Parse the version information from version.txt
 +VERSIONS = {'name': 'Zope2',
 +            'major_minor_version': '2.13',
-+            'point_version': '10',
++            'point_version': '20',
 +            'pip_version': '0.8.1',
 +            }
 +complete_version = '%s.%s' % (VERSIONS['major_minor_version'],
@@ -82,11 +131,11 @@
 +    """
 +    executable_path = os.path.realpath(executable_path)
 +    # Check the python version first.
-+    version_cmd = "import sys; assert sys.version_info >= (2, 6)"
++    version_cmd = "import sys; assert sys.version_info >= (2, 7)"
 +    p = Popen([executable_path, '-c', version_cmd])
 +    if p.returncode > 0:
 +        raise RuntimeError("The given python executable does not meet the "
-+                           "version (>= 2.6).")
++                           "version (>= 2.7).")
 +    # Find the locations in question.
 +    locations_cmd = ["import os, sys",
 +                     "from distutils.sysconfig import get_python_lib",
@@ -157,54 +206,3 @@
 +                           "working directory. Please make sure you are "
 +                           "executing from the project's root location.")
 +    main()
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -0,0 +1,48 @@
-+#!/usr/bin/make -f
-+# -*- makefile -*-
-+export PYTHON:=%(python_exec)s
-+DIST_NAME:=%(name)s
-+DIST_VER:=%(major_minor_version)s
-+DIST_FULLVER:=$(DIST_VER).%(point_version)s
-+PIPVER:=%(pip_version)s
-+DIST_INDEX:=%(index)s
-+
-+export DIST_DEST:=%(lib_dest)s
-+export SCRIPT_DEST:=%(script_dest)s
-+export PTH_DEST:=%(pth_dest)s
-+
-+export PYTHONPATH:=
-+DESTDIR:=
-+# Exclusions are a colon separated list of distribution names.
-+DIST_SINGLE_EXCLUSIONS:=
-+DIST_EXCLUSIONS:=
-+
-+# Change the following value to 1 to enable debug logging.
-+export DEBUG:=0
-+
-+all: clean build
-+	@echo "Now run 'make install'"
-+
-+clean:
-+	@echo "Cleaning..."
-+	-rm -rf ./build
-+	-find ./source/ -maxdepth 2 -type d -name "build" -exec rm -rf {} \;
-+
-+distclean:
-+	@rm Makefile
-+
-+build:
-+	@echo "Building ${DIST_NAME} ${DIST_VER}..."
-+	@$(PYTHON) ./debian/build-scripts/build.py \
-+		--exclude ${DIST_EXCLUSIONS} \
-+		--final-dir ${DIST_DEST} \
-+		--name ${DIST_NAME}
-+	@echo "Now run 'make install'"
-+
-+install:
-+	@$(PYTHON) ./debian/build-scripts/install.py \
-+		--dists-dest ${DESTDIR}${DIST_DEST} \
-+		--scripts-dest ${DESTDIR}${SCRIPT_DEST} \
-+		--pth-dest ${DESTDIR}${PTH_DEST}
-+
-+.PHONY: all build install clean distclean

Modified: zope2.13/trunk/debian/patches/series
===================================================================
--- zope2.13/trunk/debian/patches/series	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/patches/series	2013-05-16 11:40:24 UTC (rev 2705)
@@ -1,4 +1,5 @@
 build_resources.patch
 Zope2-webdav_urljoin.patch
 Zope2-deb_zopeconf.patch
-ZODB3-fix_shebang.patch
+CVE-2012-5505.patch
+use-python-initgroups.patch

Modified: zope2.13/trunk/debian/rules
===================================================================
--- zope2.13/trunk/debian/rules	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/rules	2013-05-16 11:40:24 UTC (rev 2705)
@@ -13,7 +13,7 @@
 PYVER:=2.7
 PYTHON:=python$(PYVER)
 DEBIAN:=$(CURDIR)/debian
-DEB_SATISFIED:=Docutils:distribute:mechanize:pip:pytz
+DEB_SATISFIED:=Docutils:distribute:mechanize:initgroups:pip:pytz
 distribution:=$(shell lsb_release -is)
 
 # get-orig-source variables
@@ -69,19 +69,6 @@
 override_dh_auto_install:
 	make install PYTHON=$(PYTHON) DESTDIR=$(DEBIAN)/$(ZOPE)
 
-#	sed -i '/^#!.*$$/a\import site; site.addsitedir("/usr/lib/$(ZOPE)/lib/python")' $$(find $(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/bin -type f ! -type l)
-	for i in `find $(DEBIAN)/$(ZOPE) -type f`; do \
-		if sed '1s,#!.*python[^ ]*\(.*\),#!/usr/lib/zope$(ZVER)/bin/python\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
-
         # install the changelogs
 	dh_installchangelogs source/Zope2/doc/CHANGES.rst
 
@@ -107,6 +94,9 @@
 		$(DEBIAN)/$(ZOPE)-sandbox/usr/share/doc/$(ZOPE)-sandbox/README.Ubuntu
 endif
 
+override_dh_python2:
+	dh_python2 --shebang="/usr/lib/zope$(ZVER)/bin/python"
+
 override_dh_fixperms:
 	dh_fixperms --
 	# Setuptools apparently makes every .py file executable during the build.

Modified: zope2.13/trunk/debian/watch
===================================================================
--- zope2.13/trunk/debian/watch	2013-05-15 10:01:50 UTC (rev 2704)
+++ zope2.13/trunk/debian/watch	2013-05-16 11:40:24 UTC (rev 2705)
@@ -1,2 +1,2 @@
 version=3
-http://pypi.python.org/packages/source/Z/Zope2/Zope2-2\.13\.[\d]+\.zip
+http://pypi.python.org/packages/source/Z/Zope2/Zope2-(2\.13\.[\d]+)\.zip




More information about the pkg-zope-developers mailing list