--- python-xml-0.8.4.orig/xml/parsers/xmlproc/xmlproc.py
+++ python-xml-0.8.4/xml/parsers/xmlproc/xmlproc.py
@@ -481,7 +481,9 @@
self.skip_ws(1)
rootname = self._get_name()
- self.skip_ws(1)
+
+ # whitespace here is not required per XML spec
+ self.skip_ws()
(pub_id, sys_id) = self.parse_external_id()
self.skip_ws()
--- python-xml-0.8.4.orig/xml/parsers/xmlproc/xmlutils.py
+++ python-xml-0.8.4/xml/parsers/xmlproc/xmlutils.py
@@ -720,6 +720,7 @@
# to the recoding.
try:
self.data = self.charset_converter(self.data)
+ self.datasize = len(self.data)
except UnicodeError, e:
self._handle_decoding_error(self.data, e)
self.input_encoding = enc1
--- python-xml-0.8.4.orig/doc/xmlproc/xmlproc.html
+++ python-xml-0.8.4/doc/xmlproc/xmlproc.html
@@ -49,7 +49,7 @@
xmlproc is free and you can do as you like with it. If you change it,
-please let me know. A formal BSD-ish
+please let me know. A formal BSD-ish
license is available.
--- python-xml-0.8.4.orig/scripts/xmlproc_parse
+++ python-xml-0.8.4/scripts/xmlproc_parse
@@ -30,6 +30,7 @@
# --- INITIALIZATION
import sys,getopt
+sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3])
from xml.parsers.xmlproc import xmlproc, _outputters
# --- Interpreting options
--- python-xml-0.8.4.orig/scripts/xmlproc_val
+++ python-xml-0.8.4/scripts/xmlproc_val
@@ -32,8 +32,9 @@
and XMLSOCATALOG will be used (in that order).
"""
-from xml.parsers.xmlproc import xmlval,catalog,xcatalog,xmlproc,_outputters
import sys, getopt, os, string
+sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3])
+from xml.parsers.xmlproc import xmlval,catalog,xcatalog,xmlproc,_outputters
# --- Utilities
--- python-xml-0.8.4.orig/demo/xbel/ns_parse.py
+++ python-xml-0.8.4/demo/xbel/ns_parse.py
@@ -10,7 +10,8 @@
# Cross references?
# Descriptions
-
+import sys
+sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3])
from xml.sax import sax2exts,handler
import bookmark
import string, htmlentitydefs
--- python-xml-0.8.4.orig/demo/xbel/bookmark.py
+++ python-xml-0.8.4/demo/xbel/bookmark.py
@@ -228,8 +228,8 @@
added = ' ADD_DATE="%s"' % self.added
else:
added = ""
- out.write(" %s
\n" %
- (folded,added,ID,esc_enc(self.title)))
+ out.write(" " % (folded,added,ID))
+ out.write("%s
\n" % esc_enc(self.title))
if self.desc:
out.write(" %s\n" %
(esc_enc(self.desc)))
--- python-xml-0.8.4.orig/demo/xbel/lynx_parse.py
+++ python-xml-0.8.4/demo/xbel/lynx_parse.py
@@ -9,6 +9,8 @@
# are stored.)
#
+import sys
+sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3])
import bookmark
import re
--- python-xml-0.8.4.orig/demo/xbel/adr_parse.py
+++ python-xml-0.8.4/demo/xbel/adr_parse.py
@@ -5,6 +5,8 @@
Written by Lars Marius Garshol
"""
+import sys
+sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3])
import string,bookmark,time
# --- Constants
--- python-xml-0.8.4.orig/demo/xbel/xbel_parse.py
+++ python-xml-0.8.4/demo/xbel/xbel_parse.py
@@ -10,6 +10,8 @@
"""
+import sys
+sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3])
import bookmark
import string
from xml.sax import saxlib,make_parser
@@ -88,13 +90,13 @@
opts, args = getopt.getopt(sys.argv[1:], '',
['opera', 'netscape', 'lynx=', 'msie', 'xbel'] )
if len(args):
- print 'xbel_parse only reads from standard input'
+ print >>sys.stderr, 'xbel_parse only reads from standard input'
sys.exit(1)
if len(opts)>1 or len(opts)==0:
- print 'You must specify a single output format when running xbel_parse'
- print 'Available formats: --opera, --netscape, --msie, --lynx, --xbel'
- print ' --lynx : For Lynx, a path to the directory where'
- print ' the output bookmark files should be written'
+ print >>sys.stderr, 'You must specify a single output format when running xbel_parse'
+ print >>sys.stderr, 'Available formats: --opera, --netscape, --msie, --lynx, --xbel'
+ print >>sys.stderr, ' --lynx : For Lynx, a path to the directory where'
+ print >>sys.stderr, ' the output bookmark files should be written'
sys.exit(1)
xbel_handler = XBELHandler()
--- python-xml-0.8.4.orig/demo/xbel/msie_parse.py
+++ python-xml-0.8.4/demo/xbel/msie_parse.py
@@ -10,6 +10,8 @@
that was assumed here.
"""
+import sys
+sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3])
import bookmark,os,string
DIR = "Favoritter" # Norwegian version
--- python-xml-0.8.4.orig/demo/xbel/xbel2html.py
+++ python-xml-0.8.4/demo/xbel/xbel2html.py
@@ -7,6 +7,7 @@
# no checking of the command-line args
import sys
+sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3])
from xml.sax import make_parser,saxlib,saxutils
--- python-xml-0.8.4.orig/demo/dom/generate_xml1.py
+++ python-xml-0.8.4/demo/dom/generate_xml1.py
@@ -14,16 +14,16 @@
#Create a document using document element namespace URI, doc element
#name and doctype. This automatically creates a document element
#which is the single element child of the document
- doc = implementation.createHTMLDocument('', 'mydoc', dt)
+ doc = implementation.createDocument(None, 'mydoc', dt)
#Get the document element
doc_elem = doc.documentElement
#Create an element: the Document instanmce acts as a factory
- new_elem = doc.createElementNS('', 'spam')
+ new_elem = doc.createElementNS(None, 'spam')
#Create an attribute on the new element
- new_elem.setAttributeNS('', 'eggs', 'sunnysideup')
+ new_elem.setAttributeNS(None, 'eggs', 'sunnysideup')
#Create a text node
new_text = doc.createTextNode('some text here...')
@@ -35,5 +35,5 @@
doc_elem.appendChild(new_elem)
#Print out the resulting document
- import xml.doc.ext
- xml.doc.ext.Print(doc)
+ from xml.dom import ext
+ ext.Print(doc)
--- python-xml-0.8.4.orig/demo/xmlproc/catalog.soc
+++ python-xml-0.8.4/demo/xmlproc/catalog.soc
@@ -13,7 +13,3 @@
PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"
"dtds/xbel-1.0.dtd"
--- If we can't find a system identifier for the public identifier here,
- then go to James Tauber's public catalog --
-
-DELEGATE "" "http://www.schema.net/public-text/catalog.soc"
\ No newline at end of file
--- python-xml-0.8.4.orig/debian/xbel.sgml-catalog
+++ python-xml-0.8.4/debian/xbel.sgml-catalog
@@ -0,0 +1,4 @@
+ -- SGML catalog for python-xml package --
+
+PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML" "dtd/xbel-1.0.dtd"
+PUBLIC "+//IDN python.org//DTD XML Bookmark Exchange Language 1.1//EN//XML" "dtd/xbel-1.1.dtd"
--- python-xml-0.8.4.orig/debian/README.Debian
+++ python-xml-0.8.4/debian/README.Debian
@@ -0,0 +1,33 @@
+python-xml for DEBIAN
+----------------------
+
+This is the debianized version of the new and probably incomplete XML
+package for Python. The modules in this package have been developed
+independently by the members of the PSA XML-SIG, and have now been
+collected into a single package tree.
+
+BEWARE!: The diversions xmllib.py and sgmllib.py are now gone, as of
+version 0.5.1-4, and should be removed on upgrade. However, an ugly
+bug in versions from 0.5.1-4 to 0.5.1-6 made xmllib.py and sgmllib.py
+being silently removed from the system at first install time and on
+further upgrades.
+Before filling any bug report about this problem, please first check
+whether these files are present on your system. If not, please
+reinstall in the following order python-base and python-xml to see
+if the two files are back again.
+
+As of version 0.5.1-2, the XBEL DTD and bookmark conversion code,
+formerly in /usr/doc/python-xml/examples/demo/xbel, has been more
+closely integrated into Debian's SGML architecture. The XBEL code
+itself is now in the "xml.xbel" package, the DTD is registered, and
+the utilities are linked to /usr/bin.
+
+Please note that this is beta software, under active development.
+While most of it works quite well, there may still be bugs, and
+some interfaces may change before the 1.0 release. If you intend
+to use this package for serious work, please consider joining the
+discussion on the XML-SIG mailing list.
+
+Jerome Marant , Sat, 28 Oct 2000 14:17:45 +0200
+
+
--- python-xml-0.8.4.orig/debian/python-xml.docs
+++ python-xml-0.8.4/debian/python-xml.docs
@@ -0,0 +1,6 @@
+CREDITS
+README
+README.dom
+README.pyexpat
+README.sgmlop
+TODO
--- python-xml-0.8.4.orig/debian/compat
+++ python-xml-0.8.4/debian/compat
@@ -0,0 +1 @@
+5
--- python-xml-0.8.4.orig/debian/copyright
+++ python-xml-0.8.4/debian/copyright
@@ -0,0 +1,236 @@
+This package was debianized by Rob Tillotson robt@debian.org on
+Sun, 14 Jun 1998 06:17:44 -0500. It was taken over by Jerome Marant
+jerome@debian.org on Fri, 20 Oct 2000 17:30:13 +0200. It was taken over
+by Alexandre Fayolle on Wed, 12 Jun 2002
+10:07:28 +0200
+
+The original source is the PSA XML-SIG, at http://www.python.org/sigs/xml-sig/.
+
+Copyright:
+
+This package is made up of several parts, which are under a variety of
+DFSG-free licenses. It is expected that by the 1.0 release everything
+will be relicensed under a python-style license, but for now the
+following terms apply:
+
+PyExpat, SAX libraries:
+--------------------------------------------------------------------
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+-----------------------------------------------------
+
+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+Individual or Organization ("Licensee") accessing and otherwise using
+this software in source or binary form and its associated
+documentation ("the Software").
+
+2. Subject to the terms and conditions of this BeOpen Python License
+Agreement, BeOpen hereby grants Licensee a non-exclusive,
+royalty-free, world-wide license to reproduce, analyze, test, perform
+and/or display publicly, prepare derivative works, distribute, and
+otherwise use the Software alone or in any derivative version,
+provided, however, that the BeOpen Python License is retained in the
+Software, alone or in any derivative version prepared by Licensee.
+
+3. BeOpen is making the Software available to Licensee on an "AS IS"
+basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+5. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+6. This License Agreement shall be governed by and interpreted in all
+respects by the law of the State of California, excluding conflict of
+law provisions. Nothing in this License Agreement shall be deemed to
+create any relationship of agency, partnership, or joint venture
+between BeOpen and Licensee. This License Agreement does not grant
+permission to use BeOpen trademarks or trade names in a trademark
+sense to endorse or promote products or services of Licensee, or any
+third party. As an exception, the "BeOpen Python" logos available at
+http://www.pythonlabs.com/logos.html may be used according to the
+permissions granted on that web page.
+
+7. By copying, installing or otherwise using the software, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+CNRI OPEN SOURCE LICENSE AGREEMENT
+----------------------------------
+
+Python 1.6 CNRI OPEN SOURCE LICENSE AGREEMENT
+
+IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY. BY CLICKING
+ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING, INSTALLING OR
+OTHERWISE USING PYTHON 1.6 SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
+THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT.
+
+1. This LICENSE AGREEMENT is between the Corporation for National
+Research Initiatives, having an office at 1895 Preston White Drive,
+Reston, VA 20191 ("CNRI"), and the Individual or Organization
+("Licensee") accessing and otherwise using Python 1.6 software in
+source or binary form and its associated documentation, as released at
+the www.python.org Internet site on September 5, 2000 ("Python 1.6").
+
+2. Subject to the terms and conditions of this License Agreement, CNRI
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 1.6
+alone or in any derivative version, provided, however, that CNRI's
+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
+1995-2000 Corporation for National Research Initiatives; All Rights
+Reserved" are retained in Python 1.6 alone or in any derivative
+version prepared by
+
+Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee
+may substitute the following text (omitting the quotes): "Python 1.6
+is made available subject to the terms and conditions in CNRI's
+License Agreement. This Agreement together with Python 1.6 may be
+located on the Internet using the following unique, persistent
+identifier (known as a handle): 1895.22/1012. This Agreement may also
+be obtained from a proxy server on the Internet using the following
+URL: http://hdl.handle.net/1895.22/1012".
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 1.6 or any part thereof, and wants to make the
+derivative work available to others as provided herein, then Licensee
+hereby agrees to include in any such work a brief summary of the
+changes made to Python 1.6.
+
+4. CNRI is making Python 1.6 available to Licensee on an "AS IS"
+basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+1.6 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
+RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6, OR
+ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. This License Agreement shall be governed by and interpreted in all
+respects by the law of the State of Virginia, excluding conflict of
+law provisions. Nothing in this License Agreement shall be deemed to
+create any relationship of agency, partnership, or joint venture
+between CNRI and Licensee. This License Agreement does not grant
+permission to use CNRI trademarks or trade name in a trademark sense
+to endorse or promote products or services of Licensee, or any third
+party.
+
+8. By clicking on the "ACCEPT" button where indicated, or by copying,
+installing or otherwise using Python 1.6, Licensee agrees to be bound
+by the terms and conditions of this License Agreement.
+
+ACCEPT
+
+
+CWI PERMISSIONS STATEMENT AND DISCLAIMER
+----------------------------------------
+
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+The Netherlands. All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Stichting Mathematisch
+Centrum or CWI not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+--------------------------------------------------------------------
+
+qp_xml:
+
+ Written by Greg Stein. Public Domain.
+ No Copyright, no Rights Reserved, and no Warranties.
+
+--------------------------------------------------------------------
+
+sgmlop:
+
+ Copyright (c) 1998 by Secret Labs AB.
+
+ Permission to use, copy, modify, and distribute this software and
+ its associated documentation for any purpose and without fee is
+ hereby granted. This software is provided as is.
+
+--------------------------------------------------------------------
+
+4DOM:
+
+ Copyright (c) 2000 Fourthought Inc, USA
+
+ All Rights Reserved
+
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of FourThought LLC not be
+ used in advertising or publicity pertaining to distribution of the
+ software without specific, written prior permission.
+
+ FOURTHOUGHT LLC DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+ IN NO EVENT SHALL FOURTHOUGHT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
+ USE OR PERFORMANCE OF THIS SOFTWARE.
+
+--------------------------------------------------------------------
+
+xmlproc:
+
+xmlproc is free and you can do as you like with it. If you change it,
+please let the author, Lars Marius Garshol, know about it.
+
+--------------------------------------------------------------------
+
+setupext/install_data.py:
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+--------------------------------------------------------------------
+
+The source package also contains the expat parser source, which is
+under the MPL; it is not used in the binary, since we have a separate
+library package for expat already. (libxmltok1)
+
--- python-xml-0.8.4.orig/debian/xbel.dirs
+++ python-xml-0.8.4/debian/xbel.dirs
@@ -0,0 +1,5 @@
+usr/share/sgml/misc/xbel
+usr/share/sgml/IDN_python.org/dtd
+usr/share/sgml/dtd
+usr/share/doc/xbel
+
--- python-xml-0.8.4.orig/debian/xbel-utils.manpages
+++ python-xml-0.8.4/debian/xbel-utils.manpages
@@ -0,0 +1,6 @@
+doc/man/adr_parse.1
+doc/man/lynx_parse.1
+doc/man/msie_parse.1
+doc/man/ns_parse.1
+doc/man/xbel2html.1
+doc/man/xbel_parse.1
--- python-xml-0.8.4.orig/debian/xbel.postinst
+++ python-xml-0.8.4/debian/xbel.postinst
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+## Install SGML catalog entries
+
+PACKAGE=xbel
+CENTRALCAT=/etc/sgml/$PACKAGE.cat
+ORDCATS="misc/xbel/xbel.cat"
+
+if [ "$1" = configure ]
+then
+ for ordcat in $ORDCATS
+ do
+ update-catalog --quiet --add $CENTRALCAT /usr/share/sgml/$ordcat
+ done
+ update-catalog --quiet --add --super $CENTRALCAT
+fi
+
+#DEBHELPER#
+
+exit 0
+
--- python-xml-0.8.4.orig/debian/xbel-utils.README.debian
+++ python-xml-0.8.4/debian/xbel-utils.README.debian
@@ -0,0 +1,51 @@
+xbel-utils for DEBIAN
+---------------------
+
+This is an XML DTD for the interchange of web browser bookmarks. It
+is intended to fully represent the bookmarks of all of the major web
+browsers, so that bookmarks can be easily converted between them.
+(XBEL is also supported natively by Grail, the Python web browser from
+CNRI.) XBEL is a project of the Python Software Activity XML-SIG, and
+current information about it can be found at:
+
+ http://www.python.org/topics/xml/xbel/
+
+This package contains conversion utilities for translating between XBEL
+and bookmarks for Lynx, Netscape, Opera, Internet Explorer, and plain
+HTML. The DTD and documentation are in the 'xbel' package.
+
+Converting from browser formats to XBEL:
+
+ lynx_parse [] -- Lynx
+ msie_parse -- MSIE
+ ns_parse [] -- Netscape
+ adr_parse [] -- Opera
+
+ If no XBEL output file is specified, the resulting XBEL instance is
+ dumped to standard output.
+
+ Note that the Lynx conversion utilities take a *directory* as argument,
+ and consider each Lynx bookmark file to be a separate XBEL folder.
+
+Converting XBEL to other formats:
+
+ xbel2html
+ converts an XBEL instance to HTML (on standard output)
+
+ xbel_parse
+ converts an XBEL instance to browser bookmarks. Except when
+ converting to Lynx, the resulting bookmarks are dumped to standard
+ output.
+
+ You MUST specify one of the following browser formats:
+
+ --lynx
+ --msie
+ --netscape
+ --opera
+ --xbel
+
+Please note that these utilities are simple and experimental, and are
+likely unable to handle invalid input. (If you want to write more
+robust XBEL applications, I'm sure the XML-SIG would welcome your
+efforts!)
--- python-xml-0.8.4.orig/debian/xbel.README.debian
+++ python-xml-0.8.4/debian/xbel.README.debian
@@ -0,0 +1,14 @@
+xbel for DEBIAN
+---------------
+
+This is an XML DTD for the interchange of web browser bookmarks. It
+is intended to fully represent the bookmarks of all of the major web
+browsers, so that bookmarks can be easily converted between them.
+(XBEL is also supported natively by Grail, the Python web browser from
+CNRI.) XBEL is a project of the Python Software Activity XML-SIG, and
+current information about it can be found at:
+
+ http://www.python.org/topics/xml/xbel/
+
+This package contains just the DTD and documentation. Conversion
+utilities can be found in the 'xbel-utils' package.
--- python-xml-0.8.4.orig/debian/python-xml.postinst
+++ python-xml-0.8.4/debian/python-xml.postinst
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+set -e
+
+#DEBHELPER#
+
+# left over by an early python-central version?
+rm -rf /usr/lib/python2.[345]/site-packages/_xmlplus
--- python-xml-0.8.4.orig/debian/xbel-utils.dirs
+++ python-xml-0.8.4/debian/xbel-utils.dirs
@@ -0,0 +1,3 @@
+usr/bin
+usr/lib/python2.3/site-packages/_xmlplus/xbel
+usr/share/doc/xbel-utils
--- python-xml-0.8.4.orig/debian/python-xml-doc.dirs
+++ python-xml-0.8.4/debian/python-xml-doc.dirs
@@ -0,0 +1,3 @@
+usr/share/doc/python-xml-doc
+usr/share/doc/python-xml/examples/demo
+usr/share/doc/python-xml/examples/test
--- python-xml-0.8.4.orig/debian/rules
+++ python-xml-0.8.4/debian/rules
@@ -0,0 +1,251 @@
+#!/usr/bin/make -f
+# -*-Makefile-*-
+# Made with the aid of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Some lines taken from debmake, by Cristoph Lameter.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEFAULT_PYTHON := $(shell pyversions -d)
+VERSIONS := $(shell pyversions -vs)
+
+dest_xbel := debian/xbel
+dest_xbel_utils := debian/xbel-utils
+
+doc_xbel := $(dest_xbel)/usr/share/doc/xbel
+doc_xbel_utils := $(dest_xbel_utils)/usr/share/doc/xbel-utils
+debian_patches=
+
+build: stamp-build
+stamp-build: $(VERSIONS:%=stamp-build-%)
+ touch $@
+stamp-build-%: patched-stamp
+ dh_testdir
+ 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 stamp-*
+ rm -rf build dist
+ rm -f doc/man/xmlproc_*.python2.?-xml.1
+ find . -name "*.py[co]" -exec rm -f {} \;
+ rm -f debian/man/index.bt
+ dh_clean
+
+# Build architecture-independent files here.
+binary-indep:
+ dh_testdir -i
+ dh_testroot -i
+ dh_clean -k -i
+ dh_installdirs -i
+
+# xbel
+ install -m 0644 demo/xbel/doc/* $(doc_xbel)
+ install -m 0644 demo/xbel/README $(doc_xbel)
+ install -m 0644 demo/xbel/*.dtd $(dest_xbel)/usr/share/sgml/dtd
+ ln -s ../../dtd/xbel-1.0.dtd \
+ $(dest_xbel)/usr/share/sgml/IDN_python.org/dtd/XML_Bookmark_Exchange_Language_1.0
+ ln -s ../../dtd/xbel-1.1.dtd \
+ $(dest_xbel)/usr/share/sgml/IDN_python.org/dtd/XML_Bookmark_Exchange_Language_1.1
+ install -m 0644 debian/xbel.sgml-catalog $(dest_xbel)/usr/share/sgml/misc/xbel/xbel.cat
+
+# xbel_utils
+ install -m 0644 demo/xbel/README $(doc_xbel_utils)
+ mkdir -p $(dest_xbel_utils)/usr/lib/$(DEFAULT_PYTHON)/site-packages/oldxml/_xmlplus/xbel
+ install -m 0644 demo/xbel/*.py \
+ $(dest_xbel_utils)/usr/lib/$(DEFAULT_PYTHON)/site-packages/oldxml/_xmlplus/xbel
+ touch $(dest_xbel_utils)/usr/lib/$(DEFAULT_PYTHON)/site-packages/oldxml/_xmlplus/xbel/__init__.py
+
+ set -e; \
+ cd $(dest_xbel_utils) && \
+ for i in `find -type f`; do \
+ if head -1 $$i | grep "^#! */usr/bin" | grep "python" >/dev/null ; then \
+ sed "s%#! */usr/bin/env \+python.*$\%#! /usr/bin/python%" <$$i >$$i.temp; \
+ mv $$i.temp $$i; \
+ chmod +x $$i; \
+ fi; \
+ done
+
+ for i in adr_parse lynx_parse msie_parse ns_parse xbel2html xbel_parse ; do \
+ ( \
+ echo "#! /bin/sh"; \
+ echo "ver=\$$(/usr/bin/python -c 'import sys; print sys.version[:3]')"; \
+ echo "exec /usr/bin/python /usr/lib/python\$$ver/site-packages/oldxml/_xmlplus/xbel/$$i.py \"\$$@\""; \
+ ) > $(dest_xbel_utils)/usr/bin/$$i; \
+ done
+
+# python-xml-doc
+ mkdir -p debian/python-xml-doc/usr/share/doc/python-xml
+ mkdir -p debian/python-xml-doc/usr/share/doc/python-xml-doc
+ cp -R doc/* debian/python-xml-doc/usr/share/doc/python-xml/
+ rm -rf debian/python-xml-doc/usr/share/doc/python-xml/man
+ rm -rf debian/python-xml-doc/usr/share/doc/python-xml/*.tex
+ cp -r demo/* debian/python-xml-doc/usr/share/doc/python-xml/examples/demo/
+ cp -r test/* debian/python-xml-doc/usr/share/doc/python-xml/examples/test/
+ rm -rf debian/python-xml-doc/usr/share/doc/python-xml/examples/demo/xbel
+
+ for i in debian/python-xml-doc/usr/share/doc/python-xml/*; do \
+ b=$$(basename $$i); \
+ ln -sf ../python-xml/$$b debian/python-xml-doc/usr/share/doc/python-xml-doc/$$b; \
+ done
+
+ : # Replace all '#!' calls to python with /usr/bin/python
+ : # and make them executable
+ for i in `find debian/python-xml-doc -type f`; do \
+ sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
+ $$i > $$i.temp; \
+ if cmp --quiet $$i $$i.temp; then \
+ rm -f $$i.temp; \
+ else \
+ mv -f $$i.temp $$i; \
+ chmod 755 $$i; \
+ echo "fixed interpreter: $$i"; \
+ fi; \
+ done
+
+ dh_pycentral -i
+
+ dh_installdocs -i
+ dh_installman -pxbel-utils
+ dh_installchangelogs -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build
+ dh_testdir -a
+ dh_testroot -a
+ dh_clean -k -a
+ dh_installdirs -a
+ for version in $(VERSIONS) ; do \
+ PYTHON=python$${version} ; \
+ PACKAGE=python-xml ;\
+ DESTDIR=debian/$${PACKAGE} ;\
+ SITE_PACK=$${DESTDIR}/usr/lib/$${PYTHON}/site-packages/oldxml/_xmlplus ;\
+ $${PYTHON} setup.py install \
+ --without-xslt --no-compile --prefix=$${DESTDIR}/usr ;\
+ mkdir -p $${DESTDIR}/usr/lib/$${PYTHON}/site-packages/oldxml ;\
+ mv $${DESTDIR}/usr/lib/$${PYTHON}/site-packages/_xmlplus \
+ $${DESTDIR}/usr/lib/$${PYTHON}/site-packages/*.egg-info \
+ $${DESTDIR}/usr/lib/$${PYTHON}/site-packages/oldxml/ ;\
+ chmod 755 $${SITE_PACK}/dom/html/GenerateHtml.py ;\
+ rm $${DOC}/examples/demo/sgmlop/test2.htm ;\
+ 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 -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} ;\
+ done
+ : # Replace all '#!' calls to python with /usr/bin/python
+ : # and make them executable
+ for i in `find debian -mindepth 3 -type f`; do \
+ sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
+ $$i > $$i.temp; \
+ if cmp --quiet $$i $$i.temp; then \
+ rm -f $$i.temp; \
+ else \
+ mv -f $$i.temp $$i; \
+ chmod 755 $$i; \
+ echo "fixed interpreter: $$i"; \
+ 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/oldxml/_xmlplus ;\
+ DOC=$${DESTDIR}/usr/share/doc/$${PACKAGE} ;\
+ $${PYTHON}-dbg setup.py \
+ install --without-xslt --no-compile --prefix=$${DESTDIR}/usr ;\
+ mkdir -p $${DESTDIR}/usr/lib/$${PYTHON}/site-packages/oldxml ;\
+ mv $${DESTDIR}/usr/lib/$${PYTHON}/site-packages/_xmlplus \
+ $${DESTDIR}/usr/lib/$${PYTHON}/site-packages/oldxml/ ;\
+ 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_installdocs -a
+ dh_installmenu -a
+ dh_installman -a
+ dh_installchangelogs -a ANNOUNCE
+ 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
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+source diff:
+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
+
+# ---------------------------------------------------------------------------
+# Various rules to unpack addons and (un)apply patches.
+# Borrowed from DBS
+
+patch_dir = debian/patches
+
+apply-patches: patched-stamp
+reverse-patches:
+ @for stamp in none patched-*; do \
+ case "$$stamp" in none|patched-stamp|patched-\*) continue; esac; \
+ patch=`echo $$stamp | sed -e 's/patched-//'`; \
+ echo "trying to revert patch $$patch ..."; \
+ if [ -x $(patch_dir)/$$patch.dpatch ]; then true; else \
+ chmod +x $(patch_dir)/$$patch.dpatch; fi; \
+ if $(patch_dir)/$$patch.dpatch -unpatch; then \
+ echo "reverted $$patch patch."; \
+ rm -f $$stamp; \
+ else \
+ echo "error in reverting $$patch patch."; \
+ exit 1; \
+ fi; \
+ done
+ @echo "Removing patched-stamp"
+ @rm -f patched-stamp
+
+patched-%: $(patch_dir)/%.dpatch
+ @if [ -x $< ]; then true; else chmod +x $<; fi
+ @if [ -f $@ ]; then \
+ echo "$* patches already applied. $< $@"; exit 1; \
+ fi
+ $< -patch
+ @echo "$* patches applied." > $@
+
+patched-stamp: $(foreach p,$(debian_patches),patched-$(p))
+ @echo -e "\nPatches applied:" >> pxxx
+ @for i in none $(debian_patches); do \
+ if [ -r debian/patches/$$i.dpatch ]; then \
+ printf "\n$$i:\n" >> pxxx; \
+ sed -n 's/^# *DP: */ /p' debian/patches/$$i.dpatch >> pxxx; \
+ fi \
+ done
+ @echo "Writing patched-stamp"
+ @mv -f pxxx patched-stamp
--- python-xml-0.8.4.orig/debian/control
+++ python-xml-0.8.4/debian/control
@@ -0,0 +1,88 @@
+Source: python-xml
+Section: python
+Priority: optional
+Maintainer: Ubuntu MOTU Developers
+XSBC-Original-Maintainer: Debian/Ubuntu Zope Team
+Uploaders: Alexandre Fayolle , Fabio Tranchitella , Matthias Klose , Jérémy Bobbio
+Build-Depends: python-all-dev, python-all-dbg, debhelper (>= 5.0.37.1), python-central (>= 0.4.15)
+Standards-Version: 3.8.0
+XS-Python-Version: all
+XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/python-xml/trunk
+
+Package: python-xml
+Architecture: any
+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-doc, python-xml-dbg
+XB-Python-Version: ${python:Versions}
+Description: XML tools for Python
+ 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.
+ .
+ The package currently contains:
+ .
+ * XML parsers: Pyexpat (Jack Jansen), xmlproc (Lars Marius
+ Garshol), sgmlop (Fredrik Lundh).
+ * SAX interface (Lars Marius Garshol)
+ * minidom DOM implementation (Paul Prescod, others)
+ * 4DOM and 4XPath from Fourthought (Uche Ogbuji, Mike Olson)
+ * Schema implementations: TREX (James Tauber)
+ * Various utility modules and functions (various people)
+
+Package: python-xml-doc
+Architecture: all
+Section: doc
+Replaces: python-xml (<< 0.8.4-10)
+Description: XML tools for Python (documentation and examples)
+ 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.
+ .
+ The package currently contains documentation and example programs.
+
+Package: python-xml-dbg
+Priority: extra
+Architecture: any
+Depends: python-xml (= ${binary: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
+Section: web
+Depends: sgml-base
+Recommends: xml-core
+Description: XML Bookmark Exchange Language
+ The XML Bookmark Exchange Language (XBEL) is a rich interchange
+ format for "bookmark" data as used by most web browsers.
+ .
+ This package contains XBEL DTDs for 1.0 and 1.1 formats as well
+ as documentation.
+
+Package: xbel-utils
+Architecture: all
+Section: web
+Depends: ${python:Depends}, python-xml (>= ${binary:Version}), xbel
+Replaces: xbel-utils-0.6
+Conflicts: xbel-utils-0.6
+XB-Python-Version: ${python:Versions}
+Description: XML Bookmark Exchange Language Utilities
+ The XML Bookmark Exchange Language (XBEL) is a rich interchange
+ format for "bookmark" data as used by most web browsers.
+ .
+ This package contains several utilities for converting between
+ XBEL and other common bookmark formats.
+
--- python-xml-0.8.4.orig/debian/watch
+++ python-xml-0.8.4/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/pyxml/ PyXML-(.+)\.tar\.gz
--- python-xml-0.8.4.orig/debian/changelog
+++ python-xml-0.8.4/debian/changelog
@@ -0,0 +1,533 @@
+python-xml (0.8.4-10.1ubuntu1) intrepid; urgency=low
+
+ * Merge from debian unstable, remaining changes: (LP: #????)
+ - Explicitely remove /usr/lib/python2.[345]/site-packages/_xmlplus,
+ likely be left by an earlier python-central version. LP: #212917.
+ - Install the files outside of sys.path, so that the package
+ does not overlay the xml code as found in the core python packages.
+ This package should be removed once all rdepends are gone. For
+ now, packages have to add this path before the first xml import:
+ sys.path.append('/usr/lib/python%s/site-packages/oldxml' %
+ sys.version[:3])
+
+ -- Stefan Lesicnik Wed, 06 Aug 2008 19:56:25 +0200
+
+python-xml (0.8.4-10.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix bashism in debian/rules (Closes: #478621)
+ * Bump Standards-Version to 3.8.0.
+
+ -- Chris Lamb Sat, 07 Jun 2008 22:19:49 +0100
+
+python-xml (0.8.4-10ubuntu2) hardy; urgency=low
+
+ * Explicitely remove /usr/lib/python2.[345]/site-packages/_xmlplus,
+ likely be left by an earlier python-central version. LP: #212917.
+
+ -- Matthias Klose Wed, 09 Apr 2008 13:40:31 +0200
+
+python-xml (0.8.4-10ubuntu1) hardy; urgency=low
+
+ * Install the files outside of sys.path, so that the package
+ does not overlay the xml code as found in the core python packages.
+ This package should be removed once all rdepends are gone. For
+ now, packages have to add this path before the first xml import:
+ sys.path.append('/usr/lib/python%s/site-packages/oldxml' % sys.version[:3])
+
+ -- Matthias Klose Tue, 01 Apr 2008 13:36:08 +0000
+
+python-xml (0.8.4-10build2) hardy; urgency=low
+
+ * Rebuild with recent python-central.
+
+ -- Matthias Klose Mon, 10 Mar 2008 12:47:35 +0000
+
+python-xml (0.8.4-10build1) hardy; urgency=low
+
+ * Fake sync (different .orig.tar.gz).
+
+ -- Matthias Klose Mon, 10 Dec 2007 19:56:38 +0000
+
+python-xml (0.8.4-10) unstable; urgency=low
+
+ * Split documentation and examples out to a new python-xml-doc package.
+
+ -- Matthias Klose Tue, 04 Dec 2007 03:56:48 +0100
+
+python-xml (0.8.4-9) unstable; urgency=low
+
+ * debian/watch: fixed. (Closes: #449635)
+
+ -- Fabio Tranchitella Thu, 08 Nov 2007 14:17:09 +0100
+
+python-xml (0.8.4-8) unstable; urgency=low
+
+ * xmlproc should not fail on elliptical doctype declaration. Thanks for
+ Dominique Hazael-Massieux for the patch. (Closes: #428839)
+ * Do not ship LaTeX source for xml-howto and xml-ref anymore.
+ (Closes: #390471)
+ * Fix an encoding issue when converting from xbel to netscape by removing
+ a mixed conversion of ascii and unicode strings in Folder.dump_netscape.
+ (Closes: #409779)
+ * Redirect xbel_parse output to stderr. (Closes: #233619)
+ * Add myself to Uploaders.
+ * Fix substvar-source-version-is-deprecated lintian warning by using
+ ${binary:Version} instead of ${Source-Version}.
+
+ -- Jérémy Bobbio Wed, 18 Jul 2007 14:30:10 +0200
+
+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 Fri, 4 May 2007 07:12:00 +0200
+
+python-xml (0.8.4-6) unstable; urgency=medium
+
+ * Fixes for documentation and examples:
+ + Applied patch to demo/dom/generate_xml1.py. (Closes: #399410)
+ + Applied patch to demo/xmlproc/catalog.soc. (Closes: #298008)
+ * debian/control:
+ + move debhelper to build-depends. (Closes: #392630)
+ + xbel: recommends xml-core to provide a catalog mapping onto
+ the XBEL DTDs. (Closes: #386720)
+
+ -- Fabio Tranchitella Mon, 18 Dec 2006 20:12:06 +0100
+
+python-xml (0.8.4-5) unstable; urgency=low
+
+ * Convert to Python policy 0.4, using python-central. Closes: #373368.
+
+ -- Matthias Klose Wed, 14 Jun 2006 02:10:44 +0000
+
+python-xml (0.8.4-4) unstable; urgency=low
+
+ * In some conditions and when parsing a utf-8 file, the xmlproc parser
+ eports non-well-formedness errors when it shouldn't; applied a
+ single-line patch to fix this wrong behaviour. (Closes: #367638)
+
+ -- Fabio Tranchitella Tue, 30 May 2006 22:19:10 +0200
+
+python-xml (0.8.4-3) unstable; urgency=low
+
+ * New maintainer (Debian/Ubuntu Zope Team). (Closes: #354012)
+ * Updated debian/watch, thanks Bart Martens! (Closes: #354367)
+ * debian/rules: fixed some sed regular expressions.
+
+ -- Fabio Tranchitella Fri, 7 Apr 2006 08:36:01 +0000
+
+python-xml (0.8.4-2) unstable; urgency=low
+
+ * Dropped support for python2.2 and python2.1 (Closes: #351157, #159280)
+ * Fixed link to xmlproc license in xmlproc documentation (Closes: #296530)
+
+ -- Alexandre Fayolle Mon, 6 Feb 2006 15:17:48 +0100
+
+python-xml (0.8.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Added debian/watch file
+ * Added support for python2.4
+ * Updated maintainer's email
+
+ -- Alexandre Fayolle Tue, 7 Dec 2004 16:38:22 +0100
+
+python-xml (0.8.3-5) unstable; urgency=low
+
+ * Fixed wrong python dependency on xbel-utils. Closes: #210852
+ * removed man pages from diff.gz since they are now in doc/man
+
+ -- Alexandre Fayolle Tue, 23 Sep 2003 16:50:28 +0200
+
+python-xml (0.8.3-4) unstable; urgency=low
+
+ * Chmod +x py files in /usr/lib/python2.3/site-packages/_xmlplus/xbel/. Closes: #208388
+
+ -- Alexandre Fayolle Wed, 3 Sep 2003 14:57:20 +0200
+
+python-xml (0.8.3-3) unstable; urgency=low
+
+ * Fixed bug in debian/rules causing files in xbel-utils to be empty. Closes: #208388
+
+ -- Alexandre Fayolle Tue, 2 Sep 2003 09:45:57 +0200
+
+python-xml (0.8.3-2) unstable; urgency=low
+
+ * changed section of xbel and xbel-utils to 'web' (was interpreters)
+ * Fixed shebangs in xbel-utils and python version in maintainer scripts. Closes: #207835
+ * Standards-Version updated to 3.6.1
+
+ -- Alexandre Fayolle Mon, 1 Sep 2003 12:02:39 +0200
+
+python-xml (0.8.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixes broken documentation urls. Closes: #183057
+ * Fixes bad 4Suite.mo file. Closes: #202926
+ * changed section to "python"
+ * updated standards version
+ * Changed default python version to 2.3
+
+ -- Alexandre Fayolle Mon, 11 Aug 2003 08:29:14 +0200
+
+python-xml (0.8.2-3) unstable; urgency=low
+
+ * fixed wrong argument order in xml.sax.expatreader. Closes: Bug#183069
+ * fixed escaping ampershand characters in xml.xbel.bookmark. Closes: Bug#180468
+
+ -- Alexandre Fayolle Tue, 11 Mar 2003 18:00:32 +0100
+
+python-xml (0.8.2-2) unstable; urgency=low
+
+ * Removed dependency on python2.3-xmlbase which no longer exists. Closes: Bug#180965
+
+ -- Alexandre Fayolle Fri, 14 Feb 2003 11:08:39 +0100
+
+python-xml (0.8.2-1) unstable; urgency=low
+
+ * New upstream release
+ * xbel-utils now replaces xbel-utils-0.6
+
+ -- Alexandre Fayolle Mon, 10 Feb 2003 11:25:05 +0100
+
+python-xml (0.8.1-2) unstable; urgency=low
+
+ * fixed python version in xbel-utils postinst script. Closes: Bug#163724
+ * added man page for xmlrpc_parse and xmlproc_val, and fixed dangling symlinks problem. Closes: Bug#128682, Bug#165413
+ * used proper capitalisation of Unicode in debian/control. Closes: Bug#172063
+
+ -- Alexandre Fayolle Tue, 10 Dec 2002 08:59:20 +0100
+
+python-xml (0.8.1-1) unstable; urgency=low
+
+ * New upstream release
+ - fix syntax error in xmlproc_parse and xmlproc_val scripts.
+ Closes: Bug#158987, Bug#158989
+ - fix problem when using pyexpat and the python profiler on python>=2.2.
+ The bug is still there on python2.1 (reported as Bug#159280)
+ * Added patch fixing a problem with TreeWalker. Closes: Bug#161276
+ * Cleaned debian/rules by using 'setup.py install --no-compile'
+ * Updated the python-xml version number xbel-utils depends on to 0.8
+ so that a more recent version of expat is be used.
+ * Added python2.3-xml package
+
+ -- Alexandre Fayolle Thu, 19 Sep 2002 09:56:29 +0200
+
+python-xml (0.8-2.1) unstable; urgency=low
+
+ * Use python2.2 as default python version.
+
+ -- Matthias Klose Sat, 24 Aug 2002 15:17:48 +0200
+
+python-xml (0.8-2) unstable; urgency=low
+
+ * Fix syntax error in msie_parse.py. Closes: Bug#156525, Bug#156796, Bug#157173
+
+ -- Alexandre Fayolle Wed, 21 Aug 2002 11:29:18 +0200
+
+python-xml (0.8-1) unstable; urgency=low
+
+ * New upstream release. Closes: Bug#150565, Bug#152630
+
+ -- Alexandre Fayolle Mon, 12 Aug 2002 14:20:24 +0200
+
+python-xml (0.7.1-2) unstable; urgency=low
+
+ * Applied the following patches:
+ - fix for optional fields in Opera 6 bookmarks. Closes: Bug#148135
+ - fix for ns_parse, xbel2html and xbel-parse breaking entity parsing
+ in titles
+ - removed patches forcing the use of xmlproc in xbel_parse and
+ xbel2html
+ * removed libxmltok1 from Build Dependencies
+
+ -- Alexandre Fayolle Fri, 12 Jul 2002 11:42:58 +0200
+
+python-xml (0.7.1-1) unstable; urgency=low
+
+ * New maintainer.
+ * New upstream release.
+ * Added missing copyrights for schema/trex.py, test/domapi/,
+ and xml/dom/ext/c14n.py.
+ * removed broken 4XSLT (4XPath is in the package)
+
+ -- Alexandre Fayolle Wed, 12 Jun 2002 10:07:28 +0200
+
+python-xml (0.7-3) unstable; urgency=high
+
+ * debian/control: added conflict with python-4suite for versions
+ lower than 0.12. Closes: Bug#145499.
+
+ -- Jerome Marant Thu, 2 May 2002 23:27:11 +0200
+
+python-xml (0.7-2) unstable; urgency=high
+
+ * Applied the following patches:
+ - fix for broken links in xmlproc docs. Closes: Bug#133548.
+ - fix for unescaped namespace attributes in Printer.py. Closes: Bug#140148.
+ - support for annotations in ns_parse and xbel2html.
+ Thanks to Alexandre Fayolle. Closes: Bug#141553.
+ * Provide again 4XPath and 4XSLT since the current 4Suite version
+ cannot be installed along with this version of python-xml any more.
+
+ -- Jerome Marant Wed, 1 May 2002 09:03:44 +0200
+
+python-xml (0.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * We do not provide 4XPath and 4XSLT since they are still part of
+ the current version of python-4suite. They will make their way into
+ the package as soon as the new upstream release of python-4suite
+ comes out.
+ * debian/rules: added installation of xbel 1.1 DTD.
+ * debian/xbel.sgml-catalog: added catalog entry for xbel 1.1.
+ * debian/xbel.{postinst, prerm}: make use of `update-catalog' instead of
+ `install-sgmlcatalog` which is the old catalog management tool.
+ Closes: Bug#124209.
+ * Removed debian/xbel.postrm since the catalog is now removed at
+ prerm time.
+ * debian/control:
+ - modified xbel long description reflecting the existence of multiple
+ DTDs for xbel.
+ - made python-xml depend on python2.1-xml of version Source-Version.
+ * debian/python{2.1, 2.2}-xml.README.debian: added a small paragraph
+ explaining the reasons why we do not ship 4XPath and 4XSLT.
+
+ -- Jerome Marant Fri, 28 Dec 2001 22:21:29 +0100
+
+python-xml (0.6.6-7) unstable; urgency=low
+
+ * Added generation of python2.2-xml, a Python 2.2.x specific version
+ of the package. Closes: Bug#122835.
+
+ -- Jerome Marant Fri, 7 Dec 2001 22:01:01 +0100
+
+python-xml (0.6.6-6) unstable; urgency=low
+
+ * debian/rules: replace python version independent shebang lines
+ of all xbel-utils scripts with python2.1 specific ones.
+ Closes: Bug#122395.
+ * Added extra files that are necessary to make possible the compilation
+ of latex documentation files. Closes: Bug#119771.
+
+ -- Jerome Marant Tue, 4 Dec 2001 21:30:32 +0100
+
+python-xml (0.6.6-5) unstable; urgency=low
+
+ * debian/xbel-utils.postinst: replaced calls to `python' with calls
+ to python2.1 for bytecode compilation. Closes: Bug#119004, Bug#119069.
+ * [xbel-utils]: bookmark parsing now works fine with Python 2.1.x
+ and greater versions (tested with J.H.M. Dassen bookmarks).
+ Closes: Bug#47238.
+
+ -- Jerome Marant Sun, 11 Nov 2001 20:16:41 +0100
+
+python-xml (0.6.6-4) unstable; urgency=low
+
+ * Build python-xml as an architecture independent package.
+
+ -- Jerome Marant Wed, 7 Nov 2001 21:58:19 +0100
+
+python-xml (0.6.6-3) unstable; urgency=low
+
+ * Modified the package with respect to the Python Policy.
+ Closes: Bug#118442.
+ * debian/control:
+ + added python2.1-xml, a Python 2.1.x specific version of the
+ package.
+ + python-xml is now a dummy package that depends on python2.1-xml.
+ + added python2.1-dev in build dependencies.
+ * debian/rules:
+ + install xbel XML files into /usr/share/sgml rather than /usr/lib/sgml.
+ Closes: Bug#115910.
+ + removed support for Python 1.5.x and 2.0.
+ * xbel.dirs: replaced /usr/lib/sgml prefixes with /usr/share/sgml.
+ * [xbel-utils] applied patches from Matthew Swift:
+ + fixed nesting. Closes: Bug#111440.
+ + fixed DOS newlines support: Closes: Bug#111428.
+
+ -- Jerome Marant Tue, 6 Nov 2001 20:20:03 +0100
+
+python-xml (0.6.6-2) unstable; urgency=low
+
+ * [python-xml] debian/rules: shipped c14n.py back. Beware, this
+ file is mandatory but might not work with Python 1.5.x.
+ Closes: Bug#109074.
+ * [xbel-utils] added manpages. Thanks to Jan Schaumann.
+
+ -- Jerome Marant Mon, 20 Aug 2001 10:54:16 +0200
+
+python-xml (0.6.6-1) unstable; urgency=low
+
+ * New upstream version.
+ * Switched Standards-Version to 3.5.6.
+ * debian/rules: added a patch section, borrowed from BDS.
+ * Added a 'debian/patches' subdirectory.
+ * Converted to Debhelper v3.
+ * [xbel-utils] patch #003: changed the default parser to xmlproc in
+ order to handle 8 bits characters. Closes: Bug#103748.
+
+ -- Jerome Marant Mon, 6 Aug 2001 10:56:36 +0200
+
+python-xml (0.6.5-2) unstable; urgency=low
+
+ * Added alternatives in order to share common scripts and
+ manpages between python-xml and python2-xml. Closes: Bug#90683.
+
+ -- Jerome Marant Thu, 22 Mar 2001 12:50:30 +0100
+
+python-xml (0.6.5-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Jerome Marant Tue, 20 Mar 2001 12:35:35 +0100
+
+python-xml (0.6.4-2) unstable; urgency=low
+
+ * Changed maintainer email address.
+ * [python2-xml] Replaced the conflict by a dependency
+ on python2-xmlbase : this is necessary in order to avoid breaking
+ applications on `import xml'. Closes: Bug#89823.
+ * python2-xml.README.debian : removed the line mentioning the
+ need to import `_xmlplus' rather than `xml'.
+
+ -- Jerome Marant Sat, 17 Mar 2001 11:43:57 +0100
+
+python-xml (0.6.4-1) unstable; urgency=low
+
+ * New upstream version.
+ * New python2-xml package.
+ * Added python2-dev to build dependencies.
+
+ -- Jerome Marant Tue, 27 Feb 2001 09:35:41 +0100
+
+python-xml (0.6.3-1) unstable; urgency=low
+
+ * New upstream version. Closes: Bug#82882
+ * quotes demo is now using a parser that can handle UTF-8. Closes: Bug#67484
+ * [xbel] Changed the DTD name in xbel.sgml-catalog
+ * [xbel-utils] Changed dependency on python-xml because it does not work
+ with 0.5.x versions any more.
+ * [xbel-utils] Added link to /usr/bin for msie_parse.py: parsing MSIE
+ bookmarks does work. Modifyed README.debian for xbel-utils reflecting
+ this change. Closes: Bug#82538
+ * [xbel-utils] Changed the default parser in xbel2html so that 8 bits
+ characters can be handled.
+ * Updated copyright file.
+
+ -- Jerome Marant Wed, 17 Jan 2001 12:00:19 +0100
+
+python-xml (0.6.2-2) unstable; urgency=low
+
+ * Fix a lintian warning.
+
+ -- Jerome Marant Thu, 23 Nov 2000 09:12:57 +0100
+
+python-xml (0.6.2-1) unstable; urgency=low
+
+ * New upstream version.
+ * Improved postinst for diversion removal. Closes: Bug#77237.
+ * Added a warning section in README.Debian about the former
+ diversion bug.
+
+ -- Jerome Marant Sun, 19 Nov 2000 15:39:11 +0100
+
+python-xml (0.6.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * New maintainer.
+ * Adopted. Closes: Bug#68636.
+ * Fix by Joel Rosdahl for postinst diversion bug. Closes: Bug#74950.
+
+ -- Jerome Marant Fri, 20 Oct 2000 17:30:13 +0200
+
+python-xml (0.5.1-6) unstable frozen; urgency=medium
+
+ * Changed paths of documentation files in debian/doc-base
+ /usr/doc -> /usr/share/doc (closes: #69556).
+ * Added Build-Depends (closes: 72443).
+
+ -- Peter Palfrader Tue, 26 Sep 2000 21:09:05 +0200
+
+python-xml (0.5.1-5) unstable frozen; urgency=medium
+
+ * Re-upload to frozen. Note to release manager: see bug #59885 for
+ discussion of this. The only change to the package is to remove the
+ overrides discussed in the bug report.
+
+ -- Rob Tillotson Mon, 3 Apr 2000 17:48:08 -0500
+
+python-xml (0.5.1-4) frozen unstable; urgency=low
+
+ * [python-xml] Removed diversion of xmllib/sgmllib. (closes: #59885)
+
+ -- Rob Tillotson Tue, 7 Mar 2000 23:21:47 -0600
+
+python-xml (0.5.1-3) unstable; urgency=low
+
+ * [xbel] Test for existence of install-sgmlcatalog in postinst
+ and postrm. (closes: #47376)
+ * [python-xml] Remove extraneous directories. (closes: #39509)
+ * Add #DEBHELPER# sections to all relevant scripts.
+ * Standards-Version 3.0.0.
+ * Move documentation to /usr/share/doc.
+
+ -- Rob Tillotson Mon, 25 Oct 1999 16:31:19 -0500
+
+python-xml (0.5.1-2) unstable; urgency=low
+
+ * Moved XBEL DTD and scripts out of the python-xml binary package,
+ into their own packages. (closes #36853)
+
+ -- Rob Tillotson Thu, 29 Apr 1999 17:09:23 -0500
+
+python-xml (0.5.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * dom/writer.py: added 'link' to the list of empty HTML elements (closes
+ #32474)
+
+ -- Rob Tillotson Sun, 18 Apr 1999 02:13:01 -0500
+
+python-xml (0.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Registered HTML documentation with doc-base.
+
+ -- Rob Tillotson Sun, 20 Dec 1998 16:49:33 -0600
+
+python-xml (0.4.19981014-1) unstable; urgency=low
+
+ * New upstream CVS snapshot.
+
+ -- Rob Tillotson Wed, 14 Oct 1998 14:31:38 -0400
+
+python-xml (0.4-0.1) unstable; urgency=low
+
+ * Now uses the xmltok1 package rather than its own copy of libexpat.
+
+ -- Rob Tillotson Tue, 29 Sep 1998 15:51:56 -0400
+
+python-xml (0.4-0) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Rob Tillotson Thu, 6 Aug 1998 15:32:35 -0500
+
+python-xml (0.3-0.1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Rob Tillotson Thu, 25 Jun 1998 15:25:34 -0500
+
+python-xml (0.2-0.1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Rob Tillotson Sun, 14 Jun 1998 06:17:44 -0500
+
--- python-xml-0.8.4.orig/debian/xbel.prerm
+++ python-xml-0.8.4/debian/xbel.prerm
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+# Remove SGML catalog entries
+
+PACKAGE=xbel
+CENTRALCAT=/etc/sgml/$PACKAGE.cat
+
+if [ "$1" = remove ]; then
+
+ update-catalog --quiet --remove --super $CENTRALCAT
+
+elif [ "$1" = purge ]; then
+
+ rm -f $CENTRALCAT $CENTRALCAT.old
+fi
+
+#DEBHELPER#
+
+exit 0
--- python-xml-0.8.4.orig/extensions/sgmlop.c
+++ python-xml-0.8.4/extensions/sgmlop.c
@@ -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);
}
/* -------------------------------------------------------------------- */
--- python-xml-0.8.4.orig/extensions/boolean.c
+++ python-xml-0.8.4/extensions/boolean.c
@@ -111,7 +111,7 @@
static void
boolean_dealloc(PyObject *self)
{
- PyMem_DEL(self);
+ PyObject_Del(self);
}
static int