r1781 - in zope2.12/trunk/debian (6 files)
doko at users.alioth.debian.org
doko at users.alioth.debian.org
Sun Sep 20 12:58:09 UTC 2009
Date: Sunday, September 20, 2009 @ 12:58:08
Author: doko
Revision: 1781
zope2.12 (2.12.0~c1-1) UNRELEASED; urgency=low
* Zope-2.12 release candidate 1.
* Add the existing modular zope modules as dependencies.
* Modules which are not yet packaged: Acquisition DateTime ExtensionClass
Persistence RestrictedPython tempstorage zLOG zope.container
zope.contentprovider zope.contenttype zope.deferredimport zope.formlib
zope.lifecycleevent zope.pagetemplate zope.processlifetime zope.sendmail
zope.sequencesort zope.site zope.size zope.structuredtext zope.tal
zope.tales zope.testbrowser [zope-functional-testing] (UNRELEASED?)
zope.viewlet zope.app.form zope.app.publication zope.app.publisher
zope.app.schema
* Fix the build such that the package builds again.
-- Matthias Klose <doko at debian.org> Sun, 20 Sep 2009 12:04:40 +0200
Added:
zope2.12/trunk/debian/patches/03_makefile.patch
Modified:
zope2.12/trunk/debian/changelog
zope2.12/trunk/debian/control
zope2.12/trunk/debian/patches/02_deb-zopeconf.patch
zope2.12/trunk/debian/patches/series
zope2.12/trunk/debian/rules
Modified: zope2.12/trunk/debian/changelog
===================================================================
--- zope2.12/trunk/debian/changelog 2009-09-15 10:24:56 UTC (rev 1780)
+++ zope2.12/trunk/debian/changelog 2009-09-20 12:58:08 UTC (rev 1781)
@@ -1,3 +1,19 @@
+zope2.12 (2.12.0~c1-1) UNRELEASED; urgency=low
+
+ * Zope-2.12 release candidate 1.
+ * Add the existing modular zope modules as dependencies.
+ * Modules which are not yet packaged: Acquisition DateTime ExtensionClass
+ Persistence RestrictedPython tempstorage zLOG zope.container
+ zope.contentprovider zope.contenttype zope.deferredimport zope.formlib
+ zope.lifecycleevent zope.pagetemplate zope.processlifetime zope.sendmail
+ zope.sequencesort zope.site zope.size zope.structuredtext zope.tal
+ zope.tales zope.testbrowser [zope-functional-testing] (UNRELEASED?)
+ zope.viewlet zope.app.form zope.app.publication zope.app.publisher
+ zope.app.schema
+ * Fix the build such that the package builds again.
+
+ -- Matthias Klose <doko at debian.org> Sun, 20 Sep 2009 12:04:40 +0200
+
zope2.12 (2.12.0~b2-1) unstable; urgency=low
* NOT RELEASED YET
Modified: zope2.12/trunk/debian/control
===================================================================
--- zope2.12/trunk/debian/control 2009-09-15 10:24:56 UTC (rev 1780)
+++ zope2.12/trunk/debian/control 2009-09-20 12:58:08 UTC (rev 1781)
@@ -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 (>= 6.0.0), python-support (>= 0.5.3), python2.5-dev, python2.5, python, python-setuptools, zope-debhelper (>= 0.3.12), lsb-release, quilt (>= 0.40)
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
XS-Python-Version: 2.5
Homepage: http://www.zope.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-zope/zope2.12/trunk
@@ -13,7 +13,36 @@
Package: zope2.12
Architecture: any
Pre-Depends: zope-common (>= 0.5.49)
-Depends: python2.5, python-tz, lsb-base, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf | debconf-2.0
+Depends: python2.5, python-zope.traversing, python-zope.testbrowser, python-zope.testing, python-tz, python-docutils, lsb-base, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf | debconf-2.0
+# FIXME: packages for the following modules are missing:
+#Acquisition
+#DateTime
+#ExtensionClass
+#Persistence
+#RestrictedPython
+#tempstorage
+#zLOG
+#zope.container
+#zope.contentprovider
+#zope.contenttype
+#zope.deferredimport
+#zope.formlib
+#zope.lifecycleevent
+#zope.pagetemplate
+#zope.processlifetime
+#zope.sendmail
+#zope.sequencesort
+#zope.site
+#zope.size
+#zope.structuredtext
+#zope.tal
+#zope.tales
+#zope.testbrowser [zope-functional-testing] UNRELEASED?
+#zope.viewlet
+#zope.app.form
+#zope.app.publication
+#zope.app.publisher
+#zope.app.schema
Provides: zope
Suggests: python-unit, zope-book, zope-devguide
XB-Python-Version: 2.5
Modified: zope2.12/trunk/debian/patches/02_deb-zopeconf.patch
===================================================================
--- zope2.12/trunk/debian/patches/02_deb-zopeconf.patch 2009-09-15 10:24:56 UTC (rev 1780)
+++ zope2.12/trunk/debian/patches/02_deb-zopeconf.patch 2009-09-20 12:58:08 UTC (rev 1781)
@@ -43,12 +43,12 @@
# var $INSTANCE/var
--- a/src/Zope2/utilities/copyzopeskel.py
+++ b/src/ZOpe2/utilities/copyzopeskel.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.4
-+#!/usr/bin/env python2.5
-
+@@ -1,3 +1,5 @@
++#!/usr/bin/python2.5
++
##############################################################################
#
+ # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
@@ -164,7 +164,7 @@
copyskel(sourcedir, targetdir, uid, gid, **replacements)
@@ -125,12 +125,12 @@
print >>stream, msg
--- a/src/Zope2/utilities/mkzopeinstance.py
+++ b/src/Zope2/utilities/mkzopeinstance.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.4
-+#!/usr/bin/env python2.5
-
+@@ -1,3 +1,5 @@
++#!/usr/bin/python2.5
++
##############################################################################
#
+ # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
@@ -23,11 +23,16 @@
-u/--user NAME:PASSWORD -- set the user name and password of the initial user
-s/--skelsrc -- the dir from which skeleton files should be copied
Added: zope2.12/trunk/debian/patches/03_makefile.patch
===================================================================
--- zope2.12/trunk/debian/patches/03_makefile.patch (rev 0)
+++ zope2.12/trunk/debian/patches/03_makefile.patch 2009-09-20 12:58:08 UTC (rev 1781)
@@ -0,0 +1,11 @@
+--- ./inst/Makefile.in~ 2009-09-04 04:23:30.000000000 +0000
++++ ./inst/Makefile.in 2009-09-20 10:47:31.000000000 +0000
+@@ -56,7 +56,7 @@
+ install: build version_txt
+ ${PYTHON} "${BASE_DIR}/setup.py" ${DISTUTILS_OPTS} install \
+ --home="${PREFIX}" ${BUILD_FLAGS} ${INSTALL_FLAGS}
+- [ -f ${PREFIX}/bin/python ] || ${LN} ${PYTHON} ${PREFIX}/bin/python
++ [ -f ${ROOT}${PREFIX}/bin/python ] || ${LN} ${PYTHON} ${ROOT}${PREFIX}/bin/python
+ @echo
+ @echo Zope binaries installed successfully.
+ @echo Now run \'${PREFIX}/bin/mkzopeinstance.py\'
Modified: zope2.12/trunk/debian/patches/series
===================================================================
--- zope2.12/trunk/debian/patches/series 2009-09-15 10:24:56 UTC (rev 1780)
+++ zope2.12/trunk/debian/patches/series 2009-09-20 12:58:08 UTC (rev 1781)
@@ -1,2 +1,3 @@
01_webdav.patch
02_deb-zopeconf.patch
+03_makefile.patch
Modified: zope2.12/trunk/debian/rules
===================================================================
--- zope2.12/trunk/debian/rules 2009-09-15 10:24:56 UTC (rev 1780)
+++ zope2.12/trunk/debian/rules 2009-09-20 12:58:08 UTC (rev 1781)
@@ -37,6 +37,8 @@
# Include quilt stuff.
include /usr/share/quilt/quilt.make
+include /usr/share/python/python.mk
+
ZVER := 2.12
ZOPE := zope$(ZVER)
PACKAGE := zope$(ZVER)
@@ -49,11 +51,13 @@
clean: unpatch
dh_testdir
dh_testroot
- if test -f Makefile; then $(MAKE) clean; fi
+ if test -f makefile; then $(MAKE) clean; fi
for f in debian/*.in; do \
generated=`echo $$f | sed 's,.in$$,,;s,ZVER,$(ZVER),'`; \
rm -f $$generated $$generated.tmp; \
done
+ rm -rf build
+ find -name '*.py[co]' | xargs -r rm -f
dh_clean configure-stamp build-indep-stamp build-arch-stamp
configure: configure-stamp
@@ -69,7 +73,7 @@
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
dh_testdir
- $(MAKE)
+ $(MAKE) BUILD_FLAGS=
touch $@
build-indep: build-indep-stamp
@@ -82,7 +86,7 @@
install-indep: build-arch-stamp
dh_testdir
dh_testroot
- dh_prep
+ dh_prep -i
dh_installzopeinstance -pzope$(ZVER)-sandbox sandbox
dh_installdocs -i
dh_install -i
@@ -107,9 +111,14 @@
dh_installdirs -s
# Install Zope and remove *.pyc
- $(MAKE) install
- find $(DEBIAN) -name '*.pyc' | xargs -r rm -r
+ mkdir -p lib/python/Zope2
+ $(MAKE) install BUILD_FLAGS= INSTALL_FLAGS=--root=$(DEBIAN) ROOT=$(DEBIAN)
+ find $(DEBIAN) -name '*.py[co]' | xargs -r rm -f
+
+ # Add private directory to sys.path
+ sed -i 's|^import sys$$|import sys; sys.path.insert(sys.path.index("$(call py_libdir,$(PYTHONVER))"),"/usr/lib/$(ZOPE)/lib/python")|' $$(find $(DEBIAN)/usr/lib/$(ZOPE)/bin -type f ! -type l)
+
# FHS enforcement
mkdir -p $(DEBIAN)/usr/sbin \
$(DEBIAN)/etc/$(ZOPE) \
@@ -133,24 +142,18 @@
fi; else rm -f $$i~ ; fi ; \
done
- # Remove duplicated license information, zope already is licensed under the ZPL
- 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/$(ZOPE)/doc
-
+
# Fix permissions for files
- chmod 755 $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/DocumentTemplate/release.sh \
+ chmod 755 \
$(DEBIAN)/usr/lib/$(ZOPE)/lib/python/ZPublisher/Client.py \
$(DEBIAN)/usr/lib/$(ZOPE)/lib/python/ZPublisher/Test.py
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 {} \;
+ \( -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/$(ZOPE)/bin/reindex_catalog.py \
- $(DEBIAN)/usr/lib/$(ZOPE)/skel/import/README.txt \
- $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/Products/ZSQLMethods/Setup
+ chmod 644 $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/Zope2/utilities/reindex_catalog.py
# Lintian overrides (images in /usr/lib)
mkdir -p -m 0755 $(DEBIAN)/usr/share/lintian/overrides
@@ -162,17 +165,16 @@
# fix some of the lintian warnings
rmdir $(DEBIAN)/usr/sbin
- rm $(DEBIAN)/usr/lib/$(ZOPE)/lib/python/docutils/svn-commit.tmp
dh_installdocs -p$(ZOPE) README.txt
- dh_installexamples -p$(ZOPE) lib/python/Products/PageTemplates/examples/*
+ dh_installexamples -p$(ZOPE) src/Products/PageTemplates/examples/*
dh_pysupport -p$(ZOPE) -V $(PYTHONVER) /usr/lib/$(ZOPE)
binary-common:
dh_testdir
dh_testroot
- dh_installchangelogs -k doc/CHANGES.txt
- dh_installdocs -X INSTALL.txt doc/*
+ dh_installchangelogs -k doc/CHANGES.rst
+ dh_installdocs -X INSTALL.rst -X Makefile doc/*
dh_installdocs
dh_installlogrotate
dh_installdebconf
More information about the pkg-zope-developers
mailing list