r2964 - in zodb/trunk/debian (5 files)

[jmuchemb-guest at users.alioth.debian.org]

    Date: Tuesday, August 11, 2015 @ 13:47:01
  Author: jmuchemb-guest
Revision: 2964

Enable all tests now that python-manuel is packaged

Modified:
  zodb/trunk/debian/changelog
  zodb/trunk/debian/patches/series
  zodb/trunk/debian/rules
  zodb/trunk/debian/tests/control
Deleted:
  zodb/trunk/debian/patches/manuel-is-not-packaged-for-Debian.patch

Modified: zodb/trunk/debian/changelog
===================================================================
--- zodb/trunk/debian/changelog	2015-08-11 13:46:57 UTC (rev 2963)
+++ zodb/trunk/debian/changelog	2015-08-11 13:47:01 UTC (rev 2964)
@@ -5,9 +5,7 @@
   [ Gediminas Paulauskas ]
   * New upstream release 3.10.5
   * 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
@@ -27,7 +25,6 @@
   * Merge 1:3.9.7-5
   * New upstream 3.10.x snapshot (2014-03-10).
     - drop patches merged upstream: new-transaction.patch, testUtils.patch
-    - refresh patch that removes 'manuel' from dependencies
   * Manage patches with gbp-pq.
   * Add patch to fix possible data corruption after FileStorage is truncated
     to roll back a transaction.
@@ -36,6 +33,7 @@
     - fix broken dependency (the test suite don't require anymore an old
       version of python-zope.testing)
     - make sure tests are not run with root user
+    - depend on python-manuel, as required by a few tests
   * Update Standards-Version to 3.9.6 (no change needed).
   * debian/control:
     - build-depend on dh-python, as requested by dh_python2

Deleted: zodb/trunk/debian/patches/manuel-is-not-packaged-for-Debian.patch
===================================================================
--- zodb/trunk/debian/patches/manuel-is-not-packaged-for-Debian.patch	2015-08-11 13:46:57 UTC (rev 2963)
+++ zodb/trunk/debian/patches/manuel-is-not-packaged-for-Debian.patch	2015-08-11 13:47:01 UTC (rev 2964)
@@ -1,23 +0,0 @@
-From: Julien Muchembled <jm at jmuchemb.eu>
-Date: Tue, 2 Jun 2015 21:04:41 +0200
-Subject: manuel is not packaged for Debian
-
----
- setup.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 5d4beec..24bfca9 100644
---- a/setup.py
-+++ b/setup.py
-@@ -194,8 +194,8 @@ def read_file(*path):
-       classifiers = filter(None, classifiers.split("\n")),
-       long_description = long_description,
-       test_suite="__main__.alltests", # to support "setup.py test"
--      tests_require = ['zope.testing', manuel_version],
--      extras_require = dict(test=['zope.testing', manuel_version]),
-+      tests_require = ['zope.testing'],
-+      extras_require = dict(test=['zope.testing']),
-       install_requires = [
-         transaction_version,
-         'zc.lockfile',

Modified: zodb/trunk/debian/patches/series
===================================================================
--- zodb/trunk/debian/patches/series	2015-08-11 13:46:57 UTC (rev 2963)
+++ zodb/trunk/debian/patches/series	2015-08-11 13:47:01 UTC (rev 2964)
@@ -1,4 +1,3 @@
 Make-compatible-with-python-persistent-4.x.patch
 Don-t-provide-persistent-headers-in-python-zodb.patch
-manuel-is-not-packaged-for-Debian.patch
 Fix-possible-data-corruption-after-FileStorage-is-tr.patch

Modified: zodb/trunk/debian/rules
===================================================================
--- zodb/trunk/debian/rules	2015-08-11 13:46:57 UTC (rev 2963)
+++ zodb/trunk/debian/rules	2015-08-11 13:47:01 UTC (rev 2964)
@@ -7,9 +7,6 @@
 
 override_dh_install:
 	dh_install
-	# 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
 	# remove persistent module provided by python-persistent instead

Modified: zodb/trunk/debian/tests/control
===================================================================
--- zodb/trunk/debian/tests/control	2015-08-11 13:46:57 UTC (rev 2963)
+++ zodb/trunk/debian/tests/control	2015-08-11 13:47:01 UTC (rev 2964)
@@ -1,2 +1,2 @@
 Tests: all
-Depends: @, python-zope.testrunner, python-zope.testing
+Depends: @, python-zope.testrunner, python-zope.testing, python-manuel