[xml/sgml-commit] r567 - in packages/libxml2: . trunk trunk/debian
Mike Hommey
glandium at costa.debian.org
Sat Jul 1 09:05:25 UTC 2006
Author: glandium
Date: 2006-07-01 09:05:21 +0000 (Sat, 01 Jul 2006)
New Revision: 567
Added:
packages/libxml2/trunk/debian/pycompat
packages/libxml2/trunk/debian/python-libxml2.examples
packages/libxml2/trunk/debian/python-libxml2.install
Removed:
packages/libxml2/trunk/debian/python-libxml2.examples.in
packages/libxml2/trunk/debian/python-libxml2.install.in
Modified:
packages/libxml2/
packages/libxml2/trunk/configure
packages/libxml2/trunk/configure.in
packages/libxml2/trunk/debian/changelog
packages/libxml2/trunk/debian/control
packages/libxml2/trunk/debian/libxml2-doc.install
packages/libxml2/trunk/debian/rules
packages/libxml2/trunk/debian/watch
packages/libxml2/trunk/libxml-2.0-uninstalled.pc.in
packages/libxml2/trunk/libxml-2.0.pc.in
packages/libxml2/trunk/xml2-config.1
packages/libxml2/trunk/xml2-config.in
Log:
r1092 at namakemono: mh | 2006-07-01 10:36:56 +0200
* debian/python-libxml2.examples.in: Renamed to
debian/python-libxml2.examples
* debian/python-libxml2.install.in: Renamed to
debian/python-libxml2.install, and replaced PYVERS by a wildcard.
* debian/control:
+ Adapted dependencies to fit all changes.
+ Added fields required by new Python policy.
+ Added fields necessary for flawless transition.
+ Replaced dummy python-libxml2 package by a full real package which
itself replaces python2.x-libxml2 packages.
* debian/rules:
+ Changed rules to get the python versions we want to build for and
adapted some rules to fit with the new setting.
+ Changed shell loops to make loops.
+ In case python binary modules are identical (and they are, but they
may not be with future versions of the python headers), replace some
of them with symbolic links.
+ Adapted rules to the fact we're installing in only one python package
instead of several.
* debian/pycompat: Set to 2, for new Python policy. Closes: #373456.
* debian/libxml2-doc.install: Added the /usr/share/gtk-doc directory.
Closes: #375113.
* debian/control: Made libxml2-doc suggest devhelper.
* libxml-2.0.pc.in, libxml-2.0-uninstalled.pc.in: Split Libs in Libs and
Libs.private.
* xml2-config.in, xml2-config.1: Added a --static option to add to --libs
so that we can split what is needed when building statically and what is
needed when building dynamically. Closes: #374017.
* libxml-2.0.pc.in, libxml-2.0-uninstalled.pc.in, xml2-config.in: Added
BASE_THREADS_LIBS to the static link information so that -lpthread would
appear. Closes: #372945.
* debian/rules: Add the NEWS file to dh_install calls. Closes: #365596.
* debian/watch: Updated.
Property changes on: packages/libxml2
___________________________________________________________________
Name: svk:merge
- 85a06573-1206-0410-a182-ce9117885d71:/local/libxml2:296
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1081
+ 85a06573-1206-0410-a182-ce9117885d71:/local/libxml2:296
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1092
Modified: packages/libxml2/trunk/configure
===================================================================
--- packages/libxml2/trunk/configure 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/configure 2006-07-01 09:05:21 UTC (rev 567)
@@ -30786,7 +30786,7 @@
*) M_LIBS="-lm"
;;
esac
-XML_LIBS="-lxml2 $Z_LIBS $THREAD_LIBS $ICONV_LIBS $M_LIBS $LIBS"
+XML_LIBS="-lxml2"
XML_LIBTOOLLIBS="libxml2.la"
Modified: packages/libxml2/trunk/configure.in
===================================================================
--- packages/libxml2/trunk/configure.in 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/configure.in 2006-07-01 09:05:21 UTC (rev 567)
@@ -1221,7 +1221,7 @@
*) M_LIBS="-lm"
;;
esac
-XML_LIBS="-lxml2 $Z_LIBS $THREAD_LIBS $ICONV_LIBS $M_LIBS $LIBS"
+XML_LIBS="-lxml2"
XML_LIBTOOLLIBS="libxml2.la"
AC_SUBST(WITH_ICONV)
Modified: packages/libxml2/trunk/debian/changelog
===================================================================
--- packages/libxml2/trunk/debian/changelog 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/debian/changelog 2006-07-01 09:05:21 UTC (rev 567)
@@ -1,3 +1,46 @@
+libxml2 (2.6.26.dfsg-2) unstable; urgency=low
+
+ * The slithering release.
+
+ * debian/python-libxml2.examples.in: Renamed to
+ debian/python-libxml2.examples
+ * debian/python-libxml2.install.in: Renamed to
+ debian/python-libxml2.install, and replaced PYVERS by a wildcard.
+ * debian/control:
+ + Adapted dependencies to fit all changes.
+ + Added fields required by new Python policy.
+ + Added fields necessary for flawless transition.
+ + Replaced dummy python-libxml2 package by a full real package which
+ itself replaces python2.x-libxml2 packages.
+ * debian/rules:
+ + Changed rules to get the python versions we want to build for and
+ adapted some rules to fit with the new setting.
+ + Changed shell loops to make loops.
+ + In case python binary modules are identical (and they are, but they
+ may not be with future versions of the python headers), replace some
+ of them with symbolic links.
+ + Adapted rules to the fact we're installing in only one python package
+ instead of several.
+ * debian/pycompat: Set to 2, for new Python policy. Closes: #373456.
+ * Switching to the new policy avoids necessity to conflict with very old
+ versions of the python bindings packages. Closes: #365057.
+
+ * debian/libxml2-doc.install: Added the /usr/share/gtk-doc directory.
+ Closes: #375113.
+ * debian/control: Made libxml2-doc suggest devhelper.
+ * libxml-2.0.pc.in, libxml-2.0-uninstalled.pc.in: Split Libs in Libs and
+ Libs.private.
+ * xml2-config.in, xml2-config.1: Added a --static option to add to --libs
+ so that we can split what is needed when building statically and what is
+ needed when building dynamically. Closes: #374017.
+ * libxml-2.0.pc.in, libxml-2.0-uninstalled.pc.in, xml2-config.in: Added
+ BASE_THREADS_LIBS to the static link information so that -lpthread would
+ appear. Closes: #372945.
+ * debian/rules: Add the NEWS file to dh_install calls. Closes: #365596.
+ * debian/watch: Updated.
+
+ -- Mike Hommey <glandium at debian.org> Sat, 1 Jul 2006 10:15:23 +0200
+
libxml2 (2.6.26.dfsg-1) unstable; urgency=low
* New upstream release.
Modified: packages/libxml2/trunk/debian/control
===================================================================
--- packages/libxml2/trunk/debian/control 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/debian/control 2006-07-01 09:05:21 UTC (rev 567)
@@ -4,7 +4,7 @@
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
Uploaders: Mike Hommey <glandium at debian.org>
Standards-Version: 3.7.2.0
-Build-Depends: debhelper (>= 5.0.0), zlib1g-dev | libz-dev, python, python2.4-dev, python2.3-dev, autotools-dev, libreadline5-dev | libreadline-dev, binutils (>= 2.14.90.0.7)
+Build-Depends: debhelper (>= 5.0.37.2), zlib1g-dev | libz-dev, python-all-dev (>= 2.3.5-11), python-support (>= 0.3), autotools-dev, libreadline5-dev | libreadline-dev, binutils (>= 2.14.90.0.7)
Package: libxml2
Architecture: any
@@ -77,6 +77,7 @@
Package: libxml2-doc
Architecture: all
Section: doc
+Suggests: devhelp
Description: Documentation 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
@@ -89,18 +90,14 @@
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
+Conflicts: python2.3-libxml2 (<< 2.6.26.dfsg-2), python2.4-libxml2 (<< 2.6.26.dfsg-2)
+Replaces: python2.3-libxml2 (<< 2.6.26.dfsg-2), python2.4-libxml2 (<< 2.6.26.dfsg-2)
+Provides: ${python:Provides}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+XB-Python-Version: ${python:Versions}
+Description: Python 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
@@ -110,18 +107,3 @@
.
This package contains the files needed to use the GNOME XML library
in Python programs.
-
-Package: python2.3-libxml2
-Architecture: any
-Section: python
-Depends: ${shlibs:Depends}, ${misc:Depends}, python2.3
-Description: Python 2.3 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.
Modified: packages/libxml2/trunk/debian/libxml2-doc.install
===================================================================
--- packages/libxml2/trunk/debian/libxml2-doc.install 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/debian/libxml2-doc.install 2006-07-01 09:05:21 UTC (rev 567)
@@ -1 +1,2 @@
usr/share/doc/libxml2-doc
+usr/share/gtk-doc
Added: packages/libxml2/trunk/debian/pycompat
===================================================================
--- packages/libxml2/trunk/debian/pycompat 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/debian/pycompat 2006-07-01 09:05:21 UTC (rev 567)
@@ -0,0 +1 @@
+2
Added: packages/libxml2/trunk/debian/python-libxml2.examples
===================================================================
--- packages/libxml2/trunk/debian/python-libxml2.examples 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/debian/python-libxml2.examples 2006-07-01 09:05:21 UTC (rev 567)
@@ -0,0 +1,2 @@
+python/tests/*.py
+python/tests/*.xml
Deleted: packages/libxml2/trunk/debian/python-libxml2.examples.in
===================================================================
--- packages/libxml2/trunk/debian/python-libxml2.examples.in 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/debian/python-libxml2.examples.in 2006-07-01 09:05:21 UTC (rev 567)
@@ -1,2 +0,0 @@
-python/tests/*.py
-python/tests/*.xml
Added: packages/libxml2/trunk/debian/python-libxml2.install
===================================================================
--- packages/libxml2/trunk/debian/python-libxml2.install 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/debian/python-libxml2.install 2006-07-01 09:05:21 UTC (rev 567)
@@ -0,0 +1,2 @@
+usr/lib/python*/site-packages/*.py*
+usr/lib/python*/site-packages/*.so
Deleted: packages/libxml2/trunk/debian/python-libxml2.install.in
===================================================================
--- packages/libxml2/trunk/debian/python-libxml2.install.in 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/debian/python-libxml2.install.in 2006-07-01 09:05:21 UTC (rev 567)
@@ -1,2 +0,0 @@
-usr/lib/pythonPYVERS/site-packages/*.py*
-usr/lib/pythonPYVERS/site-packages/*.so
Modified: packages/libxml2/trunk/debian/rules
===================================================================
--- packages/libxml2/trunk/debian/rules 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/debian/rules 2006-07-01 09:05:21 UTC (rev 567)
@@ -9,7 +9,9 @@
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
# The versions of python currently supported
-PYVERS=$(subst -dev,,$(subst python,,$(filter python%-dev,$(shell sed -n '/^Build-Depends/s/,//gp' debian/control))))
+PYVERS=$(shell pyversions -s)
+# The current default version of python
+PYVER=$(shell pyversions -d)
WORKAROUND_REMOVED_FILES=include/libxml/xmlversion.h libxml2.spec python/setup.py doc/xmlcatalog.1
WORKAROUND_MODIFIED_FILES=python/libxml2-py.c
@@ -27,9 +29,8 @@
dh_testdir
# Workaround backups because of non-idempotent upstream:
- for file in $(WORKAROUND_REMOVED_FILES) $(WORKAROUND_MODIFIED_FILES); do \
- cp -f -a $${file} $${file}-tmp; \
- done
+ $(foreach file, $(WORKAROUND_REMOVED_FILES) $(WORKAROUND_MODIFIED_FILES), \
+ cp -f -a $(file) $(file)-tmp;)
# ./configure
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --with-history
@@ -50,17 +51,15 @@
dh_testdir
dh_testroot
rm -f build-stamp install*-stamp
- rm -f debian/python*.examples debian/python*.install
- -$(MAKE) distclean
+ #-$(MAKE) distclean
-rm -f example/Makefile
rm COPYING && cp Copyright COPYING
# Restore workaround backups of removed and modified files
- -for file in $(WORKAROUND_REMOVED_FILES) $(WORKAROUND_MODIFIED_FILES); do \
- test -r $${file}-tmp && \
- mv -f $${file}-tmp $${file}; \
- done
+ -$(foreach file, $(WORKAROUND_REMOVED_FILES) $(WORKAROUND_MODIFIED_FILES), \
+ test -r $(file)-tmp && \
+ mv -f $(file)-tmp $(file);)
-test -r /usr/share/misc/config.sub && \
cp -f /usr/share/misc/config.sub config.sub
@@ -102,10 +101,9 @@
# Special workaround for svn-buildpackage:
# Restore workaround backups of modified files.
- -for file in $(WORKAROUND_MODIFIED_FILES); do \
- test -r $${file}-tmp && \
- cat $${file}-tmp > $${file}; \
- done
+ -$(foreach file, $(WORKAROUND_MODIFIED_FILES), \
+ test -r $(file)-tmp && \
+ cat $(file)-tmp > $(file);)
touch install-stamp
@@ -118,22 +116,18 @@
rm build-python$*-stamp
cd python && $(MAKE) DESTDIR=`pwd`/../debian/tmp PYTHON=/usr/bin/python$* 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)
+install-python-stamp: $(PYVERS:%=install-%-stamp)
touch $@
# Build architecture-independent files here.
binary-indep: build install
dh_testdir -i
dh_testroot -i
- dh_installdocs -i -A AUTHORS TODO README
+ dh_installdocs -i -A AUTHORS TODO README NEWS
dh_installchangelogs -i debian/no-upstream-changelog
dh_install -i --sourcedir=debian/tmp
- dh_python -i
dh_link -i
dh_strip -i
dh_compress -i -Xexamples/ -Xtutorial/ -Xhtml/ -X.html
@@ -149,23 +143,26 @@
dh_testdir -a
dh_testroot -a
dh_installexamples -a
- dh_installdocs -plibxml2 -A AUTHORS TODO README
- 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
+ dh_installdocs -plibxml2 -A AUTHORS TODO README NEWS
+ dh_installdocs -ppython-libxml2 python/TODO
+ ln -sf $(foreach file, AUTHORS README README.Debian changelog.Debian.gz changelog.gz,../libxml2/$(file)) debian/python-libxml2/usr/share/doc/python-libxml2/$(file)
ln -sf libxml2 debian/libxml2-dev/usr/share/doc/libxml2-dev
ln -sf libxml2 debian/libxml2-utils/usr/share/doc/libxml2-utils
ln -sf libxml2 debian/libxml2-dbg/usr/share/doc/libxml2-dbg
dh_installman -a
dh_installchangelogs -plibxml2 ChangeLog
dh_install -a --sourcedir=debian/tmp
+ dh_pysupport -a
dh_python -a
dh_link -a
- dh_strip -a --dbg-package=libxml2-dbg $(addprefix -Npython,$(addsuffix -libxml2, $(PYVERS)))
- dh_strip $(addprefix -ppython,$(addsuffix -libxml2, $(PYVERS)))
+ dh_strip -a --dbg-package=libxml2-dbg -Npython-libxml2
+ dh_strip -ppython-libxml2
+ $(foreach python, $(filter-out $(PYVER), $(PYVERS)),\
+ cd $(CURDIR)/debian/python-libxml2/usr/lib/python-support/python-libxml2; \
+ if diff $(python)/libxml2mod.so $(PYVER)/libxml2mod.so > /dev/null 2>&1; then \
+ rm -f $(python)/libxml2mod.so; \
+ ln -s ../$(PYVER)/libxml2mod.so $(python)/libxml2mod.so; \
+ fi;)
dh_compress -a -Xexamples/
dh_fixperms -a
dh_makeshlibs -a -V 'libxml2 (>= 2.6.26)'
Modified: packages/libxml2/trunk/debian/watch
===================================================================
--- packages/libxml2/trunk/debian/watch 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/debian/watch 2006-07-01 09:05:21 UTC (rev 567)
@@ -1,2 +1,2 @@
-version=2
-ftp://xmlsoft.org/libxml2-([\d\.]+)\.tar\.gz debian svn-upgrade
+version=3
+ftp://xmlsoft.org/libxml2/libxml2-([\d\.]+)\.tar\.gz
Modified: packages/libxml2/trunk/libxml-2.0-uninstalled.pc.in
===================================================================
--- packages/libxml2/trunk/libxml-2.0-uninstalled.pc.in 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/libxml-2.0-uninstalled.pc.in 2006-07-01 09:05:21 UTC (rev 567)
@@ -8,5 +8,6 @@
Version: @VERSION@
Description: libXML library version2.
Requires:
-Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
+Libs: -L${libdir} -lxml2
+Libs.private: @BASE_THREAD_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@
Modified: packages/libxml2/trunk/libxml-2.0.pc.in
===================================================================
--- packages/libxml2/trunk/libxml-2.0.pc.in 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/libxml-2.0.pc.in 2006-07-01 09:05:21 UTC (rev 567)
@@ -8,5 +8,6 @@
Version: @VERSION@
Description: libXML library version2.
Requires:
-Libs: -L${libdir} -lxml2 @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
+Libs: -L${libdir} -lxml2
+Libs.private: @BASE_THREAD_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
Modified: packages/libxml2/trunk/xml2-config.1
===================================================================
--- packages/libxml2/trunk/xml2-config.1 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/xml2-config.1 2006-07-01 09:05:21 UTC (rev 567)
@@ -17,6 +17,8 @@
.TP 8
.B \-\-libs
Print the linker flags that are necessary to link a \fIGNOME-XML\fP program.
+Add the \fB\-\-static\fP option to print the linker flags that are necessary to
+\fBstatically\fP link a \fIGNOME-XML\fP program.
.TP 8
.B \-\-cflags
Print the compiler flags that are necessary to compile a \fIGNOME-XML\fP program.
Modified: packages/libxml2/trunk/xml2-config.in
===================================================================
--- packages/libxml2/trunk/xml2-config.in 2006-06-08 22:29:50 UTC (rev 566)
+++ packages/libxml2/trunk/xml2-config.in 2006-07-01 09:05:21 UTC (rev 567)
@@ -15,6 +15,7 @@
--prefix=DIR change libxml prefix [default $prefix]
--exec-prefix=DIR change libxml exec prefix [default $exec_prefix]
--libs print library linking information
+ add --static to print static library linking information
--cflags print pre-processor and compiler flags
--modules module support enabled
--help display this help and exit
@@ -86,13 +87,19 @@
then
if [ "@XML_LIBDIR@" = "-L/usr/lib64" ]
then
- echo @XML_LIBS@
+ LIBS="@XML_LIBS@"
else
- echo @XML_LIBDIR@ @XML_LIBS@
+ LIBS="@XML_LIBDIR@ @XML_LIBS@"
fi
else
- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
+ LIBS="@XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@"
fi
+ if [ "$2" = "--static" ]
+ then
+ shift
+ LIBS="${LIBS} @Z_LIBS@ @BASE_THREAD_LIBS@ @THREAD_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@"
+ fi
+ echo ${LIBS}
;;
*)
More information about the debian-xml-sgml-commit
mailing list