r1239 - in zope2.10/trunk/debian (changelog control rules)

[Fabio Tranchitella]

    Date: Monday, May 12, 2008 @ 10:03:43
  Author: kobold
Revision: 1239

* New upstream release.
* debian/rules, debian/control: use python-tz instead of shipping a private
  version of it. (Closes: #474597)

Modified:
  zope2.10/trunk/debian/changelog
  zope2.10/trunk/debian/control
  zope2.10/trunk/debian/rules

Modified: zope2.10/trunk/debian/changelog
===================================================================
--- zope2.10/trunk/debian/changelog	2008-05-06 07:10:00 UTC (rev 1238)
+++ zope2.10/trunk/debian/changelog	2008-05-12 10:03:43 UTC (rev 1239)
@@ -1,3 +1,11 @@
+zope2.10 (2.10.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules, debian/control: use python-tz instead of shipping a private
+    version of it. (Closes: #474597)
+
+ -- Fabio Tranchitella <kobold at debian.org>  Mon, 12 May 2008 11:59:51 +0200
+
 zope2.10 (2.10.5-3) unstable; urgency=low
 
   * debian/zopeZVER.NEWS.Debian: removed, the content was out-dated.

Modified: zope2.10/trunk/debian/control
===================================================================
--- zope2.10/trunk/debian/control	2008-05-06 07:10:00 UTC (rev 1238)
+++ zope2.10/trunk/debian/control	2008-05-12 10:03:43 UTC (rev 1239)
@@ -11,7 +11,7 @@
 Package: zope2.10
 Architecture: any
 Pre-Depends: zope-common (>= 0.5.21)
-Depends: python2.4 (>= 2.4.3), lsb-base, ${shlibs:Depends}, ${misc:Depends}, debconf | debconf-2.0
+Depends: python2.4 (>= 2.4.3), python-tz, lsb-base, ${shlibs:Depends}, ${misc:Depends}, debconf | debconf-2.0
 Provides: zope
 Suggests: python-unit, zope-book, zope-devguide
 XB-Python-Version: 2.4

Modified: zope2.10/trunk/debian/rules
===================================================================
--- zope2.10/trunk/debian/rules	2008-05-06 07:10:00 UTC (rev 1238)
+++ zope2.10/trunk/debian/rules	2008-05-12 10:03:43 UTC (rev 1239)
@@ -144,6 +144,9 @@
 	install -m 0644 debian/$(ZOPE).linda-overrides \
 	        $(DEBIAN)/usr/share/linda/overrides/$(ZOPE)
 
+	# use python-tz instead of shipping it
+	rm -fr $(DEBIAN)/usr/lib/zope2.10/lib/python/pytz
+
 	dh_installdocs -p$(ZOPE) z/README.txt
 	dh_installexamples -p$(ZOPE) z/lib/python/Products/PageTemplates/examples/*
 	dh_pycentral -p$(ZOPE) /usr/lib/$(ZOPE) -V $(PYTHONVER)