r1660 - in zope2.12 (6 files)

Sun Jul 5 22:28:36 UTC 2009

Date: Sunday, July 5, 2009 @ 22:28:36
  Author: mejo
Revision: 1660

upload 2.12.0~b2 tarball

Added:
  zope2.12/tarballs/zope2.12_2.12.0~b2.orig.tar.gz
Modified:
  zope2.12/trunk/debian/changelog
  zope2.12/trunk/debian/control
  zope2.12/trunk/debian/rules
  zope2.12/trunk/debian/watch
  zope2.12/trunk/debian/zopeZVER.preinst.in

Added: zope2.12/tarballs/zope2.12_2.12.0~b2.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: zope2.12/tarballs/zope2.12_2.12.0~b2.orig.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: zope2.12/trunk/debian/changelog
===================================================================

--- zope2.12/trunk/debian/changelog	2009-07-05 22:26:38 UTC (rev 1659)
+++ zope2.12/trunk/debian/changelog	2009-07-05 22:28:36 UTC (rev 1660)
@@ -1,8 +1,9 @@
-zope2.11 (2.11.3-2) UNRELEASED; urgency=low
+zope2.12 (2.12.0~b2-1) unstable; urgency=low
 
   * NOT RELEASED YET
+  * Remove pycentral cleanup code from debian/zopeZVER.preinst.in.
 
- -- Jonas Meurer <mejo at debian.org>  Fri, 03 Jul 2009 14:55:09 +0200
+ -- Jonas Meurer <mejo at debian.org>  Sun, 05 Jul 2009 17:33:48 +0200
 
 zope2.11 (2.11.3-1) unstable; urgency=low
 

Modified: zope2.12/trunk/debian/control
===================================================================
--- zope2.12/trunk/debian/control	2009-07-05 22:26:38 UTC (rev 1659)
+++ zope2.12/trunk/debian/control	2009-07-05 22:28:36 UTC (rev 1660)
@@ -1,19 +1,19 @@
-Source: zope2.11
+Source: zope2.12
 Section: zope
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Fabio Tranchitella <kobold at debian.org>, Jonas Meurer <mejo at debian.org>, Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 5.0.0), python-support (>= 0.5.3), python2.4-dev (>= 2.4.3), python2.4, python, zope-debhelper (>= 0.3.6), lsb-release, dpatch
+Build-Depends: debhelper (>= 6.0.0), python-support (>= 0.5.3), python2.5-dev, python2.5, python, zope-debhelper (>= 0.3.6), lsb-release, dpatch
 Standards-Version: 3.8.2
-XS-Python-Version: 2.4
+XS-Python-Version: 2.5
 Homepage: http://www.zope.org/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-zope/zope2.11/trunk
-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope2.11/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-zope/zope2.12/trunk
+Vcs-Svn: svn://svn.debian.org/pkg-zope/zope2.12/trunk
 
-Package: zope2.11
+Package: zope2.12
 Architecture: any
-Pre-Depends: zope-common (>= 0.5.21)
-Depends: python2.4 (>= 2.4.3), python-tz, lsb-base, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf | debconf-2.0
+Pre-Depends: zope-common (>= 0.5.22)
+Depends: python2.5, python-tz, lsb-base, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf | debconf-2.0
 Provides: zope
 Suggests: python-unit, zope-book, zope-devguide
 XB-Python-Version: 2.4
@@ -32,15 +32,15 @@
  to other organizations or individuals.
  .
  This package contains the framework and libraries needed to run your
- own Zope 2.11 instance.
+ own Zope 2.12 instance.
 
-Package: zope2.11-sandbox
+Package: zope2.12-sandbox
 Architecture: all
 Depends: ${zope:Depends}, ${misc:Depends}, debconf | debconf-2.0
 Suggests: zope-book, zope-devguide
-Description: sandbox instance for the zope2.11 web application server
+Description: sandbox instance for the zope2.12 web application server
  This package creates a "sandbox" instance, getting all Zope
  products and packages available which are installed as Debian packages.
  .
  The sandbox is usable for development and testing. For production
- please setup your own Zope 2.11 instance using dzhandle utility.
+ please setup your own Zope 2.12 instance using dzhandle utility.

Modified: zope2.12/trunk/debian/rules
===================================================================
--- zope2.12/trunk/debian/rules	2009-07-05 22:26:38 UTC (rev 1659)
+++ zope2.12/trunk/debian/rules	2009-07-05 22:28:36 UTC (rev 1660)
@@ -37,22 +37,15 @@
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
 
-ZVER	  := 2.11
+ZVER	  := 2.12
 ZOPE	  := zope$(ZVER)
 PACKAGE	  := zope$(ZVER)
-DEBIAN    := $(shell pwd)/debian/$(PACKAGE)
-PYTHONVER := 2.4
+DEBIAN    := $(CURDIR)/debian/$(PACKAGE)
+PYTHONVER := 2.6
 PYTHONBIN := /usr/bin/python$(PYTHONVER)
-ZBASE     := Zope-2.11.3-final
 
 distribution := $(shell lsb_release -is)
 
-unpack: unpack-stamp
-unpack-stamp:
-	tar xfz $(ZBASE).tgz
-	mv $(ZBASE) z
-	touch $@
-
 clean: unpatch
 	dh_testdir
 	dh_testroot
@@ -61,16 +54,16 @@
 	  rm -f $$generated $$generated.tmp; \
 	done
 	rm -f -r build-base $(ZBASE) z
-	dh_clean unpack-stamp build-indep-stamp build-arch-stamp
+	dh_clean build-indep-stamp build-arch-stamp
 
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
-build-arch-stamp: unpack-stamp patch-stamp
-	cd z && CFLAGS="$(CFLAGS)" ./configure \
+build-arch-stamp: patch-stamp
+	CFLAGS="$(CFLAGS)" ./configure \
 		--prefix=$(DEBIAN)/usr/lib/$(ZOPE) \
 		--with-python=$(PYTHONBIN)
-	cd z && make
+	make
 	touch $@
 
 build-indep: build-indep-stamp
@@ -106,7 +99,7 @@
 	dh_installdirs -s
 
 	# Install Zope and remove *.pyc
-	cd z && make install
+	make install
 	find $(DEBIAN) -name '*.pyc' | xargs -r rm -r
 
 	# FHS enforcement
@@ -171,9 +164,9 @@
 	rmdir $(DEBIAN)/usr/sbin
 	rm $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/docutils/svn-commit.tmp
 
-	dh_installdocs -p$(ZOPE) z/README.txt
-	dh_installexamples -p$(ZOPE) z/lib/python/Products/PageTemplates/examples/*
-	dh_pysupport -p$(ZOPE) -V $(PYTHONVER) -Xlib/python/RestrictedPython/tests -Xlib/python/mechanize/_firefox3cookiejar.py /usr/lib/$(ZOPE) 
+	dh_installdocs -p$(ZOPE) README.txt
+	dh_installexamples -p$(ZOPE) lib/python/Products/PageTemplates/examples/*
+	dh_pysupport -p$(ZOPE) -V $(PYTHONVER) /usr/lib/$(ZOPE) 
 
 binary-common:
 	dh_testdir

Modified: zope2.12/trunk/debian/watch
===================================================================
--- zope2.12/trunk/debian/watch	2009-07-05 22:26:38 UTC (rev 1659)
+++ zope2.12/trunk/debian/watch	2009-07-05 22:28:36 UTC (rev 1660)
@@ -1,2 +1,2 @@
 version=3
-http://www.zope.org/Products/Zope/(2\.11\.[\d]+)/Zope-(2\.11\.[\d]+)-final\.tgz
+http://www.zope.org/Products/Zope/(2\.12\.[\d]+)/Zope-(2\.12\.[\d]+)-final\.tgz

Modified: zope2.12/trunk/debian/zopeZVER.preinst.in
===================================================================
--- zope2.12/trunk/debian/zopeZVER.preinst.in	2009-07-05 22:26:38 UTC (rev 1659)
+++ zope2.12/trunk/debian/zopeZVER.preinst.in	2009-07-05 22:28:36 UTC (rev 1660)
@@ -13,9 +13,6 @@
 	if [ -h /usr/share/doc/zope at ZVER@ ]; then
 	    rm -f /usr/share/doc/zope at ZVER@
 	fi
-	if dpkg --compare-versions "$2" lt 2.11.3-1; then
-	    pycentral pkgremove zope2.11
-	fi
     ;;
 
     install)


