r2142 - in zope2.12/trunk/debian (changelog control pyversions rules)

Sun Nov 14 21:29:33 UTC 2010

Date: Sunday, November 14, 2010 @ 21:29:31
  Author: pumazi-guest
Revision: 2142

Restoring exclusive support for Python 2.6. Adding lsb-release and lsb-base back in. Bumping the zope-common version compatiblity.

Modified:
  zope2.12/trunk/debian/changelog
  zope2.12/trunk/debian/control
  zope2.12/trunk/debian/pyversions
  zope2.12/trunk/debian/rules

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

--- zope2.12/trunk/debian/changelog	2010-11-14 18:30:27 UTC (rev 2141)
+++ zope2.12/trunk/debian/changelog	2010-11-14 21:29:31 UTC (rev 2142)
@@ -18,8 +18,10 @@
     ZPublisher test module uses the profiler.
   * Adding python-pip as a build dependency.
   * Added a get-orig-source rules target to build an orig.tar.gz.
+  * Restored exclusive support for Python version 2.6.
+  * Bump zope-common version compatiblity.
 
- -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Tue, 09 Nov 2010 19:14:16 -0500
+ -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Tue, 09 Nov 2010 23:06:46 -0500
 
 zope2.12 (2.12.0-1) unstable; urgency=low
 

Modified: zope2.12/trunk/debian/control
===================================================================
--- zope2.12/trunk/debian/control	2010-11-14 18:30:27 UTC (rev 2141)
+++ zope2.12/trunk/debian/control	2010-11-14 21:29:31 UTC (rev 2142)
@@ -3,7 +3,7 @@
 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>, Michael Mulich (pumazi) <michael.mulich at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.40), python, python-dev, python-support, python-setuptools, python-pkg-resources, python-pip (>= 0.8), zope-debhelper (>= 0.3.12)
+Build-Depends: debhelper (>= 7.0.50~), lsb-release, quilt (>= 0.40), python, python-dev, python-support, python-setuptools, python-pkg-resources, python-pip (>= 0.8), zope-debhelper (>= 0.3.12)
 Standards-Version: 3.9.1
 Homepage: http://www.zope.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-zope/zope2.12/trunk
@@ -11,8 +11,8 @@
 
 Package: zope2.12
 Architecture: any
-Pre-Depends: zope-common (>= 0.5.49)
-Depends: python-clientform, python-docutils, python-mechanize, python-transaction, python-tz, python-zconfig, python-zc.lockfile, python-zdaemon, python-zodb, python-zope.authentication, python-zope.browser, python-zope.component, python-zope.component-zcml, python-zope.configuration, python-zope.contenttype, python-zope.copy, python-zope.event, python-zope.exceptions, python-zope.hookable, python-zope.i18n, python-zope.i18nmessageid, python-zope.location, python-zope.proxy, python-zope.publisher, python-zope.schema, python-zope.security, python-zope.traversing, python-zope.testbrowser, python-zope.testing, ${shlibs:Depends}, ${misc:Depends}, python-pkg-resources, ${python:Depends}, debconf | debconf-2.0
+Pre-Depends: zope-common (>= 0.5.51)
+Depends: lsb-base, python-clientform, python-docutils, python-mechanize, python-transaction, python-tz, python-zconfig, python-zc.lockfile, python-zdaemon, python-zodb, python-zope.authentication, python-zope.browser, python-zope.component, python-zope.component-zcml, python-zope.configuration, python-zope.contenttype, python-zope.copy, python-zope.event, python-zope.exceptions, python-zope.hookable, python-zope.i18n, python-zope.i18nmessageid, python-zope.location, python-zope.proxy, python-zope.publisher, python-zope.schema, python-zope.security, python-zope.traversing, python-zope.testbrowser, python-zope.testing, ${shlibs:Depends}, ${misc:Depends}, python-pkg-resources, ${python:Depends}, debconf | debconf-2.0
 Provides: zope
 Suggests: python-unit, python-profiler, zope-book, zope-devguide
 Description: Open Source Web Application Server

Modified: zope2.12/trunk/debian/pyversions
===================================================================
--- zope2.12/trunk/debian/pyversions	2010-11-14 18:30:27 UTC (rev 2141)
+++ zope2.12/trunk/debian/pyversions	2010-11-14 21:29:31 UTC (rev 2142)
@@ -1 +1 @@
-2.6-
+2.6

Modified: zope2.12/trunk/debian/rules
===================================================================
--- zope2.12/trunk/debian/rules	2010-11-14 18:30:27 UTC (rev 2141)
+++ zope2.12/trunk/debian/rules	2010-11-14 21:29:31 UTC (rev 2142)
@@ -12,8 +12,8 @@
 DEBIAN:=$(CURDIR)/debian
 DEB_SATISFIED:=ClientForm:Docutils:mechanize:pytz:transaction:zc.lockfile:ZConfig:zdaemon:ZODB3:zope.authentication:zope.browser:zope.component:zope.configuration:zope.contenttype:zope.copy:zope.event:zope.exceptions:zope.hookable:zope.i18n:zope.i18nmessageid:zope.location:zope.proxy:zope.publisher:zope.schema:zope.security:zope.testbrowser:zope.testing:zope.traversing
 
+SRC_VERSION:=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
 PKGD_VERSION:=4
-SRC_VERSION:=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-.*/\3/p')
 SVN_TAG:=$(SRC_VERSION)-pkgd_$(PKGD_VERSION)
 SVN_HOME:=https://weblion.psu.edu/svn/weblion/weblion/hosting/zope2-tarball/tags
 
@@ -21,10 +21,12 @@
 TARBALL:=$(ZOPE)_$(SRC_VERSION).orig.tar.gz
 
 # TODO:
-#  - Bring back lsb-release for Ubuntu support
-#  - Specify a way to get-orig-source from trunk
+#  - Address lintian warnings.
+#  - Specify a way to get-orig-source from trunk.
 #  - ...
 
+distribution:=$(shell lsb_release -is)
+
 %:
 	dh $@ 
 
@@ -69,6 +71,10 @@
 	make install PYTHON=python 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)
 	cp $(DEBIAN)/python_interpreter_template $(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/bin/python
+ifeq ($(distribution),Ubuntu)
+	mv $(DEBIAN)/$(ZOPE)-sandbox/usr/share/doc/$(ZOPE)-sandbox/README.Debian \
+		$(DEBIAN)/$(ZOPE)-sandbox/usr/share/doc/$(ZOPE)-sandbox/README.Ubuntu
+endif
 
 override_dh_fixperms:
 	dh_fixperms --


