r995 - in /zope3/trunk/debian: changelog compat control rules
kobold at users.alioth.debian.org
kobold at users.alioth.debian.org
Tue Sep 4 18:28:59 UTC 2007
Author: kobold
Date: Tue Sep 4 18:28:59 2007
New Revision: 995
URL: http://svn.debian.org/wsvn/pkg-zope/?sc=1&rev=995
Log:
Changes from doko.
Modified:
zope3/trunk/debian/changelog
zope3/trunk/debian/compat
zope3/trunk/debian/control
zope3/trunk/debian/rules
Modified: zope3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zope/zope3/trunk/debian/changelog?rev=995&op=diff
==============================================================================
--- zope3/trunk/debian/changelog (original)
+++ zope3/trunk/debian/changelog Tue Sep 4 18:28:59 2007
@@ -1,3 +1,17 @@
+zope3 (3.3.1-3) unstable; urgency=low
+
+ * Merge from Ubuntu:
+ - Build a zope3-dbg package.
+
+ -- Matthias Klose <doko at debian.org> Fri, 8 Jun 2007 00:58:35 +0200
+
+zope3 (3.3.1-2) unstable; urgency=low
+
+ * Build a python-zopeinterface-dbg package.
+ * Bump debhelper compatibility to v5.
+
+ -- Matthias Klose <doko at debian.org> Sun, 20 May 2007 19:36:20 +0200
+
zope3 (3.3.1-1) unstable; urgency=low
* New upstream release.
Modified: zope3/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-zope/zope3/trunk/debian/compat?rev=995&op=diff
==============================================================================
--- zope3/trunk/debian/compat (original)
+++ zope3/trunk/debian/compat Tue Sep 4 18:28:59 2007
@@ -1,1 +1,1 @@
-4
+5
Modified: zope3/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-zope/zope3/trunk/debian/control?rev=995&op=diff
==============================================================================
--- zope3/trunk/debian/control (original)
+++ zope3/trunk/debian/control Tue Sep 4 18:28:59 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
Uploaders: Matthias Klose <doko at debian.org>, Fabio Tranchitella <kobold at debian.org>, Brian Sutherland <jinty at web.de>
-Build-Depends: python, python-all-dev (>= 2.3.5-11), debhelper (>= 5.0.39), python-central (>= 0.5), zope-debhelper (>= 0.3.6), lsb-release, dpatch
+Build-Depends: python, python-all-dev (>= 2.3.5-11), python-all-dbg, debhelper (>= 5.0.39), python-central (>= 0.5), zope-debhelper (>= 0.3.6), lsb-release, dpatch
Standards-Version: 3.7.2
XS-Python-Version: all
XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope3/trunk
@@ -12,10 +12,11 @@
Section: python
Architecture: any
Pre-Depends: zope-common
-Depends: python2.4 (>= 2.4.2), python-zopeinterface (= ${Source-Version}), ${shlibs:Depends}, python-docutils (>= 0.3.7) | python2.4-docutils (>= 0.3.7), python-tz (>= 2006g-1), python-mechanize (>= 0.1.2b-1), python-clientform (>= 0.2.2-2), python-twisted-conch (>= 1:0.7), python-twisted-web2 (>= 0.2.0), python-xml (>= 0.8.4-5), lsb-base
+Depends: python2.4 (>= 2.4.2), python-zopeinterface (= ${Source-Version}), ${shlibs:Depends}, python-docutils (>= 0.3.7) | python2.4-docutils (>= 0.3.7), python-tz (>= 2006g-1), python-mechanize (>= 0.1.2b-1), python-clientform (>= 0.2.2-2), python-twisted-conch (>= 1:0.8), python-twisted-web2 (>= 0.2.0+svn20070403), python-xml (>= 0.8.4-5), lsb-base
Conflicts: zopex3-lib, zope3-lib
Replaces: zopex3-lib, zope3-lib
Provides: zope3-lib
+Suggests: zope3-dbg
XB-Python-Version: 2.4
Description: Open Source Web Application Server (Libraries)
Zope is an open source web application server primarily written in
@@ -33,6 +34,22 @@
.
This package contains the framework and libraries needed to run your
own Zope3 instance.
+
+Package: zope3-dbg
+Priority: extra
+Section: python
+Architecture: any
+Pre-Depends: zope-common
+Depends: zope3 (= ${Source-Version}), python-dbg, python-zopeinterface-dbg, python-xml-dbg, python-crypto-dbg, python-twisted-bin-dbg, ${shlibs:Depends}
+Description: Open Source Web Application Server (debug extensions)
+ Zope is an open source web application server primarily written in
+ the Python programming language. It features a transactional object
+ database which can store not only content and custom data, but also
+ dynamic HTML templates, scripts, a search engine, and relational
+ database (RDBMS) connections and code.
+ .
+ This package contains the python extensions built for the python debug
+ interpreter.
Package: zope3-doc
Section: doc
@@ -54,13 +71,25 @@
please setup your own Zope 3 instance using dzhandle utility.
Package: python-zopeinterface
-Section: devel
+Section: python
Architecture: any
Depends: ${python:Depends}
Conflicts: python-zope-interface, python2.3-zopeinterface, python2.4-zopeinterface
Replaces: python-zope-interface, python2.3-zopeinterface, python2.4-zopeinterface
Provides: python-zope-interface, ${python:Provides}
+Suggests: python-zopeinterface-dbg
XB-Python-Version: ${python:Versions}
Description: The implementation of interface definitions for Zope 3
Zope interfaces are objects that specify (document) the external behavior
of objects that "provide" them.
+
+Package: python-zopeinterface-dbg
+Priority: extra
+Section: python
+Architecture: any
+Depends: python-zopeinterface (= ${Source-Version}), python-dbg, ${shlibs:Depends}
+Description: The implementation of interface definitions for Zope 3 (debug extension)
+ Zope interfaces are objects that specify (document) the external behavior
+ of objects that "provide" them.
+ .
+ This package contains the extension built for the python debug interpreter.
Modified: zope3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zope/zope3/trunk/debian/rules?rev=995&op=diff
==============================================================================
--- zope3/trunk/debian/rules (original)
+++ zope3/trunk/debian/rules Tue Sep 4 18:28:59 2007
@@ -29,6 +29,7 @@
with_zif := yes
p_lib = zope$(ZVER)
+p_libdbg = zope$(ZVER)-dbg
p_doc = zope$(ZVER)-doc
#p_bin = zope3-scripts
@@ -36,14 +37,17 @@
#p_dutil = zope3-docutils
p_zif = python-zopeinterface
+p_zifdbg= python-zopeinterface-dbg
d_lib = debian/$(p_lib)
+d_libdbg= debian/$(p_libdbg)
d_bin = debian/$(p_bin)
d_add = debian/$(p_add)
d_dutil = debian/$(p_dutil)
d_doc = debian/$(p_doc)
d_zif = debian/$(p_zif)
+d_zifdbg= debian/$(p_zifdbg)
unpack: unpack-stamp
unpack-stamp:
@@ -54,15 +58,20 @@
configure: config-stamp
config-stamp: unpack-stamp patch-stamp
dh_testdir
+ cp -a z zdbg
cd z && ./configure \
--prefix=/usr \
--with-python=$(PYTHON) \
--force
+ cd zdbg && ./configure \
+ --prefix=/usr \
+ --with-python=$(PYTHON)-dbg \
+ --force
touch config-stamp
build: build-arch build-indep check
-build-arch: build-arch-stamp
+build-arch: build-arch-stamp build-dbg-stamp
build-arch-stamp: config-stamp
cd z && $(PYTHON) install.py build
ifeq ($(with_zif),yes)
@@ -70,11 +79,17 @@
for v in $(PYVERS); do \
pushd z/Dependencies/zope.interface-$(zbase); \
/usr/bin/python$$v setup.py build; \
+ /usr/bin/python$$v-dbg setup.py build; \
popd; \
done
endif
touch build-arch-stamp
+build-dbg: build-dbg-stamp
+build-dbg-stamp: config-stamp
+ cd zdbg && $(PYTHON)-dbg install.py build
+ touch build-dbg-stamp
+
build-indep: build-indep-stamp
build-indep-stamp:
touch build-indep-stamp
@@ -86,18 +101,19 @@
clean: unpatch
dh_testdir
- rm -f unpack-stamp config-stamp build-arch-stamp build-indep-stamp check-stamp
- rm -rf build z $(zbase)
+ rm -f *-stamp
+ rm -rf build z zdbg $(zbase)
for f in debian/*.in; do \
generated=`echo $$f | sed 's,.in$$,,;s,ZVER,$(ZVER),'`; \
rm -f $$generated $$generated.tmp; \
done
+ rm -rf debian/patched
dh_clean
install: install-indep install-arch
install-indep: build-indep
-install-arch: build-arch install-prereq $(PYVERS:%=install-zif-python%)
+install-arch: build-arch build-dbg install-prereq $(PYVERS:%=install-zif-python%) install-zope-dbg
# Remove not needed stuff
rm -fr $(d_lib)/usr/lib/python2.4/site-packages/twisted/trial/test/scripttest.py \
$(d_lib)/usr/lib/python2.4/site-packages/mechanize \
@@ -135,7 +151,7 @@
dh_installdirs
dh_installzopeinstance -pzope$(ZVER)-sandbox sandbox
cd z && $(PYTHON) install.py install \
- --skip-build --no-compile --prefix $(PWD)/$(d)/usr
+ --skip-build --no-compile --root $(PWD)/$(d)
-find $(d) -name '*.py[co]' | xargs -n 100 rm -f
rm -rf $(d)/$(pylibdir)/twisted
@@ -175,10 +191,17 @@
install -m 0644 debian/$(p_lib).linda-overrides \
$(d_lib)/usr/share/linda/overrides/$(p_lib)
+install-zope-dbg:
+ cd zdbg && $(PYTHON)-dbg install.py install \
+ --skip-build --no-compile --root $(PWD)/$(d_libdbg)
+ find $(d_libdbg) ! -type d ! -name '*.so' | xargs rm -f
+ find $(d_libdbg) -depth -empty -exec rmdir {} \;
+ rm -rf debian/zope3-dbg/usr/lib/python*/site-packages/zope/interface
+
install-zif-python%:
# install zopeinterface packages
cd z/Dependencies/zope.interface-$(zbase) \
- && /usr/bin/python$* setup.py install --prefix=$(PWD)/$(d_zif)/usr
+ && /usr/bin/python$* setup.py install --root=$(PWD)/$(d_zif)
-find debian/python-zopeinterface -name '*.py[co]' | xargs rm -f
# Copy README.txt to the right place
@@ -190,6 +213,12 @@
cp -p $(d_lib)/$(pylibdir)/zope/__init__.py \
$(d_zif)/usr/lib/python$*/site-packages/zope/
rm -rf $(d_lib)/$(pylibdir)/zope/interface
+
+ # debug extension
+ cd z/Dependencies/zope.interface-$(zbase) \
+ && /usr/bin/python$*-dbg setup.py install --root=$(PWD)/$(d_zifdbg)
+ find $(d_zifdbg) ! -type d ! -name '*_d.so' | xargs rm -f
+ find $(d_zifdbg) -depth -empty -exec rmdir {} \;
disabled-script-package:
@@ -224,7 +253,6 @@
dh_installman -i
dh_compress -i -X.rst -X.css
dh_fixperms -i
- dh_python -i
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
@@ -246,16 +274,23 @@
mv debian/zope3/usr/share/doc/zope3/NEWS.Debian \
debian/zope3/usr/share/doc/zope3/NEWS.Ubuntu
endif
+ rm -rf $(d_zifdbg)/usr/share/doc/$(p_zifdbg)
+ ln -s $(p_zif) $(d_zifdbg)/usr/share/doc/$(p_zifdbg)
+ rm -rf $(d_libdbg)/usr/share/doc/$(p_libdbg)
+ ln -s $(p_lib) $(d_libdbg)/usr/share/doc/$(p_libdbg)
dh_installlogrotate -a
dh_installdebconf -a
dh_installinit -a
dh_installman -a
dh_link -a
- dh_strip -a
+ dh_strip -p$(p_lib) --dbg-package=$(p_libdbg)
+ dh_strip -p$(p_zif) --dbg-package=$(p_zifdbg)
dh_compress -a -X.rst -X.css
dh_fixperms -a
+
DH_PYCENTRAL=nomove dh_pycentral -p$(p_lib)
dh_pycentral -p$(p_zif)
+
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
More information about the pkg-zope-commits
mailing list