r2826 - in zope.component/trunk/debian (8 files)

[barry at users.alioth.debian.org]

    Date: Wednesday, June 25, 2014 @ 22:02:17
  Author: barry
Revision: 2826

* New upstream release.  (Closes: #706214)
* d/patches/explicit-test-requires.patch: Added, to prevent unwanted
  download attempts from PyPI during package build.
* d/python-zope.component-persistentregistry.lintian-overrides,
  d/python-zope.component-security.lintian-overrides: Added.

Added:
  zope.component/trunk/debian/patches/
  zope.component/trunk/debian/patches/explicit-test-requires.patch
  zope.component/trunk/debian/patches/series
  zope.component/trunk/debian/python-zope.component-persistentregistry.lintian-overrides
  zope.component/trunk/debian/python-zope.component-security.lintian-overrides
Modified:
  zope.component/trunk/debian/changelog
  zope.component/trunk/debian/control
  zope.component/trunk/debian/rules

Modified: zope.component/trunk/debian/changelog
===================================================================
--- zope.component/trunk/debian/changelog	2014-06-25 19:15:57 UTC (rev 2825)
+++ zope.component/trunk/debian/changelog	2014-06-25 22:02:17 UTC (rev 2826)
@@ -13,7 +13,7 @@
     - Removed conflict with zope3.
 
   [ Barry Warsaw ]
-  * New upstream release.
+  * New upstream release.  (Closes: #706214)
   * d/compat: Bump version to 9.
   * d/control:
     - Update Build-Depends.
@@ -28,6 +28,10 @@
       docs/_build from the original tarball.
   * d/python-zope.component.install: Removed.
   * d/rules Convert to --buildsystem=pybuild and add dh_python3.
+  * d/patches/explicit-test-requires.patch: Added, to prevent unwanted
+    download attempts from PyPI during package build.
+  * d/python-zope.component-persistentregistry.lintian-overrides,
+    d/python-zope.component-security.lintian-overrides: Added.
 
  -- Barry Warsaw <barry at debian.org>  Fri, 20 Jun 2014 09:50:53 -0400
 

Modified: zope.component/trunk/debian/control
===================================================================
--- zope.component/trunk/debian/control	2014-06-25 19:15:57 UTC (rev 2825)
+++ zope.component/trunk/debian/control	2014-06-25 22:02:17 UTC (rev 2826)
@@ -10,9 +10,13 @@
                python-all (>= 2.6.6-3~),
                python-setuptools,
                python-zope.event,
+               python-zope.interface,
+               python-zope.proxy,
                python3-all,
                python3-setuptools,
                python3-zope.event,
+               python3-zope.interface,
+               python3-zope.proxy
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2

Added: zope.component/trunk/debian/patches/explicit-test-requires.patch
===================================================================
--- zope.component/trunk/debian/patches/explicit-test-requires.patch	                        (rev 0)
+++ zope.component/trunk/debian/patches/explicit-test-requires.patch	2014-06-25 22:02:17 UTC (rev 2826)
@@ -0,0 +1,26 @@
+Description: Comment out recursive test requires, since this will cause
+ package build to try to download the zope.component package from PyPI, but
+ this is not allowed.  Instead, we'll add the requirements explicitly in the
+ debian/control file.
+Author: Barry Warsaw <barry at debian.org>
+Forwarded: not-needed
+
+--- a/setup.py
++++ b/setup.py
+@@ -24,11 +24,11 @@
+ 
+ 
+ TESTS_REQUIRE = [
+-    'zope.testing',
+-    'zope.component[hook]',
+-    'zope.component[persistentregistry]',
+-    'zope.component[security]',
+-    'zope.component[zcml]',
++    ## 'zope.testing',
++    ## 'zope.component[hook]',
++    ## 'zope.component[persistentregistry]',
++    ## 'zope.component[security]',
++    ## 'zope.component[zcml]',
+     ]
+ 
+ def _modname(path, base, name=''):

Added: zope.component/trunk/debian/patches/series
===================================================================
--- zope.component/trunk/debian/patches/series	                        (rev 0)
+++ zope.component/trunk/debian/patches/series	2014-06-25 22:02:17 UTC (rev 2826)
@@ -0,0 +1 @@
+explicit-test-requires.patch

Added: zope.component/trunk/debian/python-zope.component-persistentregistry.lintian-overrides
===================================================================
--- zope.component/trunk/debian/python-zope.component-persistentregistry.lintian-overrides	                        (rev 0)
+++ zope.component/trunk/debian/python-zope.component-persistentregistry.lintian-overrides	2014-06-25 22:02:17 UTC (rev 2826)
@@ -0,0 +1,4 @@
+# our section is zope
+wrong-section-according-to-package-name python-zope.component-test => python
+# this package only adds extra dependencies
+python-zope.component-persistentregistry binary: empty-binary-package

Added: zope.component/trunk/debian/python-zope.component-security.lintian-overrides
===================================================================
--- zope.component/trunk/debian/python-zope.component-security.lintian-overrides	                        (rev 0)
+++ zope.component/trunk/debian/python-zope.component-security.lintian-overrides	2014-06-25 22:02:17 UTC (rev 2826)
@@ -0,0 +1,4 @@
+# our section is zope
+wrong-section-according-to-package-name python-zope.component-test => python
+# this package only adds extra dependencies
+python-zope.component-security binary: empty-binary-package

Modified: zope.component/trunk/debian/rules
===================================================================
--- zope.component/trunk/debian/rules	2014-06-25 19:15:57 UTC (rev 2825)
+++ zope.component/trunk/debian/rules	2014-06-25 22:02:17 UTC (rev 2826)
@@ -5,12 +5,12 @@
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
 
-# override_dh_gencontrol:
-# 	dh_gencontrol
 
-# 	# dh_pydeb does not remove setuptools from requires.txt
-# 	find debian/python-zope.component -name requires.txt \
-# 		-exec sed -i '/^setuptools$$/d' {} \;
+# Disable all tests temporarily to break circular build dependencies.
+# See bug #752723
+override_dh_auto_test:
 
+
 override_dh_installchangelogs:
-	dh_installchangelogs CHANGES.txt
+	dh_installchangelogs
+	dh_installchangelogs CHANGES.rst