Date: Sunday, March 29, 2009 @ 19:50:23
Author: kobold
Revision: 1369
debian/control: build the package for all the available python versions.
(Closes: #472392)
Added:
zodb/trunk/debian/patches/py2.6.dpatch
Modified:
zodb/trunk/debian/changelog
zodb/trunk/debian/control
zodb/trunk/debian/patches/00list
zodb/trunk/debian/rules
Modified: zodb/trunk/debian/changelog
===================================================================
--- zodb/trunk/debian/changelog 2009-03-27 13:33:59 UTC (rev 1368)
+++ zodb/trunk/debian/changelog 2009-03-29 19:50:23 UTC (rev 1369)
@@ -1,3 +1,10 @@
+zodb (1:3.6.0-3) unstable; urgency=low
+
+ * debian/control: build the package for all the available python versions.
+ (Closes: #472392)
+
+ -- Fabio Tranchitella <kobold at debian.org> Sun, 29 Mar 2009 21:40:43 +0200
+
zodb (1:3.6.0-2) unstable; urgency=low
* debian/rules: fixed with the new binary package name. (Closes: #463259)
Modified: zodb/trunk/debian/control
===================================================================
--- zodb/trunk/debian/control 2009-03-27 13:33:59 UTC (rev 1368)
+++ zodb/trunk/debian/control 2009-03-29 19:50:23 UTC (rev 1369)
@@ -5,15 +5,14 @@
Uploaders: Fabio Tranchitella <kobold at debian.org>
Build-Depends: debhelper (>= 5.0.37.2), python-all-dev, python-central (>= 0.5.0), python (>= 2.3.5-7), dpatch
Build-Conflicts: python-extclass, python2.3-extclass
-Standards-Version: 3.7.3
-XS-Python-Version: 2.4
+Standards-Version: 3.8.0
+XS-Python-Version: all
-Package: python2.4-zodb
+Package: python-zodb
Architecture: any
Depends: ${python:Depends}, python-zopeinterface, ${shlibs:Depends}
-Replaces: zope3
-Conflicts: zope3
-Provides: python-zodb
+Replaces: zope3, python2.4-zodb
+Conflicts: zope3, python2.4-zodb
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
Modified: zodb/trunk/debian/patches/00list
===================================================================
--- zodb/trunk/debian/patches/00list 2009-03-27 13:33:59 UTC (rev 1368)
+++ zodb/trunk/debian/patches/00list 2009-03-29 19:50:23 UTC (rev 1369)
@@ -0,0 +1 @@
+py2.6
Added: zodb/trunk/debian/patches/py2.6.dpatch
===================================================================
--- zodb/trunk/debian/patches/py2.6.dpatch (rev 0)
+++ zodb/trunk/debian/patches/py2.6.dpatch 2009-03-29 19:50:23 UTC (rev 1369)
@@ -0,0 +1,44 @@
+## DP: Author: Fabio Tranchitella <kobold at debian.org>
+
+. $(dirname $0)/DPATCH
+
+exit 0
+ at DPATCH@
+diff -urN zodb-3.6.0.orig/Dependencies/ZODB-Scripts-ZODB3-3.6.0/ZODB-Scripts/zeoserverlog.py zodb-3.6.0/Dependencies/ZODB-Scripts-ZODB3-3.6.0/ZODB-Scripts/zeoserverlog.py
+--- zodb-3.6.0.orig/Dependencies/ZODB-Scripts-ZODB3-3.6.0/ZODB-Scripts/zeoserverlog.py
++++ zodb-3.6.0/Dependencies/ZODB-Scripts-ZODB3-3.6.0/ZODB-Scripts/zeoserverlog.py
+@@ -372,7 +372,7 @@
+ rs = []
+ ss = []
+ cs = []
+- as = []
++ aborts = []
+ ts = []
+ cls = []
+
+@@ -392,7 +392,7 @@
+ rs.append(r)
+ ss.append(s)
+ cs.append(c)
+- as.append(a)
++ aborts.append(a)
+ ts.append(c+a)
+ mlast = m r = s = c = a = 0
+@@ -417,7 +417,7 @@
+ rs.append(r)
+ ss.append(s)
+ cs.append(c)
+- as.append(a)
++ aborts.append(a)
+ ts.append(c+a)
+
+ if summary:
+@@ -429,7 +429,7 @@
+ print 'Reads: \t', '\t'.join(map(str,stats( rs)))
+ print 'Stores: \t', '\t'.join(map(str,stats( ss)))
+ print 'Commits: \t', '\t'.join(map(str,stats( cs)))
+- print 'Aborts: \t', '\t'.join(map(str,stats( as)))
++ print 'Aborts: \t', '\t'.join(map(str,stats( aborts)))
+ print 'Trans: \t', '\t'.join(map(str,stats( ts)))
+
+ def stats(s):
Property changes on: zodb/trunk/debian/patches/py2.6.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: zodb/trunk/debian/rules
===================================================================
--- zodb/trunk/debian/rules 2009-03-27 13:33:59 UTC (rev 1368)
+++ zodb/trunk/debian/rules 2009-03-29 19:50:23 UTC (rev 1369)
@@ -25,22 +25,22 @@
for python in $(PYVERS); do \
$$python setup.py clean --all; \
$$python setup.py build; \
- $$python setup.py install --root=$(CURDIR)/debian/python2.4-zodb --no-compile ; \
- mkdir -p debian/python2.4-zodb/usr/share/doc/python2.4-zodb/ ; \
- mv debian/python2.4-zodb/usr/lib/python/site-packages/zope/testing/testrunner-ex \
- debian/python2.4-zodb/usr/share/doc/python2.4-zodb/ ; \
- chmod 644 debian/python2.4-zodb/usr/lib/$$python/site-packages/ZConfig/tests/runtests.bat ; \
- chmod 755 debian/python2.4-zodb/usr/lib/$$python/site-packages/ZEO/zeoctl.py \
- debian/python2.4-zodb/usr/lib/$$python/site-packages/ZConfig/tests/runtests.py \
- debian/python2.4-zodb/usr/lib/$$python/site-packages/zdaemon/tests/nokill.py ; \
- mkdir debian/python2.4-zodb/usr/lib/$$python/site-packages/ZODB/utilities ; \
- mv debian/python2.4-zodb/usr/bin/* debian/python2.4-zodb/usr/lib/$$python/site-packages/ZODB/utilities ; \
- rmdir debian/python2.4-zodb/usr/bin ; \
+ $$python setup.py install --root=$(CURDIR)/debian/python-zodb --no-compile ; \
+ mkdir -p debian/python-zodb/usr/share/doc/python-zodb/ ; \
+ mv debian/python-zodb/usr/lib/python/site-packages/zope/testing/testrunner-ex \
+ debian/python-zodb/usr/share/doc/python-zodb/ ; \
+ chmod 644 debian/python-zodb/usr/lib/$$python/site-packages/ZConfig/tests/runtests.bat ; \
+ chmod 755 debian/python-zodb/usr/lib/$$python/site-packages/ZEO/zeoctl.py \
+ debian/python-zodb/usr/lib/$$python/site-packages/ZConfig/tests/runtests.py \
+ debian/python-zodb/usr/lib/$$python/site-packages/zdaemon/tests/nokill.py ; \
+ mkdir debian/python-zodb/usr/lib/$$python/site-packages/ZODB/utilities ; \
+ mv debian/python-zodb/usr/bin/* debian/python-zodb/usr/lib/$$python/site-packages/ZODB/utilities ; \
+ rmdir debian/python-zodb/usr/bin ; \
done
: # Replace all '#!' calls to python with $(PY_INTERPRETER)
: # and make them executable
- for i in `find debian/python2.4-zodb -type f`; do \
+ 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 \