r2737 - in zodb/trunk/debian (8 files)

menesis-guest at users.alioth.debian.org menesis-guest at users.alioth.debian.org
Wed Jul 3 22:57:33 UTC 2013 

    Date: Wednesday, July 3, 2013 @ 22:57:32
  Author: menesis-guest
Revision: 2737

* Team upload.
* New upstream release.
* debian/patches/lp_135108.patch: remove, fixed upstream.
* debian/patches/no_manuel.patch: add to remove manuel from dependencies.
* debian/rules:
  - delete test files that import manuel.
  - do not fix shebangs, dh_python2 does it for us.
  - install upstream changelog.
* debian/compat: bump to 9
* debian/control:
  - require debhelper 9
  - enable autopkgtest (Closes: #692708).
  - remove ${python:Provides} to avoid creating virtual versioned package.
  - use canonical URI for Vcs-Svn and Vcs-Browser.
  - bump Standards-Version to 3.9.4
  - requires Python 2.5 or later.
* debian/tests: switch to zope.testrunner.

Modified:
  zodb/trunk/debian/changelog
  zodb/trunk/debian/compat
  zodb/trunk/debian/control
  zodb/trunk/debian/copyright
  zodb/trunk/debian/patches/series
  zodb/trunk/debian/rules
  zodb/trunk/debian/tests/all
  zodb/trunk/debian/tests/control

Modified: zodb/trunk/debian/changelog
===================================================================
--- zodb/trunk/debian/changelog	2013-07-03 16:17:02 UTC (rev 2736)
+++ zodb/trunk/debian/changelog	2013-07-03 22:57:32 UTC (rev 2737)
@@ -1,3 +1,25 @@
+zodb (1:3.10.5-1) UNRELEASED; urgency=low
+
+  * Team upload.
+  * New upstream release.
+  * debian/patches/lp_135108.patch: remove, fixed upstream.
+  * debian/patches/no_manuel.patch: add to remove manuel from dependencies.
+  * debian/rules:
+    - delete test files that import manuel.
+    - do not fix shebangs, dh_python2 does it for us.
+    - install upstream changelog.
+  * debian/compat: bump to 9
+  * debian/control:
+    - require debhelper 9
+    - enable autopkgtest (Closes: #692708).
+    - remove ${python:Provides} to avoid creating virtual versioned package.
+    - use canonical URI for Vcs-Svn and Vcs-Browser.
+    - bump Standards-Version to 3.9.4
+    - requires Python 2.5 or later.
+  * debian/tests: switch to zope.testrunner.
+
+ -- Gediminas Paulauskas <menesis at pov.lt>  Thu, 04 Jul 2013 01:50:00 +0300
+
 zodb (1:3.9.7-2) unstable; urgency=low
 
   * Team upload.

Modified: zodb/trunk/debian/compat
===================================================================
--- zodb/trunk/debian/compat	2013-07-03 16:17:02 UTC (rev 2736)
+++ zodb/trunk/debian/compat	2013-07-03 22:57:32 UTC (rev 2737)
@@ -1 +1 @@
-7
+9

Modified: zodb/trunk/debian/control
===================================================================
--- zodb/trunk/debian/control	2013-07-03 16:17:02 UTC (rev 2736)
+++ zodb/trunk/debian/control	2013-07-03 22:57:32 UTC (rev 2737)
@@ -4,14 +4,15 @@
 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~),
+Build-Depends: debhelper (>= 9),
                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
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-zope/zodb/trunk
+               python-van.pydeb,
+Standards-Version: 3.9.4
+X-Python-Version: >= 2.5
+XS-Testsuite: autopkgtest
+Vcs-Svn: svn://anonscm.debian.org/pkg-zope/zodb/trunk
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-zope/zodb/trunk
 Homepage: http://zodb.org/
 
 Package: python-zodb
@@ -20,7 +21,7 @@
          ${python:Depends},
          ${misc:Depends},
          ${shlibs:Depends}
-Provides: ${pydeb:Provides}, ${python:Provides}
+Provides: ${pydeb:Provides}
 Suggests: ${pydeb:Suggests}
 Conflicts: zope3
 Description: Zope Object Database (ZODB)

Modified: zodb/trunk/debian/copyright
===================================================================
--- zodb/trunk/debian/copyright	2013-07-03 16:17:02 UTC (rev 2736)
+++ zodb/trunk/debian/copyright	2013-07-03 22:57:32 UTC (rev 2737)
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ZODB3
 Upstream-Contact: Zope Foundation and Contributors <zope-dev at zope.org>
 Source: http://pypi.python.org/pypi/ZODB3

Modified: zodb/trunk/debian/patches/series
===================================================================
--- zodb/trunk/debian/patches/series	2013-07-03 16:17:02 UTC (rev 2736)
+++ zodb/trunk/debian/patches/series	2013-07-03 22:57:32 UTC (rev 2737)
@@ -1 +1 @@
-lp_135108.patch
+no-manuel.patch

Modified: zodb/trunk/debian/rules
===================================================================
--- zodb/trunk/debian/rules	2013-07-03 16:17:02 UTC (rev 2736)
+++ zodb/trunk/debian/rules	2013-07-03 22:57:32 UTC (rev 2737)
@@ -3,14 +3,15 @@
 export PYDEB_SUGGESTS_EXTRAS=test
 
 %:
-	dh --with pydeb --with python2 $@
+	dh $@ --with pydeb --with python2
 
 override_dh_install:
 	dh_install
-	# 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 tests that import manuel, not available
+	rm debian/python-zodb/usr/lib/python2.*/*-packages/ZODB/tests/testconflictresolution.py
+	rm debian/python-zodb/usr/lib/python2.*/*-packages/ZODB/tests/testhistoricalconnections.py
 	# remove C source files
 	find debian/python-zodb -name '*.c' -delete
+
+override_dh_installchangelogs:
+	dh_installchangelogs src/CHANGES.txt

Modified: zodb/trunk/debian/tests/all
===================================================================
--- zodb/trunk/debian/tests/all	2013-07-03 16:17:02 UTC (rev 2736)
+++ zodb/trunk/debian/tests/all	2013-07-03 22:57:32 UTC (rev 2737)
@@ -6,7 +6,7 @@
 TMPFILE=$(mktemp)
 
 cat > $TMPFILE << EOF
-from zope.testing import testrunner
+from zope import testrunner
 from distutils import sysconfig
 
 test_path = sysconfig.get_python_lib()
@@ -20,7 +20,7 @@
 EOF
 
 for version in ${PYVERS}; do
-    Running tests for python${version}
+    echo Running tests for python${version}
     python${version} ${TMPFILE}
 done
 

Modified: zodb/trunk/debian/tests/control
===================================================================
--- zodb/trunk/debian/tests/control	2013-07-03 16:17:02 UTC (rev 2736)
+++ zodb/trunk/debian/tests/control	2013-07-03 22:57:32 UTC (rev 2737)
@@ -1,3 +1,2 @@
 Tests: all
-Features: no-build-needed
-Depends: @, python-zope.testing
+Depends: @, python-zope.testrunner, python-zope.testing

More information about the pkg-zope-developers mailing list