[xml/sgml-commit] r380 - packages/libxml2/trunk/debian
Mike Hommey
glandium@costa.debian.org
Sun, 27 Mar 2005 20:34:32 +0000
Author: glandium
Date: 2005-03-27 20:34:31 +0000 (Sun, 27 Mar 2005)
New Revision: 380
Removed:
packages/libxml2/trunk/debian/python2.3-libxml2.examples
packages/libxml2/trunk/debian/python2.3-libxml2.install
Modified:
packages/libxml2/trunk/debian/changelog
packages/libxml2/trunk/debian/control
packages/libxml2/trunk/debian/rules
packages/libxml2/trunk/debian/watch
Log:
Merge changes from the unstable branch
Modified: packages/libxml2/trunk/debian/changelog
===================================================================
--- packages/libxml2/trunk/debian/changelog 2005-03-27 20:23:31 UTC (rev 379)
+++ packages/libxml2/trunk/debian/changelog 2005-03-27 20:34:31 UTC (rev 380)
@@ -1,11 +1,41 @@
libxml2 (2.6.18-1) experimental; urgency=low
* (NOT RELEASED YET) New upstream release.
- * debian/watch: use svn-upgrade instead of uupdate.
* debian/rules: bump shlibs to current version.
- -- Mike Hommey <glandium@debian.org> Sun, 27 Mar 2005 15:59:01 +0200
+ -- Mike Hommey <glandium@debian.org> Sun, 27 Mar 2005 22:32:01 +0200
+libxml2 (2.6.16-5) unstable; urgency=low
+
+ * debian/watch: use svn-upgrade instead of uupdate.
+ * debian/control, debian/rules, debian/python-libxml2.*.in:
+ Added support for several python bindings packages. Currently for python
+ 2.2, 2.3 and 2.4.
+ * debian/python2.3-libxml2.*: Removed.
+
+ -- Mike Hommey <glandium@debian.org> Sun, 27 Mar 2005 21:36:53 +0200
+
+libxml2 (2.6.16-4) unstable; urgency=high
+
+ * Urgency set to high because we avoid breaking packages depending on us
+ when we don't properly bytecompile our python bindings.
+ * debian/rules: Call dh_python. We now get proper maintainer scripts for
+ bytecompiling files at install time and removing them at removal time.
+ Closes: #300834.
+ * debian/control: Adjust build dependencies accordingly.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 22 Mar 2005 21:56:50 +0100
+
+libxml2 (2.6.16-3) unstable; urgency=low
+
+ * tree.c: Avoid adding namespaced attributes to other elements than element
+ nodes. Closes: #293592.
+ * encoding.c: Fix the comments to describe the real return values of
+ UTF8Toisolat1 and isolat1ToUTF8.
+ * doc/: Regenerate API documentation.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 16 Feb 2005 20:31:17 +0100
+
libxml2 (2.6.17-1) experimental; urgency=low
* New upstream release.
Modified: packages/libxml2/trunk/debian/control
===================================================================
--- packages/libxml2/trunk/debian/control 2005-03-27 20:23:31 UTC (rev 379)
+++ packages/libxml2/trunk/debian/control 2005-03-27 20:34:31 UTC (rev 380)
@@ -4,7 +4,7 @@
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
Uploaders: Mike Hommey <glandium@debian.org>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.0), zlib1g-dev | libz-dev, python2.3-dev, autotools-dev
+Build-Depends: debhelper (>= 4.1.67), zlib1g-dev | libz-dev, python, python2.4-dev, python2.3-dev, python2.2-dev, autotools-dev
Package: libxml2
Architecture: any
@@ -71,6 +71,29 @@
This package contains general information about the GNOME XML library
and more specific API references.
+Package: python-libxml2
+Architecture: all
+Section: python
+Depends: ${python:Depends}
+Description: Python bindings for the GNOME XML library
+ This package is a dummy package that will bring you the GNOME XML
+ library bindings for the current Python version.
+
+Package: python2.4-libxml2
+Architecture: any
+Section: python
+Depends: ${shlibs:Depends}, ${misc:Depends}, python2.4
+Description: Python 2.4 bindings for the GNOME XML library
+ XML is a metalanguage to let you design your own markup language.
+ A regular markup language defines a way to describe information in
+ a certain class of documents (eg HTML). XML lets you define your
+ own customized markup languages for many classes of document. It
+ can do this because it's written in SGML, the international standard
+ metalanguage for markup languages.
+ .
+ This package contains the files needed to use the GNOME XML library
+ in Python programs.
+
Package: python2.3-libxml2
Architecture: any
Section: python
@@ -88,6 +111,21 @@
This package contains the files needed to use the GNOME XML library
in Python programs.
+Package: python2.2-libxml2
+Architecture: any
+Section: python
+Depends: ${shlibs:Depends}, ${misc:Depends}, python2.2
+Description: Python 2.2 bindings for the GNOME XML library
+ XML is a metalanguage to let you design your own markup language.
+ A regular markup language defines a way to describe information in
+ a certain class of documents (eg HTML). XML lets you define your
+ own customized markup languages for many classes of document. It
+ can do this because it's written in SGML, the international standard
+ metalanguage for markup languages.
+ .
+ This package contains the files needed to use the GNOME XML library
+ in Python programs.
+
Package: libxml2-python2.3
Architecture: any
Section: python
Deleted: packages/libxml2/trunk/debian/python2.3-libxml2.examples
===================================================================
--- packages/libxml2/trunk/debian/python2.3-libxml2.examples 2005-03-27 20:23:31 UTC (rev 379)
+++ packages/libxml2/trunk/debian/python2.3-libxml2.examples 2005-03-27 20:34:31 UTC (rev 380)
@@ -1,2 +0,0 @@
-python/tests/*.py
-python/tests/*.xml
Deleted: packages/libxml2/trunk/debian/python2.3-libxml2.install
===================================================================
--- packages/libxml2/trunk/debian/python2.3-libxml2.install 2005-03-27 20:23:31 UTC (rev 379)
+++ packages/libxml2/trunk/debian/python2.3-libxml2.install 2005-03-27 20:34:31 UTC (rev 380)
@@ -1,2 +0,0 @@
-usr/lib/python*/site-packages/*.py*
-usr/lib/python*/site-packages/*.so
Modified: packages/libxml2/trunk/debian/rules
===================================================================
--- packages/libxml2/trunk/debian/rules 2005-03-27 20:23:31 UTC (rev 379)
+++ packages/libxml2/trunk/debian/rules 2005-03-27 20:34:31 UTC (rev 380)
@@ -3,6 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# The versions of python currently supported
+PYVERS=$(subst -dev,,$(subst python,,$(filter python%-dev,$(shell sed -n '/^Build-Depends/s/,//gp' debian/control))))
+
WORKAROUND_REMOVED_FILES=include/libxml/xmlversion.h libxml2.spec python/setup.py doc/xmlcatalog.1
WORKAROUND_MODIFIED_FILES=python/libxml2-py.c
@@ -24,21 +27,25 @@
done
# ./configure
- CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-python=/usr/bin/python2.3
+ CFLAGS="$(CFLAGS)" ./configure --prefix=/usr
echo "all:" > example/Makefile
echo "install:" >> example/Makefile
echo "distclean:" >> example/Makefile
echo " rm -rf .deps" >> example/Makefile
+ mv -f python/Makefile python/Makefile.bak
+ echo all: > python/Makefile
# Build libxml2
$(MAKE)
+ mv -f python/Makefile.bak python/Makefile
touch build-stamp
clean:
dh_testdir
dh_testroot
- rm -f build-stamp install-stamp
+ rm -f build-stamp install*-stamp
+ rm -f debian/python*.examples debian/python*.install
-$(MAKE) distclean
-rm -f example/Makefile
@@ -57,16 +64,17 @@
dh_clean
-install: install-stamp
+install: install-stamp install-python-stamp
install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) prefix=`pwd`/debian/tmp/usr \
- PYTHON_SITE_PACKAGES=`pwd`/debian/tmp/usr/lib/python2.3/site-packages \
- install
+ mv -f python/Makefile python/Makefile.bak
+ echo install: > python/Makefile
+ $(MAKE) prefix=`pwd`/debian/tmp/usr install
+ mv -f python/Makefile.bak python/Makefile
mv debian/tmp/usr/share/aclocal/libxml.m4 debian/tmp/usr/share/aclocal/libxml2.m4
@@ -96,6 +104,23 @@
touch install-stamp
+build-python%-stamp: build-stamp
+ cd python && $(MAKE) clean && $(MAKE) PYTHON=/usr/bin/python$* pythondir=`pwd`/../debian/tmp/usr/lib/python$*/site-packages PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$*
+
+ touch $@
+
+install-python%-stamp: build-python%-stamp
+ rm build-python$*-stamp
+ cd python && $(MAKE) PYTHON=/usr/bin/python$* pythondir=`pwd`/../debian/tmp/usr/lib/python$*/site-packages PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$* install
+
+ sed s/PYVERS/$*/ debian/python-libxml2.install.in > debian/python$*-libxml2.install
+ cp debian/python-libxml2.examples.in debian/python$*-libxml2.examples
+
+ touch $@
+
+install-python-stamp: $(PYVERS:%=install-python%-stamp)
+ touch $@
+
# Build architecture-independent files here.
binary-indep: build install
dh_testdir -i
@@ -105,6 +130,7 @@
dh_installchangelogs -i -Nlibxml2-python2.3 debian/no-upstream-changelog
dh_installchangelogs -plibxml2-python2.3
dh_install -i --sourcedir=debian/tmp
+ dh_python -i
dh_link -i
dh_strip -i
dh_compress -i -Xexamples/ -Xtutorial/ -Xhtml/ -X.html
@@ -121,15 +147,18 @@
dh_testroot -a
dh_installexamples -a
dh_installdocs -plibxml2 -Nlibxml2-dev -A AUTHORS TODO README
- dh_installdocs -ppython2.3-libxml2 python/TODO
+ for python in $(PYVERS); do \
+ dh_installdocs -ppython$${python}-libxml2 python/TODO; \
+ for file in AUTHORS README README.Debian changelog.Debian.gz changelog.gz; do \
+ ln -sf ../libxml2/$${file} debian/python$${python}-libxml2/usr/share/doc/python$${python}-libxml2/$${file}; \
+ done; \
+ done
ln -sf libxml2 debian/libxml2-dev/usr/share/doc/libxml2-dev
ln -sf libxml2 debian/libxml2-utils/usr/share/doc/libxml2-utils
dh_installman -a
dh_installchangelogs -plibxml2 ChangeLog
- for file in AUTHORS README README.Debian changelog.Debian.gz changelog.gz; do \
- ln -sf ../libxml2/$${file} debian/python2.3-libxml2/usr/share/doc/python2.3-libxml2/$${file}; \
- done
dh_install -a --sourcedir=debian/tmp
+ dh_python -a
dh_link -a
dh_strip -a
dh_compress -a -Xexamples/
Modified: packages/libxml2/trunk/debian/watch
===================================================================
--- packages/libxml2/trunk/debian/watch 2005-03-27 20:23:31 UTC (rev 379)
+++ packages/libxml2/trunk/debian/watch 2005-03-27 20:34:31 UTC (rev 380)
@@ -1,2 +1,2 @@
version=2
-ftp://xmlsoft.org/libxml2-([\d\.]+)\.tar\.gz debian svn-upgrade
+ftp://xmlsoft.org/libxml2-([\d\.]+)\.tar\.gz debian svn-upgrade