[Pkg-zope-developers] Bug#317742: pytz is bundled

[Brian Sutherland]

On Mon, Jul 11, 2005 at 05:32:06PM +0900, Seo Sanghyeon wrote:
> Package: zope3-lib
> Version: 3.0.91-1
> Severity: wishlist
> 
> zope3-lib package bundles pytz. It should use python-tz package instead.

patch attached. It also changes the way docutils is removed so that
`./debian/rules check` will be done against the currently installed
python-docutils and saves CPU cycles:)

> To do this, python-tz needs to be built for Python 2.4. Maintainer CC'd.

I will get my sponsor to upload this as soon as I am back from my
holidays:)

-- 
Brian Sutherland

Metropolis - "it's the first movie with a robot. And she's a woman.
              And she's EVIL!!"
-------------- next part --------------
diff -u -r zope3--debian--3.1--patch-1/control zope3--debian--3.1--patch-4/control
--- zope3--debian--3.1--patch-1/control	2005-07-28 23:44:53.932604944 +0200
+++ zope3--debian--3.1--patch-4/control	2005-07-28 23:53:24.593972616 +0200
@@ -9,7 +9,7 @@
 Package: zope3-lib
 Section: python
 Architecture: any
-Depends: ${z3lib:Depends}, ${shlibs:Depends}, python-docutils (>= 0.3.7)
+Depends: ${z3lib:Depends}, ${shlibs:Depends}, python-docutils (>= 0.3.7), python2.4-tz (>= 2005i)
 Conflicts: zopex3-lib, python2.4-zopeinterface
 Replaces: zopex3-lib
 Provides: python2.4-zopeinterface
diff -u -r zope3--debian--3.1--patch-1/rules zope3--debian--3.1--patch-4/rules
--- zope3--debian--3.1--patch-1/rules	2005-07-28 23:44:53.955601448 +0200
+++ zope3--debian--3.1--patch-4/rules	2005-07-28 23:53:24.594972464 +0200
@@ -54,6 +54,11 @@
 unpack-stamp:
 	tar xfz $(zbase).tgz
 	mv $(zbase) z
+	
+	: # Remove docutils and pytz modules packaged in separate packages
+	rm -rf z/Dependencies/docutils*
+	rm -rf z/Dependencies/pytz*
+	
 	touch unpack-stamp
 
 configure: config-stamp
@@ -166,9 +171,6 @@
 	)
 endif
 
-	: # Remove docutils module packaged in a separate package
-	rm -rf $(d_lib)/$(pylibdir)/docutils
-
 	-find $(d_lib)/$(pylibdir) -depth -type d -empty -exec rmdir {} \;
 
 #	for d in `find debian/$(PYVER)-zopeinterface -depth -type d -empty 2> /dev/null`; do \