r1642 - in zope2.11/trunk/debian (5 files)
Jonas Meurer
mejo at alioth.debian.org
Fri Jul 3 02:08:27 UTC 2009
Date: Friday, July 3, 2009 @ 02:08:24
Author: mejo
Revision: 1642
migrate to python-support, fix parallel building support, exclude python2.5+ code from byte-compiling, ...
Added:
zope2.11/trunk/debian/pyversions
Modified:
zope2.11/trunk/debian/changelog
zope2.11/trunk/debian/control
zope2.11/trunk/debian/rules
Deleted:
zope2.11/trunk/debian/pycompat
Modified: zope2.11/trunk/debian/changelog
===================================================================
--- zope2.11/trunk/debian/changelog 2009-06-18 15:46:48 UTC (rev 1641)
+++ zope2.11/trunk/debian/changelog 2009-07-03 02:08:24 UTC (rev 1642)
@@ -4,8 +4,15 @@
* Minor improvement to the long description of zope2.11-sandbox.
(closes: #527030)
* Don't delete lib/python/pytz/LICENSE.txt as it is not provided any longer.
+ * Reorder targets and dependencies in debian/rules to actually support
+ parallel building. Thanks to Lucas Nussbaum. Hopefully (closes: #534013)
+ * Migrate from python-central to python-support, add debian/pyversions,
+ remove debian/pycompat, add depends on ${python:Depends}.
+ * Exclude lib/python/RestrictedPython/tests and lib/python/mechanize from
+ byte-compiling with dh_pysupport, as both include code for python2.5+ that
+ fails to compile with python2.4.
- -- Jonas Meurer <mejo at debian.org> Thu, 21 May 2009 15:31:32 +0200
+ -- Jonas Meurer <mejo at debian.org> Fri, 03 Jul 2009 03:58:24 +0200
zope2.11 (2.11.2-1) unstable; urgency=low
Modified: zope2.11/trunk/debian/control
===================================================================
--- zope2.11/trunk/debian/control 2009-06-18 15:46:48 UTC (rev 1641)
+++ zope2.11/trunk/debian/control 2009-07-03 02:08:24 UTC (rev 1642)
@@ -3,8 +3,8 @@
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-central (>= 0.5.6), python2.4-dev (>= 2.4.3), python2.4, python, zope-debhelper (>= 0.3.6), lsb-release, dpatch
-Standards-Version: 3.8.1
+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
+Standards-Version: 3.8.2
XS-Python-Version: 2.4
Homepage: http://www.zope.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-zope/zope2.11/trunk
@@ -13,7 +13,7 @@
Package: zope2.11
Architecture: any
Pre-Depends: zope-common (>= 0.5.21)
-Depends: python2.4 (>= 2.4.3), python-tz, lsb-base, ${shlibs:Depends}, ${misc:Depends}, debconf | debconf-2.0
+Depends: python2.4 (>= 2.4.3), 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
Deleted: zope2.11/trunk/debian/pycompat
===================================================================
--- zope2.11/trunk/debian/pycompat 2009-06-18 15:46:48 UTC (rev 1641)
+++ zope2.11/trunk/debian/pycompat 2009-07-03 02:08:24 UTC (rev 1642)
@@ -1 +0,0 @@
-2
Added: zope2.11/trunk/debian/pyversions
===================================================================
--- zope2.11/trunk/debian/pyversions (rev 0)
+++ zope2.11/trunk/debian/pyversions 2009-07-03 02:08:24 UTC (rev 1642)
@@ -0,0 +1 @@
+2.4
Modified: zope2.11/trunk/debian/rules
===================================================================
--- zope2.11/trunk/debian/rules 2009-06-18 15:46:48 UTC (rev 1641)
+++ zope2.11/trunk/debian/rules 2009-07-03 02:08:24 UTC (rev 1642)
@@ -19,11 +19,6 @@
endif
CFLAGS = -Wall -g
-INSTALL = install
-INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644
-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
-INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755
-INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -55,7 +50,7 @@
unpack-stamp:
tar xfz $(ZBASE).tgz
mv $(ZBASE) z
- touch unpack-stamp
+ touch $@
clean: unpatch
dh_testdir
@@ -64,23 +59,22 @@
generated=`echo $$f | sed 's,.in$$,,;s,ZVER,$(ZVER),'`; \
rm -f $$generated $$generated.tmp; \
done
- rm -f build-arch-stamp build-indep-stamp unpack-stamp
rm -f -r build-base $(ZBASE) z
- dh_clean
+ dh_clean unpack-stamp build-indep-stamp build-arch-stamp
build: build-arch build-indep
-build-arch: unpack-stamp patch-stamp build-arch-stamp
-build-arch-stamp:
+build-arch: build-arch-stamp
+build-arch-stamp: unpack-stamp patch-stamp
cd z && CFLAGS="$(CFLAGS)" ./configure \
--prefix=$(DEBIAN)/usr/lib/$(ZOPE) \
--with-python=$(PYTHONBIN)
cd z && make
- touch build-arch-stamp
+ touch $@
build-indep: build-indep-stamp
build-indep-stamp:
- touch build-indep-stamp
+ touch $@
install: install-indep install-arch
@@ -141,23 +135,28 @@
done
# Remove duplicated license information, zope already is licensed under the ZPL
- rm $(DEBIAN)/usr/lib/zope2.11/lib/python/zope/formlib/LICENSE.txt \
- $(DEBIAN)/usr/lib/zope2.11/lib/python/Products/Five/COPYING.txt
+ rm $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/zope/formlib/LICENSE.txt \
+ $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/Products/Five/COPYING.txt
# Remove zope documentation, as it is redundant
- rm -fr $(DEBIAN)/usr/lib/zope2.11/doc
+ rm -fr $(DEBIAN)/usr/lib/$(ZOPE)/doc
+
+ # Remove tests for python2.5 and python2.6, we don't use it anyway
+ #rm $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/RestrictedPython/tests/before_and_after25.py \
+ # $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/RestrictedPython/tests/before_and_after26.py \
+ # $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/RestrictedPython/tests/security_in_syntax26.py
# Fix permissions for files
- chmod 755 $(DEBIAN)/usr/lib/zope2.11/lib/python/DocumentTemplate/release.sh \
- $(DEBIAN)/usr/lib/zope2.11/lib/python/ZPublisher/Client.py \
- $(DEBIAN)/usr/lib/zope2.11/lib/python/ZPublisher/Test.py
+ chmod 755 $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/DocumentTemplate/release.sh \
+ $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/ZPublisher/Client.py \
+ $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/ZPublisher/Test.py
- find $(DEBIAN)/usr/lib/zope2.11/lib/python -type f -a \
+ find $(DEBIAN)/usr/lib/$(ZOPE)/lib/python -type f -a \
\( -name *.gif -o -name *.html -o -name *.dtml -o -name *.txt -o -name *.bat -o -name *.jpg \) -exec chmod 644 {} \;
- chmod 644 $(DEBIAN)/usr/lib/zope2.11/bin/reindex_catalog.py \
- $(DEBIAN)/usr/lib/zope2.11/skel/import/README.txt \
- $(DEBIAN)/usr/lib/zope2.11/lib/python/Products/ZSQLMethods/Setup
+ chmod 644 $(DEBIAN)/usr/lib/$(ZOPE)/bin/reindex_catalog.py \
+ $(DEBIAN)/usr/lib/$(ZOPE)/skel/import/README.txt \
+ $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/Products/ZSQLMethods/Setup
# Lintian overrides (images in /usr/lib)
mkdir -p -m 0755 $(DEBIAN)/usr/share/lintian/overrides
@@ -165,15 +164,15 @@
$(DEBIAN)/usr/share/lintian/overrides/$(ZOPE)
# use python-tz instead of shipping it
- rm -fr $(DEBIAN)/usr/lib/zope2.11/lib/python/pytz
+ rm -fr $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/pytz
# fix some of the lintian warnings
rmdir $(DEBIAN)/usr/sbin
- rm $(DEBIAN)/usr/lib/zope2.11/lib/python/docutils/svn-commit.tmp
+ 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_pycentral -p$(ZOPE) /usr/lib/$(ZOPE) -V $(PYTHONVER)
+ dh_pysupport -p$(ZOPE) -V $(PYTHONVER) -Xlib/python/RestrictedPython/tests -Xlib/python/mechanize/_firefox3cookiejar.py /usr/lib/$(ZOPE)
binary-common:
dh_testdir
More information about the pkg-zope-commits
mailing list