r1231 - in zope3/trunk/debian (4 files)

[Fabio Tranchitella]

    Date: Wednesday, April 23, 2008 @ 08:10:32
  Author: kobold
Revision: 1231

Updates from doko.

Modified:
  zope3/trunk/debian/changelog
  zope3/trunk/debian/control
  zope3/trunk/debian/rules
  zope3/trunk/debian/zopeZVER-sandbox.templates.in

Modified: zope3/trunk/debian/changelog
===================================================================
--- zope3/trunk/debian/changelog	2008-04-23 08:06:05 UTC (rev 1230)
+++ zope3/trunk/debian/changelog	2008-04-23 08:10:32 UTC (rev 1231)
@@ -1,3 +1,11 @@
+zope3 (3.4.0~c1-2) UNRELEASED; urgency=low
+
+  * Merge from Ubuntu:
+    - Set the egg version for zope.interface to 3.3.1. LP: #185418.
+    - Drop dependency on python-xml. Closes: #468621.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 22 Apr 2008 02:08:03 +0200
+
 zope3 (3.4.0~c1-1) experimental; urgency=low
 
   * New upstream release (candidate 1).

Modified: zope3/trunk/debian/control
===================================================================
--- zope3/trunk/debian/control	2008-04-23 08:06:05 UTC (rev 1230)
+++ zope3/trunk/debian/control	2008-04-23 08:10:32 UTC (rev 1231)
@@ -12,7 +12,7 @@
 Section: python
 Architecture: any
 Pre-Depends: zope-common
-Depends: python2.4 (>= 2.4.2), python-zopeinterface (= ${binary:Version}), ${shlibs:Depends}, python-docutils (>= 0.3.7) | python2.4-docutils (>= 0.3.7), python-tz (>= 2007f-1), python-mechanize (>= 0.1.2b-1), python-clientform (>= 0.2.2-2), python-twisted-conch (>= 1:0.8), python-twisted-web2 (>= 0.2.0+svn20070403), python-xml (>= 0.8.4-5), lsb-base
+Depends: python2.4 (>= 2.4.2), python-zopeinterface (= ${binary:Version}), ${shlibs:Depends}, python-docutils (>= 0.3.7) | python2.4-docutils (>= 0.3.7), python-tz (>= 2007f-1), python-mechanize (>= 0.1.2b-1), python-clientform (>= 0.2.2-2), python-twisted-conch (>= 1:0.8), python-twisted-web2 (>= 0.2.0+svn20070403), lsb-base
 Conflicts: zopex3-lib, zope3-lib
 Replaces: zopex3-lib, zope3-lib
 Provides: zope3-lib
@@ -40,7 +40,7 @@
 Section: python
 Architecture: any
 Pre-Depends: zope-common
-Depends: zope3 (= ${binary:Version}), python-dbg, python-zopeinterface-dbg, python-xml-dbg, python-crypto-dbg, python-twisted-bin-dbg, ${shlibs:Depends}
+Depends: zope3 (= ${binary:Version}), python-dbg, python-zopeinterface-dbg, python-crypto-dbg, python-twisted-bin-dbg, ${shlibs:Depends}
 Description: Open Source Web Application Server (debug extensions)
  Zope is an open source web application server primarily written in
  the Python programming language. It features a transactional object

Modified: zope3/trunk/debian/rules
===================================================================
--- zope3/trunk/debian/rules	2008-04-23 08:06:05 UTC (rev 1230)
+++ zope3/trunk/debian/rules	2008-04-23 08:10:32 UTC (rev 1231)
@@ -13,7 +13,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-zbase	 = Zope-3.4.0c1
+version  = $(subst zope3-,,$(notdir $(CURDIR)))
+zbase	 = Zope-$(version)
 
 PV		 := 2.4
 ZVER     := 3
@@ -203,6 +204,12 @@
 	    && /usr/bin/python$* setup.py install --root=$(CURDIR)/$(d_zif)
 	-find debian/python-zopeinterface -name '*.py[co]' | xargs rm -f
 
+	# fix the egg version
+	sed -e '/^Version:/s/:.*/: $(version)/' \
+		$(d_zif)/usr/lib/python$*/site-packages/zope.interface-0.0.0.egg-info \
+		> $(d_zif)/usr/lib/python$*/site-packages/zope.interface-$(version).egg-info
+	rm -f $(d_zif)/usr/lib/python$*/site-packages/zope.interface-0.0.0.egg-info
+
 	# Copy README.txt to the right place
 	# (Zope needs the README to be there, see #332845)
 	mkdir -p $(d_zif)/usr/share/doc/$(p_zif)

Modified: zope3/trunk/debian/zopeZVER-sandbox.templates.in
===================================================================
--- zope3/trunk/debian/zopeZVER-sandbox.templates.in	2008-04-23 08:06:05 UTC (rev 1230)
+++ zope3/trunk/debian/zopeZVER-sandbox.templates.in	2008-04-23 08:10:32 UTC (rev 1231)
@@ -1,3 +1,3 @@
 Template: zope at ZVER@-sandbox/internal
 Type: note
-Description: Internal use
+Description: Internal use.