diff options
| author | Aron Xu <aron@debian.org> | 2014-10-26 05:56:03 +0800 |
|---|---|---|
| committer | Aron Xu <aron@debian.org> | 2014-10-26 07:04:42 +0800 |
| commit | c637534284e858f80912004290ccb29fb1f05057 (patch) | |
| tree | a133e48e417a8f1a681ca933e2feed1ae666bed0 /debian | |
| parent | 4a5e25fad6693afda89b3826f73e83d826618863 (diff) | |
| download | libxml2-c637534284e858f80912004290ccb29fb1f05057.tar.gz | |
Update distro patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch | 34 | ||||
| -rw-r--r-- | debian/patches/0002-fix-python-multiarch-includes.patch | 4 |
2 files changed, 13 insertions, 25 deletions
diff --git a/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch b/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch index c5b16bb..dbed70e 100644 --- a/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch +++ b/debian/patches/0001-modify-xml2-config-and-pkgconfig-behaviour.patch @@ -1,20 +1,19 @@ From: Aron Xu <aron@debian.org> -Date: Fri, 21 Sep 2012 00:19:41 +0800 +Date: Sun, 26 Oct 2014 06:02:29 +0800 Subject: modify xml2-config and pkgconfig behaviour --- - configure.in | 2 +- + configure.ac | 2 +- libxml-2.0-uninstalled.pc.in | 3 ++- - libxml-2.0.pc.in | 2 +- xml2-config.1 | 4 ++++ xml2-config.in | 22 ++++++++++------------ - 5 files changed, 18 insertions(+), 15 deletions(-) + 4 files changed, 17 insertions(+), 14 deletions(-) -diff --git a/configure.in b/configure.in -index d449b11..668f233 100644 ---- a/configure.in -+++ b/configure.in -@@ -1380,7 +1380,7 @@ case "$host" in +diff --git a/configure.ac b/configure.ac +index 14ac0a8..21d90ab 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1476,7 +1476,7 @@ case "$host" in *) M_LIBS="-lm" ;; esac @@ -24,28 +23,17 @@ index d449b11..668f233 100644 AC_SUBST(WITH_ICONV) diff --git a/libxml-2.0-uninstalled.pc.in b/libxml-2.0-uninstalled.pc.in -index cab6834..af16ebc 100644 +index 60b886b..0d5d6cb 100644 --- a/libxml-2.0-uninstalled.pc.in +++ b/libxml-2.0-uninstalled.pc.in @@ -8,5 +8,6 @@ Name: libXML Version: @VERSION@ Description: libXML library version2. Requires: --Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ +-Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ +Libs: -L${libdir} -lxml2 -+Libs.private: @BASE_THREAD_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ ++Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@ Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@ -diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in -index f5f5f03..0de667b 100644 ---- a/libxml-2.0.pc.in -+++ b/libxml-2.0.pc.in -@@ -9,5 +9,5 @@ Version: @VERSION@ - Description: libXML library version2. - Requires: - Libs: -L${libdir} -lxml2 --Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ -+Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ @LZMA_LIBS@ - Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ diff --git a/xml2-config.1 b/xml2-config.1 index 8cf9858..7b4195d 100644 --- a/xml2-config.1 diff --git a/debian/patches/0002-fix-python-multiarch-includes.patch b/debian/patches/0002-fix-python-multiarch-includes.patch index ff7c4fa..129d53d 100644 --- a/debian/patches/0002-fix-python-multiarch-includes.patch +++ b/debian/patches/0002-fix-python-multiarch-includes.patch @@ -21,10 +21,10 @@ index 34aed96..8445ea5 100644 python_LTLIBRARIES = libxml2mod.la diff --git a/python/Makefile.in b/python/Makefile.in -index efdea43..23e7fa2 100644 +index 03fbd5b..7299c82 100644 --- a/python/Makefile.in +++ b/python/Makefile.in -@@ -430,7 +430,7 @@ EXTRA_DIST = \ +@@ -490,7 +490,7 @@ EXTRA_DIST = \ @WITH_PYTHON_TRUE@AM_CPPFLAGS = \ @WITH_PYTHON_TRUE@ -I$(top_builddir)/include \ @WITH_PYTHON_TRUE@ -I$(top_srcdir)/include \ |