r1644 - in zope2.10/trunk/debian (changelog control rules)
Jonas Meurer
mejo at alioth.debian.org
Fri Jul 3 11:31:14 UTC 2009
Date: Friday, July 3, 2009 @ 11:31:12
Author: mejo
Revision: 1644
fix target dependencies and disable parallel build support in debian/rules
Modified:
zope2.10/trunk/debian/changelog
zope2.10/trunk/debian/control
zope2.10/trunk/debian/rules
Modified: zope2.10/trunk/debian/changelog
===================================================================
--- zope2.10/trunk/debian/changelog 2009-07-03 11:02:47 UTC (rev 1643)
+++ zope2.10/trunk/debian/changelog 2009-07-03 11:31:12 UTC (rev 1644)
@@ -1,3 +1,12 @@
+zope2.10 (2.10.8-2) unstable; urgency=low
+
+ * Reorder targets and dependencies in debian/rules to actually fix
+ parallel building. Still disable parallel building for now, as suggested
+ by Lucas Nussbaum. (closes: #533975)
+ * Bump standards-version to 3.8.2, no changes needed.
+
+ -- Jonas Meurer <mejo at debian.org> Fri, 03 Jul 2009 13:23:34 +0200
+
zope2.10 (2.10.8-1) unstable; urgency=low
* New upstream release.
Modified: zope2.10/trunk/debian/control
===================================================================
--- zope2.10/trunk/debian/control 2009-07-03 11:02:47 UTC (rev 1643)
+++ zope2.10/trunk/debian/control 2009-07-03 11:31:12 UTC (rev 1644)
@@ -4,7 +4,7 @@
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 (>= 4.2.32), 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
+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.10/trunk
Modified: zope2.10/trunk/debian/rules
===================================================================
--- zope2.10/trunk/debian/rules 2009-07-03 11:02:47 UTC (rev 1643)
+++ zope2.10/trunk/debian/rules 2009-07-03 11:31:12 UTC (rev 1644)
@@ -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
@@ -33,10 +28,11 @@
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
+# disable parallel building for now, as the package builds fast enough
+# ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+# NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+# MAKEFLAGS += -j$(NUMJOBS)
+# endif
# Include dpatch stuff.
include /usr/share/dpatch/dpatch.make
@@ -55,7 +51,7 @@
unpack-stamp:
tar xfz $(ZBASE).tgz
mv $(ZBASE) z
- touch unpack-stamp
+ touch $@
clean: unpatch
dh_testdir
@@ -64,23 +60,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,28 +136,28 @@
done
# Remove duplicated license information, zope already is licensed under the ZPL
- rm $(DEBIAN)/usr/lib/zope2.10/lib/python/zope/formlib/LICENSE.txt \
- $(DEBIAN)/usr/lib/zope2.10/lib/python/Products/Five/COPYING.txt \
- $(DEBIAN)/usr/lib/zope2.10/lib/python/Products/Five/doc/ZopePublicLicense.txt \
- $(DEBIAN)/usr/lib/zope2.10/lib/python/pytz/LICENSE.txt \
- $(DEBIAN)/usr/lib/zope2.10/lib/python/ZConfig/LICENSE.txt
+ rm $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/zope/formlib/LICENSE.txt \
+ $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/Products/Five/COPYING.txt \
+ $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/Products/Five/doc/ZopePublicLicense.txt \
+ $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/pytz/LICENSE.txt \
+ $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/ZConfig/LICENSE.txt
# Remove zope documentation, as it is redundant
- rm -fr $(DEBIAN)/usr/lib/zope2.10/doc
+ rm -fr $(DEBIAN)/usr/lib/$(ZOPE)/doc
# Fix permissions for files
- chmod 755 $(DEBIAN)/usr/lib/zope2.10/lib/python/DocumentTemplate/release.sh \
- $(DEBIAN)/usr/lib/zope2.10/lib/python/ZPublisher/Client.py \
- $(DEBIAN)/usr/lib/zope2.10/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.10/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.10/bin/reindex_catalog.py \
- $(DEBIAN)/usr/lib/zope2.10/skel/import/README.txt \
- $(DEBIAN)/usr/lib/zope2.10/lib/python/ImageFile.py \
- $(DEBIAN)/usr/lib/zope2.10/lib/python/Products/ZSQLMethods/Setup \
- $(DEBIAN)/usr/lib/zope2.10/lib/python/Products/ZGadflyDA/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/ImageFile.py \
+ $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/Products/ZSQLMethods/Setup \
+ $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/Products/ZGadflyDA/Setup
# Lintian overrides (images in /usr/lib)
mkdir -p -m 0755 $(DEBIAN)/usr/share/lintian/overrides
@@ -170,11 +165,11 @@
$(DEBIAN)/usr/share/lintian/overrides/$(ZOPE)
# use python-tz instead of shipping it
- rm -fr $(DEBIAN)/usr/lib/zope2.10/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.10/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/*
More information about the pkg-zope-commits
mailing list