r387 - in zope2.10/trunk/debian: . patches
Jonas Meurer
mejo at alioth.debian.org
Wed Nov 1 14:38:31 CET 2006
Author: mejo
Date: 2006-11-01 14:38:30 +0100 (Wed, 01 Nov 2006)
New Revision: 387
Modified:
zope2.10/trunk/debian/changelog
zope2.10/trunk/debian/patches/deb-zopeconf.dpatch
zope2.10/trunk/debian/rules
Log:
update patch
Modified: zope2.10/trunk/debian/changelog
===================================================================
--- zope2.10/trunk/debian/changelog 2006-11-01 13:10:00 UTC (rev 386)
+++ zope2.10/trunk/debian/changelog 2006-11-01 13:38:30 UTC (rev 387)
@@ -1,8 +1,9 @@
zope2.10 (2.10.0-1) unstable; urgency=low
* New major upstream release, new source package.
+ - Update deb-zopeconf.dpatch.
- -- Jonas Meurer <mejo at debian.org> Wed, 1 Nov 2006 13:58:39 +0100
+ -- Jonas Meurer <mejo at debian.org> Wed, 1 Nov 2006 14:36:36 +0100
zope2.9 (2.9.5-1) unstable; urgency=low
Modified: zope2.10/trunk/debian/patches/deb-zopeconf.dpatch
===================================================================
--- zope2.10/trunk/debian/patches/deb-zopeconf.dpatch 2006-11-01 13:10:00 UTC (rev 386)
+++ zope2.10/trunk/debian/patches/deb-zopeconf.dpatch 2006-11-01 13:38:30 UTC (rev 387)
@@ -6,9 +6,9 @@
. $(dirname $0)/DPATCH
@DPATCH@
-diff -urN zope2.9-2.9.5/z/skel/etc/zope.conf.in zope2.9-2.9.5.debian/z/skel/etc/zope.conf.in
---- zope2.9-2.9.5/z/skel/etc/zope.conf.in 2006-07-20 07:31:24.000000000 +0200
-+++ zope2.9-2.9.5.debian/z/skel/etc/zope.conf.in 2006-07-21 09:47:24.000000000 +0200
+diff -rNu Zope-2.10.0-final.orig/skel/etc/zope.conf.in Zope-2.10.0-final/skel/etc/zope.conf.in
+--- Zope-2.10.0-final.orig/skel/etc/zope.conf.in 2006-10-03 08:08:25.000000000 +0200
++++ Zope-2.10.0-final/skel/etc/zope.conf.in 2006-11-01 14:31:36.000000000 +0100
@@ -24,6 +24,8 @@
%define INSTANCE <<INSTANCE_HOME>>
@@ -33,11 +33,11 @@
- address 8080
+ address $HTTPPORT
# force-connection-close on
- </http-server>
-
-diff -urN zope2.9-2.9.5/z/utilities/copyzopeskel.py zope2.9-2.9.5.debian/z/utilities/copyzopeskel.py
---- zope2.9-2.9.5/z/utilities/copyzopeskel.py 2006-07-20 07:31:23.000000000 +0200
-+++ zope2.9-2.9.5.debian/z/utilities/copyzopeskel.py 2006-07-21 09:47:24.000000000 +0200
+ # You can also use the WSGI interface between ZServer and ZPublisher:
+ # use-wsgi on
+diff -rNu Zope-2.10.0-final.orig/utilities/copyzopeskel.py Zope-2.10.0-final/utilities/copyzopeskel.py
+--- Zope-2.10.0-final.orig/utilities/copyzopeskel.py 2006-10-03 08:08:24.000000000 +0200
++++ Zope-2.10.0-final/utilities/copyzopeskel.py 2006-11-01 14:31:36.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/python2.4
@@ -65,10 +65,10 @@
(targetdir, replacements, uid, gid))
+ if layout == 'fhs':
+ movedir(os.path.join(targetdir, 'etc'),
-+ os.path.join('/etc/zope2.9', os.path.basename(targetdir)),
++ os.path.join('/etc/zope2.10', os.path.basename(targetdir)),
+ uid, gid)
+ movedir(os.path.join(targetdir, 'log'),
-+ os.path.join('/var/log/zope2.9', os.path.basename(targetdir)),
++ os.path.join('/var/log/zope2.10', os.path.basename(targetdir)),
+ uid, gid)
finally:
os.chdir(pwd)
@@ -118,9 +118,9 @@
def usage(stream, msg=None):
if msg:
print >>stream, msg
-diff -urN zope2.9-2.9.5/z/utilities/mkzopeinstance.py zope2.9-2.9.5.debian/z/utilities/mkzopeinstance.py
---- zope2.9-2.9.5/z/utilities/mkzopeinstance.py 2006-07-20 07:31:23.000000000 +0200
-+++ zope2.9-2.9.5.debian/z/utilities/mkzopeinstance.py 2006-07-21 09:47:24.000000000 +0200
+diff -rNu Zope-2.10.0-final.orig/utilities/mkzopeinstance.py Zope-2.10.0-final/utilities/mkzopeinstance.py
+--- Zope-2.10.0-final.orig/utilities/mkzopeinstance.py 2006-10-03 08:08:24.000000000 +0200
++++ Zope-2.10.0-final/utilities/mkzopeinstance.py 2006-11-01 14:31:36.000000000 +0100
@@ -36,8 +36,8 @@
def main():
try:
Modified: zope2.10/trunk/debian/rules
===================================================================
--- zope2.10/trunk/debian/rules 2006-11-01 13:10:00 UTC (rev 386)
+++ zope2.10/trunk/debian/rules 2006-11-01 13:38:30 UTC (rev 387)
@@ -12,13 +12,13 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ZVER := 2.9
+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.9.5-final
+ZBASE := Zope-2.10.0-final
distribution := $(shell lsb_release -is)
@@ -111,27 +111,30 @@
fi; else rm -f $$i~ ; fi ; \
done
- rm $(DEBIAN)/usr/lib/zope2.9/lib/python/zope/formlib/LICENSE.txt \
- $(DEBIAN)/usr/lib/zope2.9/lib/python/Products/Five/COPYING.txt \
- $(DEBIAN)/usr/lib/zope2.9/lib/python/Products/Five/doc/ZopePublicLicense.txt \
- $(DEBIAN)/usr/lib/zope2.9/lib/python/docutils/COPYING.txt \
- $(DEBIAN)/usr/lib/zope2.9/lib/python/pytz/LICENSE.txt \
- $(DEBIAN)/usr/lib/zope2.9/lib/python/ZConfig/LICENSE.txt
+ # 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/docutils/COPYING.txt \
+ $(DEBIAN)/usr/lib/zope2.10/lib/python/pytz/LICENSE.txt \
+ $(DEBIAN)/usr/lib/zope2.10/lib/python/ZConfig/LICENSE.txt
- rm -fr $(DEBIAN)/usr/lib/zope2.9/doc
+ # Remove zope documentation, as it is redundant
+ rm -fr $(DEBIAN)/usr/lib/zope2.10/doc
- chmod 755 $(DEBIAN)/usr/lib/zope2.9/lib/python/DocumentTemplate/release.sh \
- $(DEBIAN)/usr/lib/zope2.9/lib/python/ZPublisher/Client.py \
- $(DEBIAN)/usr/lib/zope2.9/lib/python/ZPublisher/Test.py
+ # 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
- find $(DEBIAN)/usr/lib/zope2.9/lib/python -type f -a \
+ find $(DEBIAN)/usr/lib/zope2.10/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.9/bin/reindex_catalog.py \
- $(DEBIAN)/usr/lib/zope2.9/skel/import/README.txt \
- $(DEBIAN)/usr/lib/zope2.9/lib/python/ImageFile.py \
- $(DEBIAN)/usr/lib/zope2.9/lib/python/Products/ZSQLMethods/Setup \
- $(DEBIAN)/usr/lib/zope2.9/lib/python/Products/ZGadflyDA/Setup
+ 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
# Lintian and linda overrides (images in /usr/lib)
mkdir -p -m 0755 $(DEBIAN)/usr/share/lintian/overrides
@@ -143,7 +146,7 @@
$(DEBIAN)/usr/share/linda/overrides/$(ZOPE)
dh_installdocs -p$(ZOPE) z/README.txt
- cp debian/zope2.9.NEWS.Debian $(DEBIAN)/usr/share/doc/zope2.9/NEWS.Debian
+ cp debian/zope2.10.NEWS.Debian $(DEBIAN)/usr/share/doc/zope2.10/NEWS.Debian
dh_installexamples -p$(ZOPE) z/lib/python/Products/PageTemplates/examples/*
dh_pycentral -p$(ZOPE) /usr/lib/$(ZOPE) -V $(PYTHONVER)
More information about the pkg-zope-commits
mailing list