r2353 - in zodb/trunk/debian (12 files)
menesis-guest at users.alioth.debian.org
menesis-guest at users.alioth.debian.org
Tue Aug 23 15:08:05 UTC 2011
Date: Tuesday, August 23, 2011 @ 15:08:03
Author: menesis-guest
Revision: 2353
Take improvements from Ubuntu:
* Switch to 3.0 (quilt) source format.
* Use dh_python2 instead of python-central (Closes: #617157).
* debian/patches/lp_135108.patch: put the security fix in a patch.
* New upstream bugfix release.
* debian/rules:
- move test dependencies to suggests.
- stop making two python-version-specific copies of scripts in /usr/bin;
avoids dependency on python2.6.
- remove C source files.
* debian/copyright: update, convert to dep5 format.
* debian/tests/all: make it work on python >= 2.6.
Added:
zodb/trunk/debian/patches/
zodb/trunk/debian/patches/local-options
zodb/trunk/debian/patches/lp_135108.patch
zodb/trunk/debian/patches/series
zodb/trunk/debian/source/
zodb/trunk/debian/source/format
Modified:
zodb/trunk/debian/changelog
zodb/trunk/debian/control
zodb/trunk/debian/copyright
zodb/trunk/debian/rules
zodb/trunk/debian/tests/all
zodb/trunk/debian/watch
Modified: zodb/trunk/debian/changelog
===================================================================
--- zodb/trunk/debian/changelog 2011-08-23 14:59:07 UTC (rev 2352)
+++ zodb/trunk/debian/changelog 2011-08-23 15:08:03 UTC (rev 2353)
@@ -1,9 +1,31 @@
-zodb (1:3.9.4-2) unstable; urgency=low
+zodb (1:3.9.7-1) unstable; urgency=low
- * debian/tests/all: Fix to work on python2.6
+ * Switch to 3.0 (quilt) source format.
+ * Use dh_python2 instead of python-central (Closes: #617157).
+ * debian/patches/lp_135108.patch: put the security fix in a patch.
- -- Gediminas Paulauskas <menesis at pov.lt> Fri, 05 Feb 2010 23:32:07 +0200
+ -- Gediminas Paulauskas <menesis at pov.lt> Wed, 03 Aug 2011 18:38:11 +0300
+zodb (1:3.9.7-0ubuntu1) natty; urgency=low
+
+ * New upstream bugfix release.
+ * debian/rules:
+ - move test dependencies to suggests.
+ - stop making two python-version-specific copies of scripts in /usr/bin;
+ avoids dependency on python2.6.
+ - remove C source files.
+ * debian/copyright: update, convert to dep5 format.
+ * debian/tests/all: make it work on python >= 2.6.
+
+ -- Gediminas Paulauskas <menesis at pov.lt> Tue, 19 Apr 2011 19:57:15 +0300
+
+zodb (1:3.9.4-1.1) unstable; urgency=low
+
+ * Non-maintainer upload by the Security Team.
+ * Fix CVE-2010-3495 (Closes: #599711)
+
+ -- Moritz Muehlenhoff <jmm at debian.org> Thu, 04 Nov 2010 18:50:19 +0100
+
zodb (1:3.9.4-1) unstable; urgency=low
[ Brian Sutherland ]
@@ -17,7 +39,7 @@
zodb (1:3.9.1-2) unstable; urgency=low
- * debian/control: build-depend on pyton-vab.pydeb >= 1.3.0-2.
+ * debian/control: build-depend on python-van.pydeb >= 1.3.0-2.
(Closes: #552936)
-- Fabio Tranchitella <kobold at debian.org> Sun, 08 Nov 2009 11:01:32 +0100
Modified: zodb/trunk/debian/control
===================================================================
--- zodb/trunk/debian/control 2011-08-23 14:59:07 UTC (rev 2352)
+++ zodb/trunk/debian/control 2011-08-23 15:08:03 UTC (rev 2353)
@@ -3,22 +3,24 @@
Priority: extra
Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
Uploaders: Brian Sutherland <brian at vanguardistas.net>, Fabio Tranchitella <kobold at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b9), python-van.pydeb (>= 1.3.0-4)
-Standards-Version: 3.8.3
-XS-Python-Version: all
-XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zodb/trunk
+Build-Depends: debhelper (>= 7.0.50~),
+ python-all-dev (>= 2.6.6-3~),
+ python-setuptools,
+ python-van.pydeb (>= 1.3.0-4)
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.4
+Vcs-Svn: svn://svn.debian.org/pkg-zope/zodb/trunk
+Homepage: http://zodb.org/
Package: python-zodb
Architecture: any
Depends: ${pydeb:Depends}, ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Recommends: ${pydeb:Recommends}
Provides: ${pydeb:Provides}, ${python:Provides}
Suggests: ${pydeb:Suggests}
-Conflicts: zope3, python2.4-zodb
-Replaces: zope3, python2.4-zodb
+Conflicts: zope3
XB-Python-Version: ${python:Versions}
-Description: Set of tools for using the Zope Object Database (ZODB)
- The Zope Object Database provides an object-oriented database for Python that
+Description: Zope Object Database (ZODB)
+ The Zope Object Database is an object-oriented database for Python that
provides a high-degree of transparency. Applications can take advantage of
object database features with few, if any, changes to application logic.
.
Modified: zodb/trunk/debian/copyright
===================================================================
--- zodb/trunk/debian/copyright 2011-08-23 14:59:07 UTC (rev 2352)
+++ zodb/trunk/debian/copyright 2011-08-23 15:08:03 UTC (rev 2353)
@@ -1,74 +1,52 @@
-This package was debianized by Brian Sutherland <brian at vanguardistas.net>
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: ZODB3
+Upstream-Contact: Zope Foundation and Contributors <zope-dev at zope.org>
+Source: http://pypi.python.org/pypi/ZODB3
-It was downloaded from http://pypi.python.org/pypi/ZODB3
-
-Copyright:
-
-Upstream Author: Zope Corporation and Contributers <zope3-dev at zope.org>
-
-Files contain this header:
-
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-
-Zope Public License (ZPL) Version 2.1
--------------------------------------
-
-A copyright notice accompanies this license document that
-identifies the copyright holders.
-
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions in source code must retain the
- accompanying copyright notice, this list of conditions,
- and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the accompanying
- copyright notice, this list of conditions, and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-3. Names of the copyright holders must not be used to
- endorse or promote products derived from this software
- without prior written permission from the copyright
- holders.
-
-4. The right to distribute this software or to use it for
- any purpose does not give you the right to use
- Servicemarks (sm) or Trademarks (tm) of the copyright
- holders. Use of them is covered by separate agreement
- with the copyright holders.
-
-5. If any files are modified, you must cause the modified
- files to carry prominent notices stating that you changed
- the files and the date of any change.
-
-Disclaimer
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
- AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- NO EVENT SHALL THE COPYRIGHT HOLDERS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGE.
+Files: *
+Copyright: (c) 2001-2010 Zope Foundation and Contributors.
+License: Zope-2.1
+ Zope Public License (ZPL) Version 2.1
+ .
+ A copyright notice accompanies this license document that identifies the
+ copyright holders.
+ .
+ This license has been certified as open source. It has also been designated as
+ GPL compatible by the Free Software Foundation (FSF).
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions in source code must retain the accompanying copyright
+ notice, this list of conditions, and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the accompanying copyright
+ notice, this list of conditions, and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. Names of the copyright holders must not be used to endorse or promote
+ products derived from this software without prior written permission from the
+ copyright holders.
+ .
+ 4. The right to distribute this software or to use it for any purpose does not
+ give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+ copyright
+ holders. Use of them is covered by separate agreement with the copyright
+ holders.
+ .
+ 5. If any files are modified, you must cause the modified files to carry
+ prominent notices stating that you changed the files and the date of any
+ change.
+ .
+ Disclaimer
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Added: zodb/trunk/debian/patches/local-options
===================================================================
--- zodb/trunk/debian/patches/local-options (rev 0)
+++ zodb/trunk/debian/patches/local-options 2011-08-23 15:08:03 UTC (rev 2353)
@@ -0,0 +1 @@
+unapply-patches
Added: zodb/trunk/debian/patches/lp_135108.patch
===================================================================
--- zodb/trunk/debian/patches/lp_135108.patch (rev 0)
+++ zodb/trunk/debian/patches/lp_135108.patch 2011-08-23 15:08:03 UTC (rev 2353)
@@ -0,0 +1,14 @@
+Fix released in 3.10.0
+Index: zodb/src/ZEO/StorageServer.py
+===================================================================
+--- zodb.orig/src/ZEO/StorageServer.py
++++ zodb/src/ZEO/StorageServer.py
+@@ -133,6 +133,8 @@ class ZEOStorage:
+ addr = conn.addr
+ if isinstance(addr, type("")):
+ label = addr
++ elif addr is None:
++ label = ''
+ else:
+ host, port = addr
+ label = str(host) + ":" + str(port)
Added: zodb/trunk/debian/patches/series
===================================================================
--- zodb/trunk/debian/patches/series (rev 0)
+++ zodb/trunk/debian/patches/series 2011-08-23 15:08:03 UTC (rev 2353)
@@ -0,0 +1 @@
+lp_135108.patch
Modified: zodb/trunk/debian/rules
===================================================================
--- zodb/trunk/debian/rules 2011-08-23 14:59:07 UTC (rev 2352)
+++ zodb/trunk/debian/rules 2011-08-23 15:08:03 UTC (rev 2353)
@@ -3,20 +3,14 @@
export PYDEB_SUGGESTS_EXTRAS=test
%:
- dh --with pydeb --with python-central $@
+ dh --with pydeb --with python2 $@
override_dh_install:
dh_install
- # console scripts
- for script in debian/python-zodb/usr/bin/*; do \
- for py in $(shell pyversions -vr debian/control); do \
- cat $$script | sed -e "s,/usr/bin/python,/usr/bin/python$$py,g" > $$script$$py; \
- chmod 755 $$script$$py; \
- done; \
- rm $$script; \
- done
# replace python2.[0-9] shebangs with python
for script in debian/python-zodb/usr/lib/python2.*/*-packages/*/scripts/*.py \
debian/python-zodb/usr/lib/python2.*/*-packages/*/zeoctl.py; do \
sed -i -e "s,/usr/bin/env python2.[0-9],/usr/bin/python,g" $$script; \
done
+ # remove C source files
+ find debian/python-zodb -name '*.c' -delete
Added: zodb/trunk/debian/source/format
===================================================================
--- zodb/trunk/debian/source/format (rev 0)
+++ zodb/trunk/debian/source/format 2011-08-23 15:08:03 UTC (rev 2353)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: zodb/trunk/debian/tests/all
===================================================================
--- zodb/trunk/debian/tests/all 2011-08-23 14:59:07 UTC (rev 2352)
+++ zodb/trunk/debian/tests/all 2011-08-23 15:08:03 UTC (rev 2353)
@@ -20,6 +20,7 @@
EOF
for version in ${PYVERS}; do
+ Running tests for python${version}
python${version} ${TMPFILE}
done
Modified: zodb/trunk/debian/watch
===================================================================
--- zodb/trunk/debian/watch 2011-08-23 14:59:07 UTC (rev 2352)
+++ zodb/trunk/debian/watch 2011-08-23 15:08:03 UTC (rev 2353)
@@ -1,3 +1,2 @@
version=3
http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-([0-9.]*)\.tar\.gz
-http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-([0-9.]*)\.zip
More information about the pkg-zope-developers
mailing list