diff options
| author | Mike Hommey <glandium@debian.org> | 2006-07-27 19:41:28 +0200 |
|---|---|---|
| committer | Mike Hommey <glandium@debian.org> | 2006-07-27 19:41:28 +0200 |
| commit | 696a915a0b4065d7604e865e06ec5eeaafa8e8ea (patch) | |
| tree | 32efadc73d8d6f7ce50647922af759bd1bd7c4e4 | |
| parent | f1f81bc507f17ee81538eae01f5707e0fa0ec585 (diff) | |
| download | libxml2-696a915a0b4065d7604e865e06ec5eeaafa8e8ea.tar.gz | |
* debian/rules, debian/libxml2-dev.install: Don't install libxml2.ladebian/2.6.26.dfsg-3
directly and sed it to remove the dependency_libs. Note that will break
linking statically libxml2 with libtool, we recommend to use pkg-config
--static --libs libxml-2.0 instead of relying on libtool.
Closes: #379807, #378511.
* xml2-config.in: Fixed usage alignment of the new option introduced in
previous upload.
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | debian/libxml2-dev.install | 1 | ||||
| -rwxr-xr-x | debian/rules | 1 | ||||
| -rw-r--r-- | xml2-config.in | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 1ffaebd..4c3442c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +libxml2 (2.6.26.dfsg-3) unstable; urgency=medium + + * debian/rules, debian/libxml2-dev.install: Don't install libxml2.la + directly and sed it to remove the dependency_libs. Note that will break + linking statically libxml2 with libtool, we recommend to use pkg-config + --static --libs libxml-2.0 instead of relying on libtool. + Closes: #379807, #378511. + * xml2-config.in: Fixed usage alignment of the new option introduced in + previous upload. + + -- Mike Hommey <glandium@debian.org> Thu, 27 Jul 2006 19:40:27 +0200 + libxml2 (2.6.26.dfsg-2) unstable; urgency=low * The slithering release. @@ -30,6 +42,8 @@ libxml2 (2.6.26.dfsg-2) unstable; urgency=low * 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. + * configure.in, configure: Adapted to fill the variables correctly for + libraries. * 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. diff --git a/debian/libxml2-dev.install b/debian/libxml2-dev.install index 311fe4f..44c9bb9 100644 --- a/debian/libxml2-dev.install +++ b/debian/libxml2-dev.install @@ -1,6 +1,5 @@ usr/bin/xml2-config usr/lib/libxml2.so -usr/lib/libxml2.la usr/lib/libxml2.a usr/lib/xml2Conf.sh usr/share/aclocal diff --git a/debian/rules b/debian/rules index 666856e..0ceecc8 100755 --- a/debian/rules +++ b/debian/rules @@ -152,6 +152,7 @@ binary-arch: build install dh_installman -a dh_installchangelogs -plibxml2 ChangeLog dh_install -a --sourcedir=debian/tmp + sed "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/libxml2.la > debian/libxml2-dev/usr/lib/libxml2.la dh_pysupport -a dh_python -a dh_link -a diff --git a/xml2-config.in b/xml2-config.in index e7fdec1..2078224 100644 --- a/xml2-config.in +++ b/xml2-config.in @@ -15,7 +15,7 @@ Known values for OPTION are: --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 + 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 |