r1645 - in zope2.11/trunk/debian (changelog rules)

[Jonas Meurer]

    Date: Friday, July 3, 2009 @ 11:31:23
  Author: mejo
Revision: 1645

minor typo in debian/rules

Modified:
  zope2.11/trunk/debian/changelog
  zope2.11/trunk/debian/rules

Modified: zope2.11/trunk/debian/changelog
===================================================================
--- zope2.11/trunk/debian/changelog	2009-07-03 11:31:12 UTC (rev 1644)
+++ zope2.11/trunk/debian/changelog	2009-07-03 11:31:23 UTC (rev 1645)
@@ -4,17 +4,19 @@
   * 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)
+  * Reorder targets and dependencies in debian/rules to actually fix
+    parallel building. Still disable parallel building for now, as suggested
+    by Lucas Nussbaum. (closes: #534013)
   * Migrate from python-central to python-support:
     - add debian/pyversions, remove debian/pycompat
     - add depends on ${python:Depends}
-    - add pycentral cleanup code to @zopeZVER.preinst.in
+    - add pycentral cleanup code to debian/zopeZVER.preinst.in
   * 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.
+  * Bump standards-version to 3.8.2, no changes needed.
 
- -- Jonas Meurer <mejo at debian.org>  Fri, 03 Jul 2009 13:01:00 +0200
+ -- Jonas Meurer <mejo at debian.org>  Fri, 03 Jul 2009 13:26:04 +0200
 
 zope2.11 (2.11.2-1) unstable; urgency=low
 

Modified: zope2.11/trunk/debian/rules
===================================================================
--- zope2.11/trunk/debian/rules	2009-07-03 11:31:12 UTC (rev 1644)
+++ zope2.11/trunk/debian/rules	2009-07-03 11:31:23 UTC (rev 1645)
@@ -28,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