[xml/sgml-commit] r570 - in packages/libxslt: . trunk trunk/debian
Mike Hommey
glandium at costa.debian.org
Sat Jul 1 12:41:32 UTC 2006
Author: glandium
Date: 2006-07-01 12:41:30 +0000 (Sat, 01 Jul 2006)
New Revision: 570
Added:
packages/libxslt/trunk/debian/pycompat
packages/libxslt/trunk/debian/python-libxslt1.examples
packages/libxslt/trunk/debian/python-libxslt1.install
Removed:
packages/libxslt/trunk/debian/python-libxslt1.examples.in
packages/libxslt/trunk/debian/python-libxslt1.install.in
Modified:
packages/libxslt/
packages/libxslt/trunk/NEWS
packages/libxslt/trunk/configure
packages/libxslt/trunk/configure.in
packages/libxslt/trunk/debian/changelog
packages/libxslt/trunk/debian/control
packages/libxslt/trunk/debian/rules
packages/libxslt/trunk/debian/watch
packages/libxslt/trunk/libexslt.pc.in
packages/libxslt/trunk/libxslt.pc.in
packages/libxslt/trunk/xslt-config.in
Log:
r1098 at namakemono: mh | 2006-07-01 14:40:05 +0200
* debian/python-libxslt1.examples.in: Renamed to
debian/python-libxslt1.examples
* debian/python-libxslt1.install.in: Renamed to
debian/python-libxslt1.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-libxslt1 package by a full real package which
itself replaces python2.x-libxslt1 packages, depending on
python-libxml2.
* 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: #373457.
* debian/control:
+ Removed Build-Dep on zlib1g-dev and python2.x-libxml2.
+ Removed dependency on zlib1g-dev and libgcrypt11-dev for libxslt1-dev.
+ Force building against libxml2-dev >= 2.6.26.dfsg-2 so that we son't get
linked against indirect dependencies.
* NEWS: Updated. Closes: #372755.
* libexslt.pc.in, libxslt.pc.in: Split Libs in Libs and Libs.private.
* configure.in, configure: Adapted to fill the variables correctly for
libraries.
* xslt-config.in: 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.
* debian/watch: Updated.
Property changes on: packages/libxslt
___________________________________________________________________
Name: svk:merge
- 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1087
+ 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1098
Modified: packages/libxslt/trunk/NEWS
===================================================================
--- packages/libxslt/trunk/NEWS 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/NEWS 2006-07-01 12:41:30 UTC (rev 570)
@@ -10,6 +10,13 @@
to the CVS at
http://cvs.gnome.org/viewcvs/libxslt/
code base.Those are the public releases made:
+1.1.17: Jun 6 2006
+ - portability fixes: python detection
+ - bug fixes: some regression tests, attribute/namespaces output (Kasimier
+ Buchcik), problem in mixed xsl:value-of and xsl:text uses (Kasimier)
+ - improvements: internal refactoring (Kasimier Buchcik), use of the XPath
+ object cache in libxml2-2.6.25 (Kasimier)
+
1.1.16: May 01 2006:
- portability fixes: EXSLT date/time on Solaris and IRIX (Albert Chin),
HP-UX build (Albert Chin),
Modified: packages/libxslt/trunk/configure
===================================================================
--- packages/libxslt/trunk/configure 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/configure 2006-07-01 12:41:30 UTC (rev 570)
@@ -23435,14 +23435,14 @@
XSLT_LIBDIR='-L${libdir}'
XSLT_INCLUDEDIR='-I${includedir}'
-XSLT_LIBS="-lxslt $LIBXML_LIBS $M_LIBS"
+XSLT_LIBS="-lxslt $LIBXML_LIBS"
EXSLT_LIBDIR='-L${libdir}'
EXSLT_INCLUDEDIR='-I${includedir}'
-EXSLT_LIBS="-lexslt $XSLT_LIBS $LIBGCRYPT_LIBS"
+EXSLT_LIBS="-lexslt $XSLT_LIBS"
Modified: packages/libxslt/trunk/configure.in
===================================================================
--- packages/libxslt/trunk/configure.in 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/configure.in 2006-07-01 12:41:30 UTC (rev 570)
@@ -526,14 +526,14 @@
XSLT_LIBDIR='-L${libdir}'
XSLT_INCLUDEDIR='-I${includedir}'
-XSLT_LIBS="-lxslt $LIBXML_LIBS $M_LIBS"
+XSLT_LIBS="-lxslt $LIBXML_LIBS"
AC_SUBST(XSLT_LIBDIR)
AC_SUBST(XSLT_INCLUDEDIR)
AC_SUBST(XSLT_LIBS)
EXSLT_LIBDIR='-L${libdir}'
EXSLT_INCLUDEDIR='-I${includedir}'
-EXSLT_LIBS="-lexslt $XSLT_LIBS $LIBGCRYPT_LIBS"
+EXSLT_LIBS="-lexslt $XSLT_LIBS"
AC_SUBST(EXSLT_LIBDIR)
AC_SUBST(EXSLT_INCLUDEDIR)
AC_SUBST(EXSLT_LIBS)
Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/debian/changelog 2006-07-01 12:41:30 UTC (rev 570)
@@ -1,3 +1,45 @@
+libxslt (1.1.17-2) unstable; urgency=low
+
+ * The slithering release.
+
+ * debian/python-libxslt1.examples.in: Renamed to
+ debian/python-libxslt1.examples
+ * debian/python-libxslt1.install.in: Renamed to
+ debian/python-libxslt1.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-libxslt1 package by a full real package which
+ itself replaces python2.x-libxslt1 packages, depending on
+ python-libxml2.
+ * 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: #373457.
+
+ * debian/control:
+ + Removed Build-Dep on zlib1g-dev and python2.x-libxml2.
+ + Removed dependency on zlib1g-dev and libgcrypt11-dev for libxslt1-dev.
+ + Force building against libxml2-dev >= 2.6.26.dfsg-2 so that we son't get
+ linked against indirect dependencies.
+ * NEWS: Updated. Closes: #372755.
+ * libexslt.pc.in, libxslt.pc.in: Split Libs in Libs and Libs.private.
+ * configure.in, configure: Adapted to fill the variables correctly for
+ libraries.
+ * xslt-config.in: 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.
+ * debian/watch: Updated.
+
+ -- Mike Hommey <glandium at debian.org> Sat, 1 Jul 2006 14:27:09 +0200
+
libxslt (1.1.17-1) unstable; urgency=low
* New upstream release.
Modified: packages/libxslt/trunk/debian/control
===================================================================
--- packages/libxslt/trunk/debian/control 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/debian/control 2006-07-01 12:41:30 UTC (rev 570)
@@ -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), libxml2-dev (>= 2.6.25), python, python2.4-dev, python2.3-dev, python2.4-libxml2 (>= 2.6.25), python2.3-libxml2 (>= 2.6.25), zlib1g-dev | libz-dev, libgcrypt11-dev, autotools-dev, binutils (>= 2.14.90.0.7)
+Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev (>= 2.6.26.dfsg-2), python-all-dev (>= 2.3.5-11), python-support (>= 0.3), libgcrypt11-dev, autotools-dev, binutils (>= 2.14.90.0.7)
Package: libxslt1.1
Section: libs
@@ -25,7 +25,7 @@
Architecture: any
Provides: libxslt-dev
Conflicts: libxslt-dev, libxslt0-dev
-Depends: libxslt1.1 (= ${Source-Version}), libxml2-dev (>= 2.6.25), zlib1g-dev | libz-dev, libgcrypt11-dev
+Depends: libxslt1.1 (= ${Source-Version}), libxml2-dev (>= 2.6.25)
Description: XSLT processing library - development kit
XSLT is an XML language for defining transformations of XML files from
XML to some other arbitrary format, such as XML, HTML, plain text, etc.
@@ -63,34 +63,16 @@
Package: python-libxslt1
Section: python
-Architecture: all
-Depends: ${python:Depends}
-Description: Python bindings for libxslt1
- This package is a dummy package that will bring you the libxslt bindings
- for the current Python version.
-
-Package: python2.4-libxslt1
-Section: python
Architecture: any
-Depends: ${shlibs:Depends}, python2.4-libxml2 (>= 2.6.25), python2.4
-Description: Python 2.4 bindings for libxslt1
+Conflicts: python2.3-libxslt1 (<< 1.1.17-2), python2.4-libxslt1 (<< 1.1.17-2)
+Replaces: python2.3-libxslt1 (<< 1.1.17-2), python2.4-libxslt1 (<< 1.1.17-2)
+Provides: ${python:Provides}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-libxml2
+Description: Python bindings for libxslt1
XSLT is an XML language for defining transformations of XML files from
XML to some other arbitrary format, such as XML, HTML, plain text, etc.
using standard XSLT stylesheets. libxslt is a C library which
implements XSLT.
.
- This package contains Python 2.4 binding for libxslt, needed to use
+ This package contains Python bindings for libxslt, needed to use
libxslt in Python programs.
-
-Package: python2.3-libxslt1
-Section: python
-Architecture: any
-Depends: ${shlibs:Depends}, python2.3-libxml2 (>= 2.6.25), python2.3
-Description: Python 2.3 bindings for libxslt1
- XSLT is an XML language for defining transformations of XML files from
- XML to some other arbitrary format, such as XML, HTML, plain text, etc.
- using standard XSLT stylesheets. libxslt is a C library which
- implements XSLT.
- .
- This package contains Python 2.3 binding for libxslt, needed to use
- libxslt in Python programs.
Added: packages/libxslt/trunk/debian/pycompat
===================================================================
--- packages/libxslt/trunk/debian/pycompat 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/debian/pycompat 2006-07-01 12:41:30 UTC (rev 570)
@@ -0,0 +1 @@
+2
Added: packages/libxslt/trunk/debian/python-libxslt1.examples
===================================================================
--- packages/libxslt/trunk/debian/python-libxslt1.examples 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/debian/python-libxslt1.examples 2006-07-01 12:41:30 UTC (rev 570)
@@ -0,0 +1,2 @@
+python/tests/*.py
+python/tests/test.*
Deleted: packages/libxslt/trunk/debian/python-libxslt1.examples.in
===================================================================
--- packages/libxslt/trunk/debian/python-libxslt1.examples.in 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/debian/python-libxslt1.examples.in 2006-07-01 12:41:30 UTC (rev 570)
@@ -1,2 +0,0 @@
-python/tests/*.py
-python/tests/test.*
Added: packages/libxslt/trunk/debian/python-libxslt1.install
===================================================================
--- packages/libxslt/trunk/debian/python-libxslt1.install 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/debian/python-libxslt1.install 2006-07-01 12:41:30 UTC (rev 570)
@@ -0,0 +1,2 @@
+usr/lib/python*/site-packages/*.py*
+usr/lib/python*/site-packages/*.so
Deleted: packages/libxslt/trunk/debian/python-libxslt1.install.in
===================================================================
--- packages/libxslt/trunk/debian/python-libxslt1.install.in 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/debian/python-libxslt1.install.in 2006-07-01 12:41:30 UTC (rev 570)
@@ -1,2 +0,0 @@
-usr/lib/pythonPYVERS/site-packages/*.py*
-usr/lib/pythonPYVERS/site-packages/*.so
Modified: packages/libxslt/trunk/debian/rules
===================================================================
--- packages/libxslt/trunk/debian/rules 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/debian/rules 2006-07-01 12:41:30 UTC (rev 570)
@@ -8,7 +8,9 @@
#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))))
+PYVERS=$(shell pyversions -s)
+# The current default version of python
+PYVER=$(shell pyversions -d)
WORKAROUND_REMOVED_FILES=libexslt/exsltconfig.h libxslt/xsltconfig.h libxslt/xsltwin32config.h libxslt.spec
WORKAROUND_MODIFIED_FILES=python/libxslt-py.c
@@ -46,9 +48,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)" \
@@ -72,15 +73,13 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp install*-stamp
- rm -f debian/python*.examples debian/python*.install
-$(MAKE) distclean
# 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
@@ -119,11 +118,12 @@
# 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 $@
+
build-python%-stamp: build-stamp
cd python && $(MAKE) clean && $(MAKE) PYTHON=/usr/bin/python$* PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$*
@@ -133,12 +133,9 @@
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-libxslt1.install.in > debian/python$*-libxslt1.install
- cp debian/python-libxslt1.examples.in debian/python$*-libxslt1.examples
-
touch $@
-install-python-stamp: $(PYVERS:%=install-python%-stamp)
+install-python-stamp: $(PYVERS:%=install-%-stamp)
touch $@
binary-indep:
@@ -149,7 +146,6 @@
dh_compress -i
dh_fixperms -i
dh_installdeb -i
- dh_python -i
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
@@ -162,10 +158,17 @@
dh_installdocs -a -A AUTHORS FEATURES NEWS README TODO
dh_installexamples -a
dh_installchangelogs -a ChangeLog
+ dh_pysupport -a
dh_python -a
dh_link -a
- dh_strip -a --dbg-package=libxslt1-dbg $(addprefix -Npython,$(addsuffix -libxslt1, $(PYVERS)))
- dh_strip $(addprefix -ppython,$(addsuffix -libxslt1, $(PYVERS)))
+ dh_strip -a --dbg-package=libxslt1-dbg -Npython-libxslt1
+ dh_strip -ppython-libxslt1
+ $(foreach python, $(filter-out $(PYVER), $(PYVERS)),\
+ cd $(CURDIR)/debian/python-libxslt1/usr/lib/python-support/python-libxslt1; \
+ if diff $(python)/libxsltmod.so $(PYVER)/libxsltmod.so > /dev/null 2>&1; then \
+ rm -f $(python)/libxsltmod.so; \
+ ln -s ../$(PYVER)/libxsltmod.so $(python)/libxsltmod.so; \
+ fi;)
dh_compress -a -Xexamples/
dh_fixperms -a
dh_makeshlibs -a -V
Modified: packages/libxslt/trunk/debian/watch
===================================================================
--- packages/libxslt/trunk/debian/watch 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/debian/watch 2006-07-01 12:41:30 UTC (rev 570)
@@ -1,2 +1,2 @@
-version=2
-ftp://xmlsoft.org/libxslt-([\d\.]+)\.tar\.gz debian svn-upgrade
+version=3
+ftp://xmlsoft.org/libxslt/libxslt-([\d\.]+)\.tar\.gz
Modified: packages/libxslt/trunk/libexslt.pc.in
===================================================================
--- packages/libxslt/trunk/libexslt.pc.in 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/libexslt.pc.in 2006-07-01 12:41:30 UTC (rev 570)
@@ -9,4 +9,5 @@
Description: EXSLT Extension library
Requires: libxml-2.0
Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@
+Libs.private: @M_LIBS@ @LIBGCRYPT_LIBS@
Cflags: @EXSLT_INCLUDEDIR@
Modified: packages/libxslt/trunk/libxslt.pc.in
===================================================================
--- packages/libxslt/trunk/libxslt.pc.in 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/libxslt.pc.in 2006-07-01 12:41:30 UTC (rev 570)
@@ -9,4 +9,5 @@
Description: XSLT library version 2.
Requires: libxml-2.0
Libs: @XSLT_LIBDIR@ @XSLT_LIBS@
+Libs.private: @M_LIBS@
Cflags: @XSLT_INCLUDEDIR@
Modified: packages/libxslt/trunk/xslt-config.in
===================================================================
--- packages/libxslt/trunk/xslt-config.in 2006-07-01 09:11:17 UTC (rev 569)
+++ packages/libxslt/trunk/xslt-config.in 2006-07-01 12:41:30 UTC (rev 570)
@@ -16,6 +16,7 @@
--prefix=DIR change XSLT prefix [default $prefix]
--exec-prefix=DIR change XSLT executable prefix [default $exec_prefix]
--libs print library linking information
+ add --static to print static library linking information
--cflags print pre-processor and compiler flags
--plugins print plugin directory
--help display this help and exit
@@ -31,6 +32,7 @@
cflags=false
libs=false
+static=false
while test $# -gt 0; do
case "$1" in
@@ -79,6 +81,11 @@
--libs)
libs=true
+ if [ "$2" = "--static" ]
+ then
+ shift
+ static=true
+ fi
;;
*)
@@ -100,6 +107,10 @@
all_flags="$the_flags"
fi
+if $static; then
+ the_libs="$the_libs @M_LIBS@"
+fi
+
if $libs; then
all_flags="$all_flags $services $the_libs"
fi
More information about the debian-xml-sgml-commit
mailing list