r947 - in /python-xml/trunk: debian/changelog debian/compat debian/control debian/rules extensions/boolean.c extensions/sgmlop.c

lunar at users.alioth.debian.org lunar at users.alioth.debian.org
Wed Jul 18 10:09:18 UTC 2007


Author: lunar
Date: Wed Jul 18 10:09:18 2007
New Revision: 947

URL: http://svn.debian.org/wsvn/pkg-zope/?sc=1&rev=947
Log:
Record changes made in 0.8.4-7 as doko did not use the collective repository.

Modified:
    python-xml/trunk/debian/changelog
    python-xml/trunk/debian/compat
    python-xml/trunk/debian/control
    python-xml/trunk/debian/rules
    python-xml/trunk/extensions/boolean.c
    python-xml/trunk/extensions/sgmlop.c

Modified: python-xml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zope/python-xml/trunk/debian/changelog?rev=947&op=diff
==============================================================================
--- python-xml/trunk/debian/changelog (original)
+++ python-xml/trunk/debian/changelog Wed Jul 18 10:09:18 2007
@@ -1,3 +1,13 @@
+python-xml (0.8.4-7) unstable; urgency=low
+
+  * Merge changes from Ubuntu:
+    - Fix PyMem_DEL-->PyObject_DEL. Ubuntu #95649.
+    - Build the extension for the python debug interpreter.
+    - debian/control: Add ${shlibs:Depends}.
+    - Bump debhelper compatibility to v5.
+
+ -- Matthias Klose <doko at debian.org>  Fri,  4 May 2007 07:12:00 +0200
+
 python-xml (0.8.4-6) unstable; urgency=medium
 
   * Fixes for documentation and examples:

Modified: python-xml/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-zope/python-xml/trunk/debian/compat?rev=947&op=diff
==============================================================================
--- python-xml/trunk/debian/compat (original)
+++ python-xml/trunk/debian/compat Wed Jul 18 10:09:18 2007
@@ -1,1 +1,1 @@
-4
+5

Modified: python-xml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-zope/python-xml/trunk/debian/control?rev=947&op=diff
==============================================================================
--- python-xml/trunk/debian/control (original)
+++ python-xml/trunk/debian/control Wed Jul 18 10:09:18 2007
@@ -3,16 +3,17 @@
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Alexandre Fayolle <afayolle at debian.org> , Fabio Tranchitella <kobold at debian.org>, Matthias Klose <doko at debian.org>
-Build-Depends: python-all-dev, debhelper (>= 5.0.37.1), python-central (>= 0.4.15)
+Build-Depends: python-all-dev, python-all-dbg, debhelper (>= 5.0.37.1), python-central (>= 0.4.15)
 Standards-Version: 3.7.2
 XS-Python-Version: all
 
 Package: python-xml
 Architecture: any
-Depends: ${python:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}
 Conflicts: python-4suite (<< 0.12), python2.3-xml, python2.4-xml
 Replaces: python2.3-xml, python2.4-xml
 Provides: ${python:Provides}
+Suggests: python-xml-dbg
 XB-Python-Version: ${python:Versions}
 Description: XML tools for Python
  The Python/XML distribution contains the basic tools required for
@@ -31,6 +32,19 @@
   * Schema implementations: TREX (James Tauber)
   * Various utility modules and functions (various people)
   * Documentation and example programs (various people)
+
+Package: python-xml-dbg
+Priority: extra
+Architecture: any
+Depends: python-xml (= ${Source-Version}), python-dbg, ${shlibs:Depends}
+Description: XML tools for Python (debug extension)
+ The Python/XML distribution contains the basic tools required for
+ processing XML data using the Python programming language, assembled
+ into one easy-to-install package.  The distribution includes parsers
+ and standard interfaces such as SAX and DOM, along with various other
+ useful modules.
+ .
+ This package contains the extension built for the python debug interpreter.
 
 Package: xbel
 Architecture: all

Modified: python-xml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zope/python-xml/trunk/debian/rules?rev=947&op=diff
==============================================================================
--- python-xml/trunk/debian/rules (original)
+++ python-xml/trunk/debian/rules Wed Jul 18 10:09:18 2007
@@ -18,23 +18,23 @@
 EXTRA=debian/extra
 debian_patches=
 
-build: build-stamp
-build-stamp: patched-stamp
+build: stamp-build
+stamp-build: $(VERSIONS:%=stamp-build-%)
+	touch $@
+stamp-build-%: patched-stamp
 	dh_testdir
-
-	set -e; \
-	for version in $(VERSIONS) ; do \
-	  python$${version} setup.py build --without-xslt; \
-	  cp doc/man/xmlproc_parse.1 doc/man/xmlproc_parse.python$${version}-xml.1; \
-	  cp doc/man/xmlproc_val.1 doc/man/xmlproc_val.python$${version}-xml.1; \
-	done
-
-	touch build-stamp
+	python$* setup.py build --without-xslt
+	cp doc/man/xmlproc_parse.1 doc/man/xmlproc_parse.python$*-xml.1
+	cp doc/man/xmlproc_val.1 doc/man/xmlproc_val.python$*-xml.1
+
+	python$*-dbg setup.py build --without-xslt
+
+	touch $@
 
 clean: reverse-patches
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f stamp-*
 	rm -rf build dist
 	rm -f doc/man/xmlproc_*.python2.?-xml.1
 	find . -name "*.py[co]" -exec rm -f {} \;
@@ -84,7 +84,6 @@
 	done
 
 	dh_pycentral -i
-	dh_python -i
 
 	dh_installdocs -i
 	dh_installman -pxbel-utils 
@@ -108,7 +107,8 @@
 	  DESTDIR=debian/$${PACKAGE} ;\
 	  SITE_PACK=$${DESTDIR}/usr/lib/$${PYTHON}/site-packages/_xmlplus ;\
 	  DOC=$${DESTDIR}/usr/share/doc/$${PACKAGE} ;\
-	  $${PYTHON} setup.py install --without-xslt --no-compile --prefix=$${DESTDIR}/usr ;\
+	  $${PYTHON} setup.py install \
+	    --without-xslt --no-compile --prefix=$${DESTDIR}/usr ;\
 	  cp -R doc/* $${DOC} ;\
 	  rm -rf $${DOC}/man ;\
 	  cp -r demo/* $${DOC}/examples/demo ;\
@@ -117,17 +117,17 @@
 	  rm -rf $${DOC}/examples/demo/xbel ;\
 	  chmod 755 $${SITE_PACK}/dom/html/GenerateHtml.py ;\
 	  rm $${DOC}/examples/demo/sgmlop/test2.htm ;\
-	  tail +2 $${SITE_PACK}/dom/ext/c14n.py > $${SITE_PACK}/dom/ext/c14n.py.new ;\
+	  tail -n +2 $${SITE_PACK}/dom/ext/c14n.py > $${SITE_PACK}/dom/ext/c14n.py.new ;\
 	  mv $${SITE_PACK}/dom/ext/c14n.py.new $${SITE_PACK}/dom/ext/c14n.py ;\
           for i in `find $${DESTDIR} -type f`; do \
 	      if head -1 $$i | grep "^#! */usr/bin" | grep "python" >/dev/null ; then \
-	        sed 's@^\(#! */usr/bin/env \+\)python[.[:digit:]]*$$@\1'$${PYTHON}'@;s@^\(#! */usr/bin/\)python[.[:digit:]]*$$@\1'$${PYTHON}'@' <$$i >$$i.temp; \
-	        cat <$$i.temp >$$i; \
-	        rm $$i.temp; \
+	        sed -i 's@^\(#! */usr/bin/env \+\)python[.[:digit:]]*$$@\1'$${PYTHON}'@;s@^\(#! */usr/bin/\)python[.[:digit:]]*$$@\1'$${PYTHON}'@' $$i; \
 	      fi ;\
           done ;\
-	  mv $${DESTDIR}/usr/bin/xmlproc_parse $${DESTDIR}/usr/bin/xmlproc_parse.$${PACKAGE} ;\
-	  mv $${DESTDIR}/usr/bin/xmlproc_val $${DESTDIR}/usr/bin/xmlproc_val.$${PACKAGE} ;\
+	  mv $${DESTDIR}/usr/bin/xmlproc_parse \
+	    $${DESTDIR}/usr/bin/xmlproc_parse.$${PACKAGE} ;\
+	  mv $${DESTDIR}/usr/bin/xmlproc_val \
+	    $${DESTDIR}/usr/bin/xmlproc_val.$${PACKAGE} ;\
 	done
 	: # Replace all '#!' calls to python with /usr/bin/python
 	: # and make them executable
@@ -143,13 +143,27 @@
 	  fi; \
 	done
 
+	for version in $(VERSIONS)  ; do \
+	  PYTHON=python$${version} ; \
+	  PACKAGE=python-xml-dbg ;\
+	  DESTDIR=debian/$${PACKAGE} ;\
+	  SITE_PACK=$${DESTDIR}/usr/lib/$${PYTHON}/site-packages/_xmlplus ;\
+	  DOC=$${DESTDIR}/usr/share/doc/$${PACKAGE} ;\
+	  $${PYTHON}-dbg setup.py \
+	    install --without-xslt --no-compile --prefix=$${DESTDIR}/usr ;\
+	done
+	find debian/python-xml-dbg ! -type d ! \( -name '*_d.so' -o -name '*.h' \) \
+		| xargs rm -f
+	find debian/python-xml-dbg -depth -empty -exec rmdir {} \;
+
 	dh_pycentral -a
-	dh_python -a
 	dh_installdocs -a
 	dh_installmenu -a
 	dh_installman -a
 	dh_installchangelogs -a ANNOUNCE
-	dh_strip -a
+	rm -rf debian/python-xml-dbg/usr/share/doc/python-xml-dbg
+	ln -s python-xml debian/python-xml-dbg/usr/share/doc/python-xml-dbg
+	dh_strip -ppython-xml --dbg-package=python-xml-dbg
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a

Modified: python-xml/trunk/extensions/boolean.c
URL: http://svn.debian.org/wsvn/pkg-zope/python-xml/trunk/extensions/boolean.c?rev=947&op=diff
==============================================================================
--- python-xml/trunk/extensions/boolean.c (original)
+++ python-xml/trunk/extensions/boolean.c Wed Jul 18 10:09:18 2007
@@ -111,7 +111,7 @@
 static void
 boolean_dealloc(PyObject *self)
 {
-  PyMem_DEL(self);
+  PyObject_Del(self);
 }
 
 static int

Modified: python-xml/trunk/extensions/sgmlop.c
URL: http://svn.debian.org/wsvn/pkg-zope/python-xml/trunk/extensions/sgmlop.c?rev=947&op=diff
==============================================================================
--- python-xml/trunk/extensions/sgmlop.c (original)
+++ python-xml/trunk/extensions/sgmlop.c Wed Jul 18 10:09:18 2007
@@ -232,7 +232,7 @@
     Py_XDECREF(self->handle_data);
     Py_XDECREF(self->handle_cdata);
     Py_XDECREF(self->handle_comment);
-    PyMem_DEL(self);
+    PyObject_Del(self);
 }
 
 #define GETCB(member, name)\
@@ -509,7 +509,7 @@
 
     RELEASE(sizeof(ElementObject), "destroy element");
 
-    PyMem_DEL(self);
+    PyObject_Del(self);
 }
 
 /* -------------------------------------------------------------------- */
@@ -789,7 +789,7 @@
     Py_XDECREF(self->last);
     Py_XDECREF(self->this);
     Py_DECREF(self->root);
-    PyMem_DEL(self);
+    PyObject_Del(self);
 }
 
 /* -------------------------------------------------------------------- */




More information about the pkg-zope-commits mailing list