r1335 - in zope2.10 (8 files)

Jonas Meurer mejo at alioth.debian.org
Wed Feb 25 15:42:19 UTC 2009 

    Date: Wednesday, February 25, 2009 @ 15:42:18
  Author: mejo
Revision: 1335

prepare zope 2.10.7

Added:
  zope2.10/tarballs/zope2.10_2.10.7.orig.tar.gz
  zope2.10/trunk/debian/README.source
Modified:
  zope2.10/trunk/debian/changelog
  zope2.10/trunk/debian/control
  zope2.10/trunk/debian/rules
  zope2.10/trunk/debian/zopeZVER.lintian-overrides.in
  zope2.10/trunk/debian/zopeZVER.logrotate.in
Deleted:
  zope2.10/trunk/debian/zopeZVER.linda-overrides.in

Added: zope2.10/tarballs/zope2.10_2.10.7.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: zope2.10/tarballs/zope2.10_2.10.7.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: zope2.10/trunk/debian/README.source
===================================================================
--- zope2.10/trunk/debian/README.source	                        (rev 0)
+++ zope2.10/trunk/debian/README.source	2009-02-25 15:42:18 UTC (rev 1335)
@@ -0,0 +1,2 @@
+This package uses dpatch for its patch management, see
+/usr/share/doc/dpatch/README.source.gz if you are unfamiliar with it.

Modified: zope2.10/trunk/debian/changelog
===================================================================
--- zope2.10/trunk/debian/changelog	2009-02-21 11:57:38 UTC (rev 1334)
+++ zope2.10/trunk/debian/changelog	2009-02-25 15:42:18 UTC (rev 1335)
@@ -1,10 +1,27 @@
-zope2.10 (2.10.6-2) unstable; urgency=low
+zope2.10 (2.10.7-1) unstable; urgency=low
 
+  [ Bernd Zeimetz ]
   * debian/control:
     - Updating my email address. 
 
- -- Bernd Zeimetz <bzed at debian.org>  Mon, 29 Dec 2008 22:36:00 +0100
+  [ Jonas Meurer ]
+  * New upstream release.
+  * Redirect output of 'bin/zopectl logreopen' to /dev/null in logrotate
+    postrotate script. (closes: #514059)
+  * Bump standards-version to 3.8.0:
+    - debian/control: Add Homepage and Vcs-Browser fields, change XS-Vcs-Svn
+      to Vcs-Svn.
+    - debian/README.source: Added.
+    - debian/rules: Add $(confflags) as described in
+      /usr/share/doc/autotools-dev/README.Debian.gz, and build options like
+      $(CFLAGS) as described in policy.
+  * lintian checks:
+    - Remove linda overrides.
+    - Add overrride for package-contains-empty-directory
+      usr/lib/zope2.10/skel/etc/package-includes/
 
+ -- Jonas Meurer <mejo at debian.org>  Wed, 25 Feb 2009 16:24:18 +0100
+
 zope2.10 (2.10.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: zope2.10/trunk/debian/control
===================================================================
--- zope2.10/trunk/debian/control	2009-02-21 11:57:38 UTC (rev 1334)
+++ zope2.10/trunk/debian/control	2009-02-25 15:42:18 UTC (rev 1335)
@@ -4,9 +4,11 @@
 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.7.3
+Standards-Version: 3.8.0
 XS-Python-Version: 2.4
-XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope2.10/trunk
+Homepage: http://www.zope.org/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-zope/zope2.10/trunk
+Vcs-Svn: svn://svn.debian.org/pkg-zope/zope2.10/trunk
 
 Package: zope2.10
 Architecture: any

Modified: zope2.10/trunk/debian/rules
===================================================================
--- zope2.10/trunk/debian/rules	2009-02-21 11:57:38 UTC (rev 1334)
+++ zope2.10/trunk/debian/rules	2009-02-25 15:42:18 UTC (rev 1335)
@@ -12,13 +12,42 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+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
+else
+	CFLAGS += -O2
+endif
+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
+
+# Include dpatch stuff.
+include /usr/share/dpatch/dpatch.make
+
 ZVER	  := 2.10
 ZOPE	  := zope$(ZVER)
 PACKAGE	  := zope$(ZVER)
 DEBIAN    := $(shell pwd)/debian/$(PACKAGE)
 PYTHONVER := 2.4
 PYTHONBIN := /usr/bin/python$(PYTHONVER)
-ZBASE     := Zope-2.10.6-final
+ZBASE     := Zope-2.10.7-final
 
 distribution := $(shell lsb_release -is)
 
@@ -43,7 +72,7 @@
 
 build-arch: unpack-stamp patch-stamp build-arch-stamp
 build-arch-stamp:
-	cd z && ./configure \
+	cd z && CFLAGS="$(CFLAGS)" ./configure \
 		--prefix=$(DEBIAN)/usr/lib/$(ZOPE) \
 		--with-python=$(PYTHONBIN)
 	cd z && make
@@ -135,15 +164,11 @@
 			  $(DEBIAN)/usr/lib/zope2.10/lib/python/Products/ZSQLMethods/Setup \
 			  $(DEBIAN)/usr/lib/zope2.10/lib/python/Products/ZGadflyDA/Setup
 
-	# Lintian and linda overrides (images in /usr/lib)
+	# Lintian overrides (images in /usr/lib)
 	mkdir -p -m 0755 $(DEBIAN)/usr/share/lintian/overrides
 	install -m 0644 debian/$(ZOPE).lintian-overrides \
 	            $(DEBIAN)/usr/share/lintian/overrides/$(ZOPE)
 
-	mkdir -p -m 0755 $(DEBIAN)/usr/share/linda/overrides
-	install -m 0644 debian/$(ZOPE).linda-overrides \
-	        $(DEBIAN)/usr/share/linda/overrides/$(ZOPE)
-
 	# use python-tz instead of shipping it
 	rm -fr $(DEBIAN)/usr/lib/zope2.10/lib/python/pytz
 
@@ -185,5 +210,3 @@
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
-
-include /usr/share/dpatch/dpatch.make

Deleted: zope2.10/trunk/debian/zopeZVER.linda-overrides.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER.linda-overrides.in	2009-02-21 11:57:38 UTC (rev 1334)
+++ zope2.10/trunk/debian/zopeZVER.linda-overrides.in	2009-02-25 15:42:18 UTC (rev 1335)
@@ -1,2 +0,0 @@
-Tag: image-in-usr-lib
-Data: /usr/lib/zope at ZVER@/

Modified: zope2.10/trunk/debian/zopeZVER.lintian-overrides.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER.lintian-overrides.in	2009-02-21 11:57:38 UTC (rev 1334)
+++ zope2.10/trunk/debian/zopeZVER.lintian-overrides.in	2009-02-25 15:42:18 UTC (rev 1335)
@@ -1 +1,2 @@
 zope at ZVER@: image-file-in-usr-lib
+zope at ZVER@: package-contains-empty-directory usr/lib/zope at ZVER@/skel/etc/package-includes/

Modified: zope2.10/trunk/debian/zopeZVER.logrotate.in
===================================================================
--- zope2.10/trunk/debian/zopeZVER.logrotate.in	2009-02-21 11:57:38 UTC (rev 1334)
+++ zope2.10/trunk/debian/zopeZVER.logrotate.in	2009-02-25 15:42:18 UTC (rev 1335)
@@ -11,6 +11,6 @@
     create
     sharedscripts
     postrotate
-    sh -c 'for i in /var/lib/zope at ZVER@/instance/* ; do [ -d "$i/log" -a -x "$i/bin/zopectl" -a -r "$i/var/Z2.pid" ] && "$i"/bin/zopectl logreopen ; done'
+    sh -c 'for i in /var/lib/zope at ZVER@/instance/* ; do [ -d "$i/log" -a -x "$i/bin/zopectl" -a -r "$i/var/Z2.pid" ] && "$i"/bin/zopectl logreopen >/dev/null; done'
     endscript
 }

More information about the pkg-zope-commits mailing list