r2337 - in zope2.12/trunk/debian (6 files)

Wed Jul 13 20:55:02 UTC 2011

Date: Wednesday, July 13, 2011 @ 20:55:00
  Author: mejo
Revision: 2337

remove python-support stuff, other minor updates

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
Deleted:
  zope2.12/trunk/debian/pyversions

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

--- zope2.12/trunk/debian/changelog	2011-07-01 16:23:00 UTC (rev 2336)
+++ zope2.12/trunk/debian/changelog	2011-07-13 20:55:00 UTC (rev 2337)
@@ -1,4 +1,4 @@
-zope2.12 (2.12.19-1) unstable; urgency=low
+zope2.12 (2.12.19-1~unofficial.0) unstable; urgency=low
 
   * Zope 2.12.19 release.
 
@@ -34,8 +34,15 @@
   * Fix debian/build-scripts/fetch.py to lowercase dependency names before
     checking for them. gen_versions_cfg.py already writes lowercased names.
     Thanks to Michael Mulich for help with investigation.
+  * Remove Michael Mulich from Uploaders field.
+  * Migrate the package from dh_pysupport to dh_python2.
+    - Bump build-depends on python-dev and depends on python to (>= 2.6.6-3~).
+    - Remove build-depends on python, as python-dev build-depends pull it in.
+    - Remove debian/pyversions, add X-Python-Version: 2.6 to debian/control.
+  * Update watchfile to search for Zope2.12 releases at pypi.python.org. 
+  * Remove obsolete debian/zopeZVER.preinst.in magic, not needed anymore. 
 
- -- Jonas Meurer <mejo at debian.org>  Fri, 01 Jul 2011 18:06:08 +0200
+ -- Jonas Meurer <mejo at debian.org>  Wed, 13 Jul 2011 22:38:41 +0200
 
 zope2.12 (2.12.11-1) unstable; urgency=low
 

Modified: zope2.12/trunk/debian/control
===================================================================
--- zope2.12/trunk/debian/control	2011-07-01 16:23:00 UTC (rev 2336)
+++ zope2.12/trunk/debian/control	2011-07-13 20:55:00 UTC (rev 2337)
@@ -2,13 +2,13 @@
 Section: zope
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
-Uploaders: Jonas Meurer <mejo at debian.org>,
-           Michael Mulich (pumazi) <michael.mulich at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), lsb-release, python, python-dev,
-               python-support, python-setuptools, python-pkg-resources,
-               python-pip (>= 0.8), zope-debhelper (>= 0.3.12)
+Uploaders: Jonas Meurer <mejo at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), lsb-release, python-dev (>= 2.6.6-3~),
+               python-setuptools, python-pkg-resources, python-pip (>= 0.8),
+               zope-debhelper (>= 0.3.12)
 Standards-Version: 3.9.2
 Homepage: http://www.zope.org/
+X-Python-Version: 2.6
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-zope/zope2.12/trunk
 Vcs-Svn: svn://svn.debian.org/pkg-zope/zope2.12/trunk
 
@@ -16,9 +16,10 @@
 Architecture: any
 Pre-Depends: zope-common (>= 0.5.51)
 Depends: lsb-base, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
-         debconf | debconf-2.0, python2.6, python-clientform (>= 0.2.10),
-         python-docutils (>= 0.7), python-mechanize (>= 0.1.11),
-         python-pkg-resources (>= 0.6.15), python-tz
+         debconf | debconf-2.0, python2.6 (>= 2.6.6-3~),
+         python-clientform (>= 0.2.10), python-docutils (>= 0.7),
+         python-mechanize (>= 0.1.11), python-pkg-resources (>= 0.6.15),
+         python-tz
 Provides: zope
 Suggests: python-unit, python-profiler
 Description: Open Source Web Application Server

Deleted: zope2.12/trunk/debian/pyversions
===================================================================
--- zope2.12/trunk/debian/pyversions	2011-07-01 16:23:00 UTC (rev 2336)
+++ zope2.12/trunk/debian/pyversions	2011-07-13 20:55:00 UTC (rev 2337)
@@ -1 +0,0 @@
-2.6

Modified: zope2.12/trunk/debian/rules
===================================================================
--- zope2.12/trunk/debian/rules	2011-07-01 16:23:00 UTC (rev 2336)
+++ zope2.12/trunk/debian/rules	2011-07-13 20:55:00 UTC (rev 2337)
@@ -24,7 +24,7 @@
 	rm -rf $(CURDIR)/$(SRC_DIR)
 	mkdir $(CURDIR)/$(SRC_DIR)
 	cd $(CURDIR)/$(SRC_DIR); \
-	python $(DEBIAN)/build-scripts/fetch.py \
+	python2.6 $(DEBIAN)/build-scripts/fetch.py \
 		--versions-cfg-url=${ZOPE_INDEX}$(SRC_VERSION)/versions.cfg \
 		--index=${ZOPE_INDEX}$(SRC_VERSION) \
 		--exclude-singles=$(DEB_SATISFIED) \
@@ -48,7 +48,7 @@
 	./configure --prefix=/usr/lib/${ZOPE}
 
 override_dh_auto_build:
-	make PYTHON=python \
+	make PYTHON=python2.6 \
 	     DIST_EXCLUSIONS=$(DEB_SATISFIED)
 
 override_dh_prep:
@@ -65,7 +65,7 @@
 	dh_installzopeinstance -pzope$(ZVER)-sandbox sandbox
 
 override_dh_auto_install:
-	make install PYTHON=python DESTDIR=$(DEBIAN)/$(ZOPE)
+	make install PYTHON=python2.6 DESTDIR=$(DEBIAN)/$(ZOPE)
 
 #	sed -i '/^#!.*$$/a\import site; site.addsitedir("/usr/lib/$(ZOPE)/lib/python")' $$(find $(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/bin -type f ! -type l)
 	for i in `find $(DEBIAN)/$(ZOPE) -type f`; do \

Modified: zope2.12/trunk/debian/watch
===================================================================
--- zope2.12/trunk/debian/watch	2011-07-01 16:23:00 UTC (rev 2336)
+++ zope2.12/trunk/debian/watch	2011-07-13 20:55:00 UTC (rev 2337)
@@ -1,2 +1,2 @@
 version=3
-http://weblion.psu.edu/static/zope2-tarballs/Zope2-(2\.12\.[\d]+)-pkgd_[\d]+\.tar\.gz
+http://pypi.python.org/packages/source/Z/Zope2/Zope2-2\.12\.[\d]+\.zip

Modified: zope2.12/trunk/debian/zopeZVER.preinst.in
===================================================================
--- zope2.12/trunk/debian/zopeZVER.preinst.in	2011-07-01 16:23:00 UTC (rev 2336)
+++ zope2.12/trunk/debian/zopeZVER.preinst.in	2011-07-13 20:55:00 UTC (rev 2337)
@@ -10,9 +10,6 @@
 
 case "$1" in
     upgrade)
-	if [ -h /usr/share/doc/zope at ZVER@ ]; then
-	    rm -f /usr/share/doc/zope at ZVER@
-	fi
     ;;
 
     install)


