r1899 - in zope.component/trunk/debian (5 files)

jinty-guest at users.alioth.debian.org jinty-guest at users.alioth.debian.org
Wed Dec 2 07:43:03 UTC 2009 

    Date: Wednesday, December 2, 2009 @ 07:43:03
  Author: jinty-guest
Revision: 1899

   * debian/tests/control: add missing test dependencies. 
   * Convert to debhelper 7 and the pydeb dh7 extension. 

This is a merge of 1889:1898 from the jinty-dh7 branch:

	------------------------------------------------------------------------
	r1898 | jinty-guest | 2009-12-02 08:37:27 +0100 (Wed, 02 Dec 2009) | 1 line

	Move persistentregistry extra to Suggests, http://lists.alioth.debian.org/pipermail/pkg-zope-developers/2009-December/005681.html
	------------------------------------------------------------------------
	r1897 | jinty-guest | 2009-12-02 08:34:33 +0100 (Wed, 02 Dec 2009) | 1 line

	actually install files
	------------------------------------------------------------------------
	r1894 | jinty-guest | 2009-12-01 10:27:17 +0100 (Tue, 01 Dec 2009) | 1 line

	Convert {setuptools:Depends} to {pydeb:Depends}
	------------------------------------------------------------------------
	r1891 | jinty-guest | 2009-11-25 00:01:46 +0100 (Wed, 25 Nov 2009) | 1 line

	actually export the variables
	------------------------------------------------------------------------
	r1890 | jinty-guest | 2009-11-24 18:28:11 +0100 (Tue, 24 Nov 2009) | 1 line

	Dreaming about how the zope.component package should look in a dh 7 world

Added:
  zope.component/trunk/debian/python-zope.component.install
    (from rev 1898, zope.component/branches/jinty-dh7/debian/python-zope.component.install)
Modified:
  zope.component/trunk/debian/changelog
  zope.component/trunk/debian/compat
  zope.component/trunk/debian/control
  zope.component/trunk/debian/rules

Modified: zope.component/trunk/debian/changelog
===================================================================
--- zope.component/trunk/debian/changelog	2009-12-02 07:37:27 UTC (rev 1898)
+++ zope.component/trunk/debian/changelog	2009-12-02 07:43:03 UTC (rev 1899)
@@ -1,8 +1,10 @@
 zope.component (3.7.1-6) UNRELEASED; urgency=low
 
   * debian/tests/control: add missing test dependencies. 
+  * Convert to debhelper 7 and the pydeb dh7 extension. 
+  * Move persistentregistry extra to Suggests:* 
 
- -- Brian Sutherland <brian at vanguardistas.net>  Sun, 22 Nov 2009 18:27:31 +0100
+ -- Brian Sutherland <brian at vanguardistas.net>  Tue, 01 Dec 2009 20:08:05 +0100
 
 zope.component (3.7.1-5) unstable; urgency=low
 

Modified: zope.component/trunk/debian/compat
===================================================================
--- zope.component/trunk/debian/compat	2009-12-02 07:37:27 UTC (rev 1898)
+++ zope.component/trunk/debian/compat	2009-12-02 07:43:03 UTC (rev 1899)
@@ -1 +1 @@
-4
+7

Modified: zope.component/trunk/debian/control
===================================================================
--- zope.component/trunk/debian/control	2009-12-02 07:37:27 UTC (rev 1898)
+++ zope.component/trunk/debian/control	2009-12-02 07:43:03 UTC (rev 1899)
@@ -3,17 +3,17 @@
 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 (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3), python-van.pydeb (>= 1.3.0-2)
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-11), python-central (>= 0.6.8), python-setuptools (>= 0.6b3), python-van.pydeb (>= 1.3.0-3)
 Standards-Version: 3.8.3
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope.component/trunk
 
 Package: python-zope.component
 Architecture: all
-Depends: ${setuptools:Depends}, ${python:Depends}
-Recommends: ${setuptools:Recommends}
-Provides: ${setuptools:Provides}
-Suggests: ${python:Provides}, ${setuptools:Suggests}
+Depends: ${pydeb:Depends}, ${python:Depends}
+Recommends: ${pydeb:Recommends}
+Provides: ${pydeb:Provides}
+Suggests: ${python:Provides}, ${pydeb:Suggests}
 Conflicts: zope3
 XB-Python-Version: ${python:Versions}
 Description: Zope Component Architecture
@@ -23,7 +23,7 @@
 
 Package: python-zope.component-zcml
 Architecture: all
-Depends: python-zope.component (= ${binary:Version}), ${setuptools:Depends}, ${python:Depends}
+Depends: python-zope.component (= ${binary:Version}), ${pydeb:Depends}, ${python:Depends}
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Metapackage for zope.component zcml extra

Copied: zope.component/trunk/debian/python-zope.component.install (from rev 1898, zope.component/branches/jinty-dh7/debian/python-zope.component.install)
===================================================================
--- zope.component/trunk/debian/python-zope.component.install	                        (rev 0)
+++ zope.component/trunk/debian/python-zope.component.install	2009-12-02 07:43:03 UTC (rev 1899)
@@ -0,0 +1 @@
+debian/tmp/*

Modified: zope.component/trunk/debian/rules
===================================================================
--- zope.component/trunk/debian/rules	2009-12-02 07:37:27 UTC (rev 1898)
+++ zope.component/trunk/debian/rules	2009-12-02 07:43:03 UTC (rev 1899)
@@ -1,13 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/python-van.pydeb/rules_templates/rules.1.mk
+export PYDEB_SUGGESTS_EXTRAS=docs test persistentregistry
+export PYDEB_RECOMMENDS_EXTRAS=hook
+export PYDEB_METAPACKAGE_EXTRAS=zcml
 
-dependencies-python%:
-	(echo -n 'setuptools:Depends=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --exclude-extra hook --exclude-extra test --exclude-extra zcml --exclude-extra docs) >> debian/$(package).substvars
-	(echo -n 'setuptools:Provides=' && van-pydeb provides --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --exclude-extra hook --exclude-extra test --exclude-extra zcml --exclude-extra docs) >> debian/$(package).substvars
-	# the hook extra is an optimization, to Recommends
-	(echo -n 'setuptools:Recommends=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --extra hook) >> debian/$(package).substvars
-	# docs and test to suggests
-	(echo -n 'setuptools:Suggests=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --extra docs --extra test) >> debian/$(package).substvars
-	# -zcml metapackage dependencies
-	(echo -n 'setuptools:Depends=' && van-pydeb depends --egg-info debian/$(package)/$(call py_libdir,$*)/$(py_package).egg-info --extra zcml) >> debian/$(package)-zcml.substvars
+%:
+	dh --with pydeb --with python-central $@

More information about the pkg-zope-developers mailing list