r1334 - in zope3/trunk/debian (5 files)

Matthias Klose doko at alioth.debian.org
Sat Feb 21 11:57:39 UTC 2009 

    Date: Saturday, February 21, 2009 @ 11:57:38
  Author: doko
Revision: 1334

zope3 (3.4.0-1~exp1) experimental; urgency=low

  * New upstream version, final release.
  * Merge changes from 3.3.1-6 and 3.3.1-7.
  * Build using python2.5.

 -- Matthias Klose <doko at debian.org>  Thu, 19 Feb 2009 16:46:26 +0100

Modified:
  zope3/trunk/debian/changelog
  zope3/trunk/debian/control
  zope3/trunk/debian/patches/deb-zopeconf.dpatch
  zope3/trunk/debian/rules
  zope3/trunk/debian/zopeZVER.linda-overrides.in

Modified: zope3/trunk/debian/changelog
===================================================================
--- zope3/trunk/debian/changelog	2008-12-29 21:44:47 UTC (rev 1333)
+++ zope3/trunk/debian/changelog	2009-02-21 11:57:38 UTC (rev 1334)
@@ -1,10 +1,10 @@
-zope3 (3.4.0~c1-2) UNRELEASED; urgency=low
+zope3 (3.4.0-1~exp1) experimental; 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.
+  * New upstream version, final release.
+  * Merge changes from 3.3.1-6 and 3.3.1-7.
+  * Build using python2.5.
 
- -- Matthias Klose <doko at debian.org>  Tue, 22 Apr 2008 02:08:03 +0200
+ -- Matthias Klose <doko at debian.org>  Thu, 19 Feb 2009 16:46:26 +0100
 
 zope3 (3.4.0~c1-1) experimental; urgency=low
 
@@ -14,6 +14,21 @@
 
  -- Fabio Tranchitella <kobold at debian.org>  Wed, 19 Mar 2008 10:55:52 +0100
 
+zope3 (3.3.1-7) unstable; urgency=low
+
+  * debian/rules: hardcoded version number, we can't really relay on the
+    name of the source directory. (Closes: #483333)
+
+ -- Fabio Tranchitella <kobold at debian.org>  Wed, 28 May 2008 13:39:43 +0200
+
+zope3 (3.3.1-6) unstable; 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:01:15 +0200
+
 zope3 (3.3.1-5) unstable; urgency=low
 
   * debian/control: added dependency on ${shlibs:Depends} for

Modified: zope3/trunk/debian/control
===================================================================
--- zope3/trunk/debian/control	2008-12-29 21:44:47 UTC (rev 1333)
+++ zope3/trunk/debian/control	2009-02-21 11:57:38 UTC (rev 1334)
@@ -3,21 +3,21 @@
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Matthias Klose <doko at debian.org>, Fabio Tranchitella <kobold at debian.org>, Brian Sutherland <jinty at web.de>
-Build-Depends: python, python-all-dev (>= 2.3.5-11), python-all-dbg, debhelper (>= 5.0.39), python-central (>= 0.5), zope-debhelper (>= 0.3.6), lsb-release, dpatch
-Standards-Version: 3.7.3
+Build-Depends: python2.5-dev (>= 2.5.4-1), python, python-all-dev (>= 2.3.5-11), python-all-dbg, debhelper (>= 5.0.39), python-central (>= 0.5), zope-debhelper (>= 0.3.6), lsb-release, dpatch
+Standards-Version: 3.8.0
 XS-Python-Version: all
-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope3/trunk
+XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope3/trunk
 
 Package: zope3
 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), lsb-base
+Depends: python2.5 (>= 2.5.2), python-zopeinterface (= ${binary:Version}), ${shlibs:Depends}, python-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
 Suggests: zope3-dbg
-XB-Python-Version: 2.4
+XB-Python-Version: 2.5
 Description: Open Source Web Application Server (Libraries)
  Zope is an open source web application server primarily written in
  the Python programming language. It features a transactional object

Modified: zope3/trunk/debian/patches/deb-zopeconf.dpatch
===================================================================
--- zope3/trunk/debian/patches/deb-zopeconf.dpatch	2008-12-29 21:44:47 UTC (rev 1333)
+++ zope3/trunk/debian/patches/deb-zopeconf.dpatch	2009-02-21 11:57:38 UTC (rev 1334)
@@ -6,9 +6,9 @@
 . $(dirname $0)/DPATCH
 
 @DPATCH@
-diff -urN zope3-3.4.0~c1/z/Dependencies/zope.app.server-Zope-3.4.0c1/zope.app.server/mkzopeinstance.py zope3-3.4.0~c1.debian/z/Dependencies/zope.app.server-Zope-3.4.0c1/zope.app.server/mkzopeinstance.py
---- zope3-3.4.0~c1/z/Dependencies/zope.app.server-Zope-3.4.0c1/zope.app.server/mkzopeinstance.py	2008-01-31 23:38:32.000000000 +0100
-+++ zope3-3.4.0~c1.debian/z/Dependencies/zope.app.server-Zope-3.4.0c1/zope.app.server/mkzopeinstance.py	2008-03-19 10:05:54.000000000 +0100
+diff -urN zope3-3.4.01/z/Dependencies/zope.app.server-Zope-3.4.0/zope.app.server/mkzopeinstance.py zope3-3.4.0.debian/z/Dependencies/zope.app.server-Zope-3.4.0/zope.app.server/mkzopeinstance.py
+--- zope3-3.4.0/z/Dependencies/zope.app.server-Zope-3.4.0/zope.app.server/mkzopeinstance.py	2008-01-31 23:38:32.000000000 +0100
++++ zope3-3.4.0.debian/z/Dependencies/zope.app.server-Zope-3.4.0/zope.app.server/mkzopeinstance.py	2008-03-19 10:05:54.000000000 +0100
 @@ -117,8 +117,15 @@
  
          options.password = password_manager.encodePassword(options.password)

Modified: zope3/trunk/debian/rules
===================================================================
--- zope3/trunk/debian/rules	2008-12-29 21:44:47 UTC (rev 1333)
+++ zope3/trunk/debian/rules	2009-02-21 11:57:38 UTC (rev 1334)
@@ -13,10 +13,10 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-version  = $(subst zope3-,,$(notdir $(CURDIR)))
-zbase	 = Zope-$(version)
+version	= 3.4.0
+zbase	 = Zope-3.4.0
 
-PV		 := 2.4
+PV	 := 2.5
 ZVER     := 3
 PYVER	 := python$(PV)
 PYVERS	:= $(shell pyversions -vs)
@@ -115,16 +115,16 @@
 
 install-arch: build-arch build-dbg install-prereq $(PYVERS:%=install-zif-python%) install-zope-dbg
 	# Remove not needed stuff
-	rm -fr $(d_lib)/usr/lib/python2.4/site-packages/twisted/trial/test/scripttest.py \
-	       $(d_lib)/usr/lib/python2.4/site-packages/mechanize \
-	       $(d_lib)/usr/lib/python2.4/site-packages/ClientCookie \
-	       $(d_lib)/usr/lib/python2.4/site-packages/zope/formlib/LICENSE.txt
+	rm -fr $(d_lib)/usr/lib/python2.[46]/*-packages/twisted/trial/test/scripttest.py \
+	       $(d_lib)/usr/lib/python2.[46]/*-packages/mechanize \
+	       $(d_lib)/usr/lib/python2.[46]/*-packages/ClientCookie \
+	       $(d_lib)/usr/lib/python2.[46]/*-packages/zope/formlib/LICENSE.txt
 
 	# remove docutils and pytz
-	rm -fr $(d_lib)/usr/lib/python2.4/site-packages/docutils \
-	       $(d_lib)/usr/lib/python2.4/site-packages/pytz \
-		   $(d_lib)/usr/lib/python2.4/site-packages/ClientForm.py \
-		   $(d_lib)/usr/lib/python2.4/site-packages/pullparser.py
+	rm -fr $(d_lib)/usr/lib/python2.[46]/*-packages/docutils \
+	       $(d_lib)/usr/lib/python2.[46]/*-packages/pytz \
+		   $(d_lib)/usr/lib/python2.[46]/*-packages/ClientForm.py \
+		   $(d_lib)/usr/lib/python2.[46]/*-packages/pullparser.py
 
 	# remove files from zope3 also in default zopeinterface package
 	( \
@@ -150,7 +150,7 @@
 
 	dh_installdirs
 	dh_installzopeinstance -pzope$(ZVER)-sandbox sandbox
-	cd z && $(PYTHON) install.py install \
+	cd z && $(PYTHON) install.py install --install-layout=deb \
 	    --skip-build --no-compile --root $(CURDIR)/$(d)
 	-find $(d) -name '*.py[co]' | xargs -n 100 rm -f
 	rm -rf $(d)/$(pylibdir)/twisted
@@ -192,23 +192,25 @@
 	        $(d_lib)/usr/share/linda/overrides/$(p_lib)
 
 install-zope-dbg:
-	cd zdbg && $(PYTHON)-dbg install.py install \
+	cd zdbg && $(PYTHON)-dbg install.py install --install-layout=deb \
 	    --skip-build --no-compile --root $(CURDIR)/$(d_libdbg)
 	find $(d_libdbg) ! -type d ! -name '*.so' | xargs rm -f
 	find $(d_libdbg) -depth -empty -exec rmdir {} \;
-	rm -rf debian/zope3-dbg/usr/lib/python*/site-packages/zope/interface
+	rm -rf debian/zope3-dbg/usr/lib/python*/*-packages/zope/interface
 
 install-zif-python%:
 	# install zopeinterface packages
 	cd z/Dependencies/zope.interface-$(zbase) \
-	    && /usr/bin/python$* setup.py install --root=$(CURDIR)/$(d_zif)
+	    && /usr/bin/python$* setup.py install --root=$(CURDIR)/$(d_zif) --install-layout=deb
 	-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
+	for f in $(d_zif)/usr/lib/python$*/*-packages/zope.interface-0.0.0.egg-info; do \
+	  sed -e '/^Version:/s/:.*/: $(version)/' \
+	    $(d_zif)/usr/lib/python$*/*-packages/zope.interface-0.0.0.egg-info \
+	    > $$(dirname $$f)/zope.interface-$(version).egg-info; \
+	done
+	rm -f $(d_zif)/usr/lib/python$*/*-packages/zope.interface-0.0.0.egg-info
 
 	# Copy README.txt to the right place
 	# (Zope needs the README to be there, see #332845)
@@ -217,12 +219,12 @@
 
 	# Remove interface module which has been split out
 	cp -p $(d_lib)/$(pylibdir)/zope/__init__.py \
-		$(d_zif)/usr/lib/python$*/site-packages/zope/
+		$(d_zif)/usr/lib/python$*/*-packages/zope/
 	rm -rf $(d_lib)/$(pylibdir)/zope/interface
 
 	# debug extension
 	cd z/Dependencies/zope.interface-$(zbase) \
-	    && /usr/bin/python$*-dbg setup.py install --root=$(CURDIR)/$(d_zifdbg)
+	    && /usr/bin/python$*-dbg setup.py install --root=$(CURDIR)/$(d_zifdbg) --install-layout=deb
 	find $(d_zifdbg) ! -type d ! -name '*_d.so' | xargs rm -f
 	find $(d_zifdbg) -depth -empty -exec rmdir {} \;
 

Modified: zope3/trunk/debian/zopeZVER.linda-overrides.in
===================================================================
--- zope3/trunk/debian/zopeZVER.linda-overrides.in	2008-12-29 21:44:47 UTC (rev 1333)
+++ zope3/trunk/debian/zopeZVER.linda-overrides.in	2009-02-21 11:57:38 UTC (rev 1334)
@@ -1,7 +1,7 @@
 Tag: image-in-usr-lib
-Data: /usr/lib/python2.4/site-packages/zope/
+Data: /usr/lib/python2.5/site-packages/zope/
 Tag: script-not-executable
-Data: /usr/lib/python2.4/site-packages/zope/
+Data: /usr/lib/python2.5/site-packages/zope/
 Tag: interpreter-not-absolute
 Data: /usr/lib/zope3/zopeskel/bin/
 Tag: unusual-interpreter

More information about the pkg-zope-commits mailing list